Release v1.0.0

fiscal-printer-simulator · Aug 17, 2019 · e58e5da · e58e5da
1 parent ae31d63
commit e58e5da
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 26 deletions.
diff --git a/CI/CakeScripts/build.cake b/CI/CakeScripts/build.cake
@@ -59,17 +59,22 @@ Task ("Build Fiscal Printer Simulator Service")
 
 Task ("Build Fiscal Printer Simulator Installer")
     .IsDependentOn ("Build Fiscal Printer Simulator Service")
-    .Does (() => {
-        MSBuild(WIX_InstallerSolutionPath, new MSBuildSettings {
-                Verbosity = verbosity ? Verbosity.Verbose : Verbosity.Minimal,
-                ToolVersion = MSBuildToolVersion.VS2019,
-                Configuration =configuration,
-                PlatformTarget = targetPlatform == "x64" ? PlatformTarget.x64 : PlatformTarget.x86,
-                 EnvironmentVariables = new Dictionary<string, string>{
-                    {"AppVersion",ReleaseVersion },
-                    {"BuildNumber", buildNumber }
-                }
-        });
+    .Does (() => {              
+            var msBuildTarget = targetPlatform == "x64" ? MSBuildPlatform.x64 : MSBuildPlatform.x86;
+            var msBuildVerbosity = verbosity ? Verbosity.Verbose : Verbosity.Minimal;
+
+        MSBuild(WIX_InstallerSolutionPath, configurator => 
+                configurator
+                .SetConfiguration(configuration)
+                .SetVerbosity(msBuildVerbosity)
+                .UseToolVersion(MSBuildToolVersion.VS2019)
+                .SetMSBuildPlatform(msBuildTarget)
+                .WithProperty("Version",ReleaseVersion+buildNumber)
+                .WithProperty("BuildNumber",buildNumber)
+                .WithProperty("Platform",targetPlatform)
+            );
+
+
     });
 
 Task ("EndBuild")

diff --git a/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Dialogs/CustomizeDialogOverwritten.wxs b/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Dialogs/CustomizeDialogOverwritten.wxs
@@ -35,7 +35,7 @@
         <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
         <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
-        <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle) Dupa" />
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
         <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" />
         <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)">
           <Subscribe Event="SelectionDescription" Attribute="Text" />

diff --git a/CI/WixInstaller/FiscalPrinterSimulatorInstaller/FiscalPrinterSimulatorInstaller.wixproj b/CI/WixInstaller/FiscalPrinterSimulatorInstaller/FiscalPrinterSimulatorInstaller.wixproj
@@ -12,8 +12,7 @@
     <OutputPath>..\..\..\Delivery\</OutputPath>
     <IntermediateOutputPath>obj\$(Platform)\</IntermediateOutputPath>
     <Name>Setup.FiscalPrinterSimulator</Name>
-    <Version Condition=" '$(BuildNumber)' == '' ">0.0.2</Version>
-    <Version Condition=" '$(BuildNumber)' != '' ">$(AppVersion)$(BuildNumber)</Version>
+    <Version Condition=" '$(Version)' == '' ">1.0.0</Version>
     <DefineConstants>Version=$(Version)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x64' " />

diff --git a/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Product.wxs b/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Product.wxs
@@ -42,6 +42,7 @@ CONTENT of Instalator:
       <Directory Id="$(var.PlatformProgramFilesFolder)">
         <Directory Id="INSTALLFOLDER" Name="Fiscal Printer Simulator">
           <Directory Id="FP_BIN_DIR" Name="bin">
+            <Directory Id="FP_BIN_PLUGINS_DIR" Name="Plugins"/>
             <Directory Id="FP_BIN_TRANSLATIONS_DIR" Name="Translations"/>
           </Directory>
           <Directory Id="FP_CONFIG_DIR" Name="config"/>
@@ -62,6 +63,11 @@ CONTENT of Instalator:
           <Feature Id="feature_app_desktop" Title="!(loc.descDesktopAppNodeTitle)" InstallDefault="local" AllowAdvertise="no" Description="!(loc.descDesktopAppNode)">
             <ComponentGroupRef Id="compGroup_DesktopApp"/>
           </Feature>
+          <Feature Id="feature_app_plugins" Title="!(loc.descWinServicePluginsAppNodeTitle)" InstallDefault="local" Absent="disallow" AllowAdvertise="no" Description="!(loc.descWinServicePluginsAppNode)">
+            <Feature Id="feature_app_plugins_thermal" Title="!(loc.descWinServicePluginThermalAppNodeTitle)" InstallDefault="local" Absent="disallow" AllowAdvertise="no" Description="!(loc.descWinServicePluginThermalAppNode)">
+              <ComponentGroupRef Id="compGroup_simulator_windows_service_plugins" />
+            </Feature>
+          </Feature>
           <Feature Id="feature_app_desktop_translations"  Title="!(loc.descDesktopAppTranslationsMainNodeTitle)" Absent="disallow" InstallDefault="local" AllowAdvertise="no" Description="!(loc.descDesktopAppTranslationsMainNode)">
             <ComponentGroupRef Id="compGroup_DesktopAppTranslationsRoot" />
             <Feature Id="feature_app_desktop_translationsEN" Title="!(loc.descDesktopAppTranslationsENNodeTitle)" Absent="disallow" InstallDefault="local" AllowAdvertise="no" Description="!(loc.descDesktopAppTranslationsENNode)">
@@ -72,9 +78,9 @@ CONTENT of Instalator:
             </Feature>
           </Feature>
         </Feature>
-        <Feature Id="feature_diagnostic_tool" Title="!(loc.descDiagnosticToolNodeTitle)" Level="2" InstallDefault="local" AllowAdvertise="no" Description="!(loc.descDiagnosticToolNode)">
+        <!--<Feature Id="feature_diagnostic_tool" Title="!(loc.descDiagnosticToolNodeTitle)" Level="2" InstallDefault="local" AllowAdvertise="no" Description="!(loc.descDiagnosticToolNode)">
           <ComponentGroupRef Id="compGroup_DiagnosticTool"/>
-        </Feature>
+        </Feature>-->
     </FeatureGroup>
   </Fragment>
 
@@ -84,26 +90,33 @@ CONTENT of Instalator:
       <Component>
         <RegistryValue Root='HKCU' Key='$(var.RegistryPath)' Name='WindowsService' Type='integer' Value='0' KeyPath='yes' />
       </Component>
-      <!-- <Component>
+       <Component>
         <File Name='Newtonsoft.Json.dll' Source='$(var.BinariesResourcesDir)Newtonsoft.Json.dll' KeyPath='yes' />
-      </Component> -->
-      <!-- <Component>
+      </Component> 
+       <Component>
         <File Name='Fleck.dll' Source='$(var.BinariesResourcesDir)Fleck.dll' KeyPath='yes' />
-      </Component> -->
+      </Component> 
       <Component>
         <File Name='BaseFiscalPrinterSimulatorLibraries.dll' Source='$(var.BinariesResourcesDir)BaseFiscalPrinterSimulatorLibraries.dll' KeyPath='yes' />
       </Component>
-      <Component>
-        <File Name='ThermalFiscalPrinterSimulatorLibraries.dll' Source='$(var.PluginsResourcesDir)ThermalFiscalPrinterSimulatorLibraries.dll' KeyPath='yes' />
-      </Component>
       <Component>
         <File Id='file_FPSimulator_WebsocketWindowsService' Name='$(var.FiscalPrinterSimulatorServiceName).exe' Source='$(var.BinariesResourcesDir)$(var.FiscalPrinterSimulatorServiceName).exe' KeyPath='yes'/>
-        <ServiceInstall Id='serviceInstall_WebsocketWindowsService' Type='ownProcess' Name='$(var.FiscalPrinterSimulatorServiceName)' DisplayName='Fiscal Printer Simulator' Description='Fiscal Printer Websocket Based Simulator. Helps to develop with POS likely applications.' Start='auto' Account="[SERVICEACCOUNT]" Password="[SERVICEPASSWORD]" ErrorControl="normal" Arguments=" /start $(var.FiscalPrinterSimulatorServiceName)"/>
+        <!--<ServiceInstall Id='serviceInstall_WebsocketWindowsService' Type='ownProcess' Name='$(var.FiscalPrinterSimulatorServiceName)' DisplayName='Fiscal Printer Simulator' Description='Fiscal Printer Websocket Based Simulator. Helps to develop with POS likely applications.' Start='auto' Account="[SERVICEACCOUNT]" Password="[SERVICEPASSWORD]" ErrorControl="normal" Arguments=" /start $(var.FiscalPrinterSimulatorServiceName)"/>
+        <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="$(var.FiscalPrinterSimulatorServiceName)" Wait="yes" />-->
+        <ServiceInstall Id="ServiceInstaller" Type="ownProcess" Name="$(var.FiscalPrinterSimulatorServiceName)" DisplayName="$(var.FiscalPrinterSimulatorServiceName)" Description="Fiscal Printer Websocket Based Simulator. Helps to develop with POS likely applications." Start="auto" ErrorControl="normal" />
         <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="$(var.FiscalPrinterSimulatorServiceName)" Wait="yes" />
       </Component>
     </ComponentGroup>
   </Fragment>
 
+  <!--Simulator Windows Service Plugins Components-->
+  <Fragment>
+    <ComponentGroup Id="compGroup_simulator_windows_service_plugins" Directory="FP_BIN_PLUGINS_DIR">
+      <Component>
+          <File Name='ThermalFiscalPrinterSimulatorLibraries.dll' Source='$(var.PluginsResourcesDir)ThermalFiscalPrinterSimulatorLibraries.dll' KeyPath='yes' />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
 
 
   <!--Simulator Desktop Application Components-->

diff --git a/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Translations/EnglishLanguage.wxl b/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Translations/EnglishLanguage.wxl
@@ -28,4 +28,10 @@
 
   <String Id="InstallFolderPathChooseDialogTitle">{\WixUI_Font_Title}Select the application's root folder</String>
   <String Id="InstallFolderPathChooseDialogDescription">Select the folder in which the Application will be installed</String>
+
+  <String Id="descWinServicePluginsAppNodeTitle">Plugins</String>
+  <String Id="descWinServicePluginsAppNode">Plugins providing support for specific fiscal printer drivers.</String>
+  <String Id="descWinServicePluginThermalAppNodeTitle">[PL] Thermal</String>
+  <String Id="descWinServicePluginThermalAppNode">Plugin providing support for the Polish Thermal protocol.</String>
+
 </WixLocalization>
diff --git a/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Translations/PolishLanguage.wxl b/CI/WixInstaller/FiscalPrinterSimulatorInstaller/Translations/PolishLanguage.wxl
@@ -27,4 +27,10 @@
 
   <String Id="InstallFolderPathChooseDialogTitle">{\WixUI_Font_Title}Wybierz folder główny aplikacji</String>
   <String Id="InstallFolderPathChooseDialogDescription">Wybierz folder w którym zostanie zainstalowana Aplikacja</String>
+
+  <String Id="descWinServicePluginsAppNodeTitle">Pluginy</String>
+  <String Id="descWinServicePluginsAppNode">Pluginy zapewniające obsługę konkretnych sterowników drukarek fiskalnych.</String>
+  <String Id="descWinServicePluginThermalAppNodeTitle">[PL] Thermal</String>
+  <String Id="descWinServicePluginThermalAppNode">Plugin zapewniający obsługę Polskiego protokołu Thermal.</String>
+
 </WixLocalization>
diff --git a/SourceCodes/FiscalPrinterSimulatorClient b/SourceCodes/FiscalPrinterSimulatorClient
diff --git a/SourceCodes/FiscalPrinterSimulatorService b/SourceCodes/FiscalPrinterSimulatorService
+9 −9		FiscalPrinterSimulator.sln
+1 −1		FiscalPrinterSimulatorLibraries/BaseFiscalPrinter/BaseFiscalPrinter.csproj
+3 −0		FiscalPrinterSimulatorLibraries/ThermalFiscalPrinter/Commands/CashierLoginCommandHandler.cs
+3 −0		FiscalPrinterSimulatorLibraries/ThermalFiscalPrinter/Commands/CashierLogoutCommandHandler.cs
+1 −1		FiscalPrinterSimulatorLibraries/ThermalFiscalPrinter/Commands/ResendRTCTimeCommandHandler.cs
+1 −1		FiscalPrinterSimulatorLibraries/ThermalFiscalPrinter/ThermalFiscalPrinter.csproj
+1 −1		...terSimulatorLibraries/UnitTests/ThermalFiscalPrinter.Unit.Tests/Commands/ResendRTCTimeCommandHandlerTest.cs
+1 −1		...lPrinterSimulatorLibraries/UnitTests/ThermalFiscalPrinter.Unit.Tests/ThermalFiscalPrinter.Unit.Tests.csproj
+6 −0		FiscalPrinterSimulatorService/App.config
+5 −2		FiscalPrinterSimulatorService/Constants.cs
+37 −0		FiscalPrinterSimulatorService/FiscalPrinterSimulatorService.Designer.cs
+11 −14		FiscalPrinterSimulatorService/FiscalPrinterSimulatorService.cs
+15 −7		FiscalPrinterSimulatorService/FiscalPrinterSimulatorService.csproj
+3 −0		FiscalPrinterSimulatorService/FiscalPrinterSimulatorService.csproj.user
+59 −0		FiscalPrinterSimulatorService/FiscalPrinterSimulatorServiceInstaller.Designer.cs
+19 −0		FiscalPrinterSimulatorService/FiscalPrinterSimulatorServiceInstaller.cs
+129 −0		FiscalPrinterSimulatorService/FiscalPrinterSimulatorServiceInstaller.resx
+8 −2		FiscalPrinterSimulatorService/Program.cs
+5 −0		FiscalPrinterSimulatorService/packages.config