Merged PR 507: V3.1.21 Release 11

MikeWilliams-UK · MikeWilliams-UK · commit 907dfef53540 · 2022-03-03T09:45:33.000Z
Now Detects Office 2021
Fix invalid updates file

Related work items: #944
diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Version>
-  <Number>3.1.20 Release 10</Number>
+  <Number>3.1.21 Release 11</Number>
   <IsBeta>false</IsBeta>
-  <Released>27-Feb-2022</Released>
+  <Released>03-Mar-2022</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Chem4WordTests/Properties/AssemblyInfo.cs b/src/Chem4WordTests/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs b/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs
@@ -130,8 +130,10 @@ private void FixUpWordVersion()
             var product = _helper.WordProduct;
             if (product.Contains("[16."))
             {
+                // If this is Office 2016/2019/2021/365
                 if (product.Contains("2016")
                     || product.Contains("2019")
+                    || product.Contains("2021")
                     || product.Contains("365"))
                 {
                     // Word version is set
diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Installer/Chem4WordSetup/Setup.cs b/src/Installer/Chem4WordSetup/Setup.cs
@@ -32,7 +32,7 @@ public partial class Setup : Form
         private const string DetectV2AddIn = @"Chemistry Add-in for Word\Chem4Word.AddIn.vsto";
         private const string DetectV3AddIn = @"Chem4Word V3\Chem4Word.V3.vsto";
 
-        private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-1/Chem4Word-Setup.3.1.20.Release.10.msi";
+        private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-1/Chem4Word-Setup.3.1.21.Release.11.msi";
         private const string VstoInstaller = "https://www.chem4word.co.uk/files3-1/vstor_redist.exe";
 
         private WebClient _webClient;
diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- For automatic upgrade to work only first three parts of version number are used -->
-  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2020 Release 10" Manufacturer="Chem4Word" Version="3.1.20.8093" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
+  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2020 Release 11" Manufacturer="Chem4Word" Version="3.1.21.8097" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of Chem4Word is already installed." />
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="high" />
diff --git a/src/Installer/WiXInstaller/WiX-Installer.wixproj b/src/Installer/WiXInstaller/WiX-Installer.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>746e1493-1b1e-482c-8fa4-c147237f4f7b</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Chem4Word-Setup.3.1.20.Release.10</OutputName>
+    <OutputName>Chem4Word-Setup.3.1.21.Release.11</OutputName>
     <OutputType>Package</OutputType>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/src/Notes/Releases.txt b/src/Notes/Releases.txt
@@ -1,7 +1,8 @@
 ﻿# Set Build Numbers
 
-.\SetAssemblyVersion.ps1 -version 3.1.20 -name "Release 10" -released "27-Feb-2022" -path ..
+.\SetAssemblyVersion.ps1 -version 3.1.21 -name "Release 11" -released "03-Mar-2022" -path ..
 
+.\SetAssemblyVersion.ps1 -version 3.1.20 -name "Release 10" -released "27-Feb-2022" -path ..
 .\SetAssemblyVersion.ps1 -version 3.1.19 -name "Release 9" -released "20-May-2021" -path ..
 .\SetAssemblyVersion.ps1 -version 3.1.18 -name "Release 8" -released "17-Feb-2021" -path ..
 .\SetAssemblyVersion.ps1 -version 3.1.17 -name "Release 7" -released "26-Jan-2021" -path ..
diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/Scripts/SignFiles.cmd b/src/Scripts/SignFiles.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set release=Chem4Word-Setup.3.1.20.Release.10.msi
+set release=Chem4Word-Setup.3.1.21.Release.11.msi
 set working=C:\Temp
 set signclientpath=C:\Tools\Azure\SignClient
 
diff --git a/src/Shared/OfficeHelper.cs b/src/Shared/OfficeHelper.cs
@@ -53,7 +53,7 @@ public static FileVersionInfo GetWinWordVersion(string path = null)
         }
 
         /// <summary>
-        /// Returns Word version Number. For Office 365 and 2019 it returns 2016
+        /// Returns Word version Number. For Office 365, 2019 & 2021 it returns 2016
         /// </summary>
         /// <param name="path"></param>
         /// <returns></returns>
@@ -85,7 +85,7 @@ public static string GetWordProduct(string clickToRun)
 
             string officeProductName = string.Empty;
 
-            // If this is Office 2016 or 2019 or 365
+            // If this is Office 2016/2019/2021/365
             if (wordVersionNumber.StartsWith("16."))
             {
                 officeProductName = DecodeClickToRun(clickToRun);
@@ -186,6 +186,18 @@ private static string DecodeClickToRun(string clickToRun)
                     }
                 }
 
+                if (string.IsNullOrEmpty(versionNumber))
+                {
+                    foreach (var p2 in products)
+                    {
+                        if (p2.Contains("2021"))
+                        {
+                            versionNumber = "2021";
+                            break;
+                        }
+                    }
+                }
+
                 if (string.IsNullOrEmpty(versionNumber))
                 {
                     foreach (var p2 in products)
diff --git a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]
diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.20.8093")]
-[assembly: AssemblyFileVersion("3.1.20.8093")]
+[assembly: AssemblyVersion("3.1.21.8097")]
+[assembly: AssemblyFileVersion("3.1.21.8097")]

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,10 @@ private void FixUpWordVersion()`
`130`	`130`	`var product = _helper.WordProduct;`
`131`	`131`	`if (product.Contains("[16."))`
`132`	`132`	`{`
	`133`	`+ // If this is Office 2016/2019/2021/365`
`133`	`134`	`if (product.Contains("2016")`
`134`	`135`	`\|\| product.Contains("2019")`
	`136`	`+ \|\| product.Contains("2021")`
`135`	`137`	`\|\| product.Contains("365"))`
`136`	`138`	`{`
`137`	`139`	`// Word version is set`