Merged PR 30: Prepare release 3.0.5 beta 5

Prepare release 3.0.5 beta 5 Related work items: #115
Chem4Word · Oct 18, 2017 · 158aa2b · 158aa2b
2 parents 0938560 + e6163dd
commit 158aa2b
Show file tree

Hide file tree

Showing 33 changed files with 84 additions and 65 deletions.
diff --git a/src/Chem4Word.V3/Chem4WordV3.cs b/src/Chem4Word.V3/Chem4WordV3.cs
@@ -1115,13 +1115,7 @@ private void OnDocumentChange()
                         DialogResult answer = Upgrader.UpgradeIsRequired(doc);
                         if (answer == DialogResult.Yes)
                         {
-                            //DisableDocumentEvents(doc);
                             Upgrader.DoUpgrade(doc);
-                            //EnableDocumentEvents(doc);
-                        }
-                        else
-                        {
-                            Telemetry.Write(module, "Information", "User chose not to upgrade legacy chemistry");
                         }
 
                         foreach (var taskPane in Globals.Chem4WordV3.CustomTaskPanes)

diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file must be uploaded to https://www.chem4word.co.uk/files3/ folder as Chem4Word-Versions.xml -->
 <ChangeLog>
+  <Version>
+    <Number>3.0.5 Beta 5</Number>
+    <IsBeta>true</IsBeta>
+    <Released>18-Oct-2017</Released>
+    <Changes>
+      <Change>Fix glitch with detection of Office 365 (2016) installation</Change>
+    </Changes>
+    <Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.5.Beta.5.msi</Url>
+  </Version>
   <Version>
     <Number>3.0.4 Beta 4</Number>
     <IsBeta>true</IsBeta>

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.0.4 Beta 4</Number>
+  <Number>3.0.5 Beta 5</Number>
   <IsBeta>true</IsBeta>
-  <Released>15-Oct-2017</Released>
+  <Released>18-Oct-2017</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Data/index.html b/src/Chem4Word.V3/Data/index.html
@@ -15,12 +15,20 @@ <h1>Chemistry for Word Add-In V3</h1>
                 <a href="/files3/Chem4Word-Setup.exe">Chem4Word.Setup</a>
             </td>
         </tr>
+        <tr>
+            <td>
+                Version 3.0.5 - Beta 5
+            </td>
+            <td>
+                <a href="/files3/Chem4Word-Setup.3.0.5.Beta.5.msi">Chem4Word.Setup.3.0.5 Beta 5</a>
+            </td>
+        </tr>
         <tr>
             <td>
                 Version 3.0.4 - Beta 4
             </td>
             <td>
-                <a href="/files3/Chem4Word-Setup.3.0.3.Beta.4.msi">Chem4Word.Setup.3.0.4 Beta 4</a>
+                <a href="/files3/Chem4Word-Setup.3.0.4.Beta.4.msi">Chem4Word.Setup.3.0.4 Beta 4</a>
             </td>
         </tr>
         <tr>

diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Chem4WordTests/Properties/AssemblyInfo.cs b/src/Chem4WordTests/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/ChemDoodlePoc/Properties/AssemblyInfo.cs b/src/ChemDoodlePoc/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs b/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Common/Telemetry/Properties/AssemblyInfo.cs b/src/Common/Telemetry/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Common/Telemetry/SystemHelper.cs b/src/Common/Telemetry/SystemHelper.cs
@@ -415,7 +415,7 @@ private void GetExternalIpAddress(object o)
                                     if (ipV6Parts.Length >= 4 && ipV6Parts.Length <= 8)
                                     {
                                         IpAddress = "IpAddress " + webPage;
-                                        IpObtainedFrom = $"IpAddress V6 got from {url} on attempt {_retryCount + 1}";
+                                        IpObtainedFrom = $"IpAddress V6 obtained from {url} on attempt {_retryCount + 1}";
                                     }
                                 }
 
@@ -430,7 +430,7 @@ private void GetExternalIpAddress(object o)
                                     if (ipV4Parts.Length == 4)
                                     {
                                         IpAddress = "IpAddress " + webPage;
-                                        IpObtainedFrom = $"IpAddress V4 got from {url} on attempt {_retryCount + 1}";
+                                        IpObtainedFrom = $"IpAddress V4 obtained from {url} on attempt {_retryCount + 1}";
                                     }
                                 }
 

diff --git a/src/Common/Telemetry/TelemetryWriter.cs b/src/Common/Telemetry/TelemetryWriter.cs
@@ -97,12 +97,19 @@ private void WriteStartUpInfo()
             WritePrivate("StartUp", "Information", $"Debug - Environment.Is64BitProcess: {Environment.Is64BitProcess}");
 #endif
 
+            // Log Sysytem
             WritePrivate("StartUp", "Information", _helper.SystemOs);
             WritePrivate("Startup", "Information", _helper.DotNetVersion);
 
+            // Log IP Address
             WritePrivate("StartUp", "Information", _helper.IpAddress);
             WritePrivate("StartUp", "Information", _helper.IpObtainedFrom);
+
+            // Log Word
+            WritePrivate("StartUp", "Information", Environment.GetCommandLineArgs()[0]);
             WritePrivate("StartUp", "Information", _helper.WordProduct);
+
+            // Log Add-In Version
             // ToDo: Add extra info to AddInVersion
             WritePrivate("StartUp", "Information", _helper.AddInVersion);
 

diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Installer/Chem4WordSetup/Setup.cs b/src/Installer/Chem4WordSetup/Setup.cs
@@ -69,9 +69,9 @@ private void Setup_Load(object sender, EventArgs e)
 
             #region Detect Word
 
-            isWordInstalled = OfficeFinder.WordExists(2010)
+            isWordInstalled = OfficeFinder.WordExists(2016)
                 || OfficeFinder.WordExists(2013)
-                || OfficeFinder.WordExists(2016);
+                || OfficeFinder.WordExists(2010);
 
             #endregion Detect Word
 

diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
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 3.0.4 Beta 4" Manufacturer="Chem4Word" Version="3.0.4.6497" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
+  <Product Id="*" Name="Chemistry Add-In for Microsoft Word 3.0.5 Beta 5" Manufacturer="Chem4Word" Version="3.0.5.6500" 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" />
@@ -55,7 +55,7 @@
       <DirectorySearch Id="Word2013x64" Path="[ProgramFiles64Folder]\Microsoft Office\Office15" Depth="1">
         <FileSearch Name="winword.exe" MinVersion="15.0.0.0" MaxVersion="15.99.9999.9999" />
       </DirectorySearch>
-      <DirectorySearch Id="Word2013Ctrx32" Path="[ProgramFilesFolder]\Microsoft Office 15\ClientX86\Root\Office15" Depth="1">
+      <DirectorySearch Id="Word2013Ctrx32" Path="[ProgramFilesFolder]\Microsoft Office 15\ClientX64\Root\Office15" Depth="1">
         <FileSearch Name="winword.exe" MinVersion="15.0.0.0" MaxVersion="15.99.9999.9999" />
       </DirectorySearch>
       <DirectorySearch Id="Word2013Ctrx64" Path="[ProgramFiles64Folder]\Microsoft Office 15\ClientX86\Root\Office15" Depth="1">
@@ -69,13 +69,12 @@
       <DirectorySearch Id="Word2016x64" Path="[ProgramFiles64Folder]\Microsoft Office\root\Office16" Depth="1">
         <FileSearch Name="winword.exe" MinVersion="16.0.0.0" MaxVersion="16.99.9999.9999" />
       </DirectorySearch>
-      <DirectorySearch Id="Word2016Ctrx32" Path="[ProgramFilesFolder]\Microsoft Office 16\ClientX86\Root\Office16" Depth="1">
+      <DirectorySearch Id="Word2016Ctrx32" Path="[ProgramFilesFolder]\Microsoft Office 16\ClientX64\Root\Office16" Depth="1">
         <FileSearch Name="winword.exe" MinVersion="16.0.0.0" MaxVersion="16.99.9999.9999" />
       </DirectorySearch>
       <DirectorySearch Id="Word2016Ctrx64" Path="[ProgramFiles64Folder]\Microsoft Office 16\ClientX86\Root\Office16" Depth="1">
         <FileSearch Name="winword.exe" MinVersion="16.0.0.0" MaxVersion="16.99.9999.9999" />
       </DirectorySearch>
-      <!-- added to handle O365 installations -the setup program also needs to be tested with this as it downloads a new version of it -->
       <DirectorySearch Id="Word2016O365x86" Path="[ProgramFilesFolder]\Microsoft Office\Office16" Depth="1">
         <FileSearch Name="winword.exe" MinVersion="16.0.0.0" MaxVersion="16.99.9999.9999" />
       </DirectorySearch>

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.0.4.Beta.4</OutputName>
+    <OutputName>Chem4Word-Setup.3.0.5.Beta.5</OutputName>
     <OutputType>Package</OutputType>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>

diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Editors/ChemDoodleWeb.702/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.702/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Renderers/OoXmlV3/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV3/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/SignFiles.cmd b/src/SignFiles.cmd
@@ -1,4 +1,6 @@
-set release=Chem4Word-Setup.3.0.4.Beta.4.msi
+@echo off
+
+set release=Chem4Word-Setup.3.0.5.Beta.5.msi
 set working=C:\Temp
 
 copy Tools\DigiCertUtil.exe %working%

diff --git a/src/TestHarness/WPF-TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WPF-TestHarness/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/TestHarness/WPFTagTestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WPFTagTestHarness/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]
diff --git a/src/TestHarness/WindowsForms-TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WindowsForms-TestHarness/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.4.6497")]
-[assembly: AssemblyFileVersion("3.0.4.6497")]
+[assembly: AssemblyVersion("3.0.5.6500")]
+[assembly: AssemblyFileVersion("3.0.5.6500")]