Merged PR 656: Create V3.2.15

Bug Fix for installation issue Related work items: #1115
Chem4Word · Dec 20, 2023 · c07defd · c07defd
1 parent e324255
commit c07defd
Show file tree

Hide file tree

Showing 30 changed files with 58 additions and 58 deletions.
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.2.14 Release 9</Number>
+  <Number>3.2.15 Release 10</Number>
   <IsBeta>false</IsBeta>
-  <Released>21-Dec-2023</Released>
+  <Released>22-Dec-2023</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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/Chem4Word.V3/app.config b/src/Chem4Word.V3/app.config
@@ -34,10 +34,6 @@
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />

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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs b/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs
@@ -357,7 +357,7 @@ private void WritePrivate(string operation, string level, string message)
             var processId = 666;
             var machineId = Guid.Empty.ToString("D");
             // This is updated automatically by Set-Assembly-Version.ps1
-            var versionNumber = "3.2.14.666";
+            var versionNumber = "3.2.15.666";
 
             try
             {

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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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-2/Chem4Word-Setup.3.2.14.Release.9.msi";
+        private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.15.Release.10.msi";
         private const string VstoInstaller = "https://www.chem4word.co.uk/files3-2/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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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 2022 Release 9" Manufacturer="Chem4Word" Version="3.2.14.8755" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
+  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 2022 Release 10" Manufacturer="Chem4Word" Version="3.2.15.8756" 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" />
@@ -233,10 +233,13 @@
         <File Id="Microsoft.VisualStudio.Tools.Applications.Runtime.dll" Source="$(var.Chem4Word.V3.TargetDir)Microsoft.VisualStudio.Tools.Applications.Runtime.dll" />
       </Component>
       <!-- OpenXML SDK -->
-      <Component Id="OpenXML.SDK">
+      <Component Id="OpenXml.SDK">
         <File Id="DocumentFormat.OpenXml.dll" Source="$(var.Chem4Word.V3.TargetDir)DocumentFormat.OpenXml.dll" />
       </Component>
-      <Component Id="OpenXML.SDK.Dependancy">
+      <Component Id="OpenXml.FrameWork">
+        <File Id="DocumentFormat.OpenXml.Framework.dll" Source="$(var.Chem4Word.V3.TargetDir)DocumentFormat.OpenXml.Framework.dll" />
+      </Component>
+      <Component Id="OpenXml.SDK.Dependency">
         <File Id="WindowsBase.dll" Source="$(var.Chem4Word.V3.TargetDir)WindowsBase.dll" />
       </Component>
       <!-- Database -->

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.2.14.Release.9</OutputName>
+    <OutputName>Chem4Word-Setup.3.2.15.Release.10</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
 
-.\Set-Assembly-Version.ps1 -version 3.2.14 -name "Release 9" -released "21-Dec-2023" -path ..
+.\Set-Assembly-Version.ps1 -version 3.2.15 -name "Release 10" -released "22-Dec-2023" -path ..
 
+.\Set-Assembly-Version.ps1 -version 3.2.14 -name "Release 9" -released "21-Dec-2023" -path ..
 .\Set-Assembly-Version.ps1 -version 3.2.12 -name "Release 8" -released "16-Aug-2023" -path ..
 .\Set-Assembly-Version.ps1 -version 3.2.11 -name "Release 7" -released "31-May-2023" -path ..
 .\Set-Assembly-Version.ps1 -version 3.2.10 -name "Release 6" -released "22-Mar-2023" -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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/Scripts/Sign-Files.cmd b/src/Scripts/Sign-Files.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set release=Chem4Word-Setup.3.2.14.Release.9.msi
+set release=Chem4Word-Setup.3.2.15.Release.10.msi
 set working=C:\Temp
 set signtoolpath=C:\Tools\Azure\SignTool\sign.exe
 

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.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]
diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/src/UnitTests/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.14.8755")]
-[assembly: AssemblyFileVersion("3.2.14.8755")]
+[assembly: AssemblyVersion("3.2.15.8756")]
+[assembly: AssemblyFileVersion("3.2.15.8756")]