- bumped the Qiqqa version to today via npm run syncver, before cre…

…ating a new beta release installer for testing... - updated Copyright year in the syncver script `Qiqqa.Build/bump_version.js`
GerHobbelt · Mar 23, 2020 · 42b82d1 · 42b82d1
1 parent 8d7c5f7
commit 42b82d1
Show file tree

Hide file tree

Showing 31 changed files with 94 additions and 91 deletions.
diff --git a/Qiqqa.Build/ClientVersion.xml b/Qiqqa.Build/ClientVersion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ClientVersionInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <LatestVersion>82.0.7265.2217</LatestVersion>
+  <LatestVersion>82.0.7356.40890</LatestVersion>
   <CompliantFromVersion>81</CompliantFromVersion>
   <ObsoleteToVersion xsi:nil="true" />
   <DownloadLocations>

diff --git a/Qiqqa.Build/Packaging/ClickOnceUninstaller/ClickOnceUninstaller/ClickOnceUninstaller.csproj b/Qiqqa.Build/Packaging/ClickOnceUninstaller/ClickOnceUninstaller/ClickOnceUninstaller.csproj
@@ -25,7 +25,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>82.0.7265.2217</ApplicationVersion>
+    <ApplicationVersion>82.0.7356.40890</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/Qiqqa.Build/Packaging/ClickOnceUninstaller/ClickOnceUninstaller/Properties/AssemblyInfo.cs b/Qiqqa.Build/Packaging/ClickOnceUninstaller/ClickOnceUninstaller/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("Qiqqa ClickOnceUninstaller")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/Qiqqa.Build/Packaging/Include/couninst.exe b/Qiqqa.Build/Packaging/Include/couninst.exe
diff --git a/Qiqqa.Build/Packaging/Scripts/products/unzip.iss b/Qiqqa.Build/Packaging/Scripts/products/unzip.iss
@@ -99,7 +99,8 @@ procedure AppProcessMessage;
 var
   Msg: TMsg;
 begin
-  while PeekMessage(Msg, WizardForm.Handle, 0, 0, PM_REMOVE) do begin
+  while PeekMessage(Msg, WizardForm.Handle, 0, 0, PM_REMOVE) do 
+  begin
     TranslateMessage(Msg);
     DispatchMessage(Msg);
   end;
@@ -128,11 +129,12 @@ begin
     ExecInfo.lpParameters := unzipParams;
     ExecInfo.nShow := SW_HIDE;
 
-    if not FileExists(unzipTool)
-    then MsgBox('UnzipTool not found: ' + unzipTool, mbError, MB_OK)
-    else if not FileExists(source)
-    then MsgBox('File was not found while trying to unzip: ' + source, mbError, MB_OK)
-    else begin
+    if not FileExists(unzipTool) then 
+	    MsgBox('UnzipTool not found: ' + unzipTool, mbError, MB_OK)
+    else if not FileExists(source) then 
+		MsgBox('File was not found while trying to unzip: ' + source, mbError, MB_OK)
+    else 
+	begin
           {
              The unzip tool is executed via ShellExecuteEx()
              Then the installer uses a while loop with the condition
@@ -149,12 +151,13 @@ begin
 
           if ShellExecuteEx(ExecInfo) then
           begin
-            while WaitForSingleObject(ExecInfo.hProcess, 100) = WAIT_TIMEOUT
-            do begin
+            while WaitForSingleObject(ExecInfo.hProcess, 100) = WAIT_TIMEOUT do 
+			begin
                 AppProcessMessage;
                 WizardForm.Refresh();
             end;
             CloseHandle(ExecInfo.hProcess);
           end;
     end;
 end;
+
diff --git a/Qiqqa.Build/bump_version.js b/Qiqqa.Build/bump_version.js
@@ -10,26 +10,26 @@ var package_json = require(__dirname + '/../package.json');
 
 
 // See: https://jonthysell.com/2017/01/10/automatically-generating-version-numbers-in-visual-studio/
-// 
+//
 // Quoting:
-// 
-// The first option is given to us right in the default AssemblyInfo.cs, letting us know that we can 
-// simply set our version to Major.Minor.* and let Visual Studio auto-generate the Build and Release 
+//
+// The first option is given to us right in the default AssemblyInfo.cs, letting us know that we can
+// simply set our version to Major.Minor.* and let Visual Studio auto-generate the Build and Release
 // numbers.
-// 
-// Visual Studio then sets the Build based on the number of days that have passed since 
-// January 1st, 2000, and sets the Release to the number of two-second intervals that have elapsed 
-// since midnight. Sounds good so far, and of course you can always switch back to a manual version 
+//
+// Visual Studio then sets the Build based on the number of days that have passed since
+// January 1st, 2000, and sets the Release to the number of two-second intervals that have elapsed
+// since midnight. Sounds good so far, and of course you can always switch back to a manual version
 // at any time. But there are a couple of caveats:
-// 
-// - This only works with AssemblyVersion, not AssemblyFileVersion. 
-//   To make this work for both, you have to specify just the AssemblyVersion (comment out or delete 
-//   the AssemblyFileVersion line) and then Visual Studio is smart enough to use the same value for 
+//
+// - This only works with AssemblyVersion, not AssemblyFileVersion.
+//   To make this work for both, you have to specify just the AssemblyVersion (comment out or delete
+//   the AssemblyFileVersion line) and then Visual Studio is smart enough to use the same value for
 //   AssemblyFileVersion.
 // - Both numbers are generated at the exact time the particular project was built.
-//   So if you have multiple projects in your solution and any one takes more than two seconds to 
+//   So if you have multiple projects in your solution and any one takes more than two seconds to
 //   build, you will end up with different versions for different assemblies.
-//   
+//
 function calcMicrosoftStyleBuildAndReleaseVersionNumbers() {
 	var now = moment();
 	var epoch = new Date(2000, 1, 1);
@@ -67,7 +67,7 @@ async function scandir() {
         caseSensitiveMatch: false,
         ignore: ['Qiqqa.Build/Packages', 'packages/', 'research/']
     });
- 
+
  	paths.sort();
 
     if (opts.debug) {
@@ -78,10 +78,10 @@ async function scandir() {
     //[assembly: AssemblyVersion("82.0.*")]
     //[assembly: AssemblyFileVersion("82.0")]
     //[assembly: AssemblyCompany("Quantisle")]
-    //[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019.  All rights reserved.")]
+    //[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020.  All rights reserved.")]
     //<LatestVersion>82</LatestVersion>
 
-	return paths;    
+	return paths;
 }
 
 function updateFilesWithVersion(paths) {
@@ -91,13 +91,13 @@ function updateFilesWithVersion(paths) {
 
 		// patch CSPROJ files:
 		if (path.includes('csproj')) {
-			let re = /\<ApplicationVersion\>.*?\<\/ApplicationVersion\>/g;  
+			let re = /\<ApplicationVersion\>.*?\<\/ApplicationVersion\>/g;
 			content = content.replace(re, `<ApplicationVersion>${version_info.toString()}</ApplicationVersion>`);
 		}
 
 		// patch ClientVersion files:
 		if (path.includes('ClientVersion')) {
-			let re = /\<LatestVersion\>.*?\<\/LatestVersion\>/g;  
+			let re = /\<LatestVersion\>.*?\<\/LatestVersion\>/g;
 			content = content.replace(re, `<LatestVersion>${version_info.toString()}</LatestVersion>`);
 		}
 
@@ -114,7 +114,7 @@ function updateFilesWithVersion(paths) {
 
 			// assembly: AssemblyCopyright
 			re = /assembly:\s+AssemblyCopyright\("[^"]*"\)/gi;
-			content = content.replace(re, `assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")`);
+			content = content.replace(re, `assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")`);
 		}
 
 		// patch package.json to reflect the build+release versions calculated here:

diff --git a/Qiqqa/Properties/AssemblyInfo.cs b/Qiqqa/Properties/AssemblyInfo.cs
@@ -9,10 +9,10 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
 [assembly: AssemblyCompany("Quantisle")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 
 [assembly: AssemblyTitle("Qiqqa")]
 [assembly: AssemblyProduct("Qiqqa")]

diff --git a/Qiqqa/Qiqqa.csproj b/Qiqqa/Qiqqa.csproj
@@ -52,7 +52,7 @@
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>82.0.7265.2217</ApplicationVersion>
+    <ApplicationVersion>82.0.7356.40890</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/QiqqaHasher/Properties/AssemblyInfo.cs b/QiqqaHasher/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("QiqqaHasher")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaHasher")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+// [assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaLegacyFileFormats/Properties/AssemblyInfo.cs b/QiqqaLegacyFileFormats/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaLegacyFileFormats")]
-[assembly: AssemblyCopyright("XX")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82")]
-[assembly: AssemblyFileVersion("82")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaLegacyFileFormats/QiqqaLegacyFileFormats.csproj b/QiqqaLegacyFileFormats/QiqqaLegacyFileFormats.csproj
@@ -48,7 +48,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>82.0.7198.42243</ApplicationVersion>
+    <ApplicationVersion>82.0.7356.40890</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/QiqqaOCR/Properties/AssemblyInfo.cs b/QiqqaOCR/Properties/AssemblyInfo.cs
@@ -14,11 +14,11 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaOCR")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/QiqqaOCR/QiqqaOCR.csproj b/QiqqaOCR/QiqqaOCR.csproj
@@ -34,7 +34,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>82.0.7265.2217</ApplicationVersion>
+    <ApplicationVersion>82.0.7356.40890</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <NuGetPackageImportStamp>

diff --git a/QiqqaPackager/Properties/AssemblyInfo.cs b/QiqqaPackager/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaPackager.Properties")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaPackager/QiqqaPackager.csproj b/QiqqaPackager/QiqqaPackager.csproj
@@ -23,7 +23,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>82.0.7265.2217</ApplicationVersion>
+    <ApplicationVersion>82.0.7356.40890</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/QiqqaSystemTester/Properties/AssemblyInfo.cs b/QiqqaSystemTester/Properties/AssemblyInfo.cs
@@ -8,10 +8,10 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
 [assembly: AssemblyCompany("Quantisle")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 
 [assembly: AssemblyTitle("QiqqaSystemTester")]
 [assembly: AssemblyDescription("")]

diff --git a/QiqqaTestHelpers/Properties/AssemblyInfo.cs b/QiqqaTestHelpers/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaTestHelpers")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaToolBench/Properties/AssemblyInfo.cs b/QiqqaToolBench/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaToolBench")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaUIPartsTester/Properties/AssemblyInfo.cs b/QiqqaUIPartsTester/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaUIPartsTester")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -48,6 +48,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+// [assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaUnitTester/Properties/AssemblyInfo.cs b/QiqqaUnitTester/Properties/AssemblyInfo.cs
@@ -10,11 +10,11 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+// [assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
 [assembly: AssemblyCompany("Quantisle")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 
 [assembly: AssemblyTitle("QiqqaUnitTester")]
 [assembly: AssemblyDescription("")]

diff --git a/QiqqaVersionMigrator/Properties/AssemblyInfo.cs b/QiqqaVersionMigrator/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quantisle")]
 [assembly: AssemblyProduct("QiqqaVersionMigrator")]
-[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2019. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright © Quantisle 2010-2020. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -46,5 +46,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("82.0.7265.2217")]
-[assembly: AssemblyFileVersion("82.0.7265.2217")]
+[assembly: AssemblyVersion("82.0.7356.40890")]
+[assembly: AssemblyFileVersion("82.0.7356.40890")]
diff --git a/QiqqaVersionMigrator/QiqqaVersionMigrator.csproj b/QiqqaVersionMigrator/QiqqaVersionMigrator.csproj
@@ -27,7 +27,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationVersion>82.0.7265.2217</ApplicationVersion>
+    <ApplicationVersion>82.0.7356.40890</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>