Merge pull request #221 from coolOrangeLabs/powerMigration_2023

Migration from 2021 to 2023
coolOrangeLabs · Sep 22, 2022 · 8ad2e48 · 8ad2e48
2 parents b574510 + 9177a73
commit 8ad2e48
Show file tree

Hide file tree

Showing 6 changed files with 1,230 additions and 5 deletions.
diff --git a/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/coolOrange.Logging.dll b/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/coolOrange.Logging.dll
diff --git a/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/powerGateServer.SDK.dll b/Files/powerGatePlugin/ErpServices/ReferenceAssemblies/powerGateServer.SDK.dll
diff --git a/Installer/ClientSetup/Includes/ProductVariables.wxi b/Installer/ClientSetup/Includes/ProductVariables.wxi
@@ -4,7 +4,7 @@
 	<?define WikiLink="https://github.com/coolOrangeLabs/powerGateTemplate/wiki"?>
 	<?define IconName="..\Resources\coolOrange.ico"?>
 	<?define PVersion="$(var.Major).$(var.Minor).$(var.Build).$(var.Revision)"?>
-	<?define VaultYear="Vault 2021"?>
+	<?define VaultYear="Vault 2023"?>
 	<?define PName="powerGate Standard - Client integration for $(var.VaultYear)"?>
 	<?define PShortVersion="$(var.Major).$(var.Minor)"?>
 	<?define CompanyDirectory="coolOrange"?>

diff --git a/Installer/JobsSetup/Includes/CheckCoolOrangeProductInstalled.wxi b/Installer/JobsSetup/Includes/CheckCoolOrangeProductInstalled.wxi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Include>
 
   <Property Id="POWERGATEINSTALLED">
@@ -20,7 +20,7 @@
   <Property Id="POWERJOBSINSTALLED">
     <RegistrySearch Id="PowerJobsInstalled"
                     Root="HKLM"
-                    Key="SOFTWARE\coolOrange s.r.l.\powerJobs Processor"
+                    Key="SOFTWARE\coolOrange s.r.l.\powerJobs Processor Processor"
                     Name="Installed"
                     Type="raw" />
   </Property>

diff --git a/Installer/JobsSetup/Product.wxs b/Installer/JobsSetup/Product.wxs
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
 	 xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?include Includes\ProductVariables.wxi ?>
@@ -79,7 +79,7 @@
 	  <Property Id="POWERJOBSINSTALLEDVERSION">
 		<RegistrySearch Id="PowerJobsInstalledVersion"
 						Root="HKLM"
-						Key="SOFTWARE\coolOrange s.r.l.\powerJobs Processor"
+						Key="SOFTWARE\coolOrange s.r.l.\powerJobs Processor Processor"
 						Name="Version"
 						Type="raw" />
 	  </Property>