Merged PR 42: Release 1

* Ensure structure to be rendered has at least one atom. * Sign Chem4Word Updater Related work items: #299
Chem4Word · Jan 17, 2018 · 62a657e · 62a657e
2 parents 4ca24e9 + 771b66b
commit 62a657e
Show file tree

Hide file tree

Showing 46 changed files with 189 additions and 97 deletions.
diff --git a/doc/Chem4Word-Version3-Developer-SetUp.docx b/doc/Chem4Word-Version3-Developer-SetUp.docx
diff --git a/doc/Chem4Word-Version3-User-Manual.docx b/doc/Chem4Word-Version3-User-Manual.docx
diff --git a/src/Chem4Word.V3/Chem4WordV3.cs b/src/Chem4Word.V3/Chem4WordV3.cs
@@ -1469,8 +1469,18 @@ private void OnWindowSelectionChange(Word.Selection sel)
 
             try
             {
-                Debug.WriteLine($"{module.Replace("()", $"({sel.Document.Name})")}");
-                Debug.WriteLine("  Selection: from " + sel.Range.Start + " to " + sel.Range.End);
+                try
+                {
+                    if (sel != null)
+                    {
+                        Debug.WriteLine($"{module.Replace("()", $"({sel.Document.Name})")}");
+                        Debug.WriteLine("  Selection: from " + sel.Range.Start + " to " + sel.Range.End);
+                    }
+                }
+                catch
+                {
+                    //
+                }
 
                 if (EventsEnabled)
                 {

diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
@@ -2,6 +2,17 @@
 <!-- This file must be uploaded to https://www.chem4word.co.uk/files3/ folder as Chem4Word-Versions.xml -->
 <ChangeLog>
   <Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
+  <Version>
+    <Number>3.0.14 Release 1</Number>
+    <IsBeta>false</IsBeta>
+    <Released>17-Jan-2018</Released>
+    <Changes>
+      <Change>Ensure structure to be rendered has at least one atom.</Change>
+      <Change>Sign Chem4Word Updater</Change>
+      <Change>Please download Chem4Word-Setup.exe from https://github.com/Chem4Word/Version3/releases/latest if you encounter any difficulties updating.</Change>
+    </Changes>
+    <Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.14.Release.1.msi</Url>
+  </Version>
   <Version>
     <Number>3.0.12 Beta 12</Number>
     <IsBeta>true</IsBeta>
@@ -12,7 +23,6 @@
       <Change>Allow Chemistry to be inserted from library when blank document opened.</Change>
       <Change>Handle empty json from ChemDoodle Web.</Change>
       <Change>Add Check for Updates after RightClick and Selection Change errors.</Change>
-      <Change>Please download Chem4Word-Setup.exe from https://github.com/Chem4Word/Version3/releases if you encounter any dificulties updating.</Change>
     </Changes>
     <Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.12.Beta.12.msi</Url>
   </Version>

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.12 Beta 12</Number>
-  <IsBeta>true</IsBeta>
-  <Released>01-Jan-2018</Released>
+  <Number>3.0.14 Release 1</Number>
+  <IsBeta>false</IsBeta>
+  <Released>17-Jan-2018</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Data/index.html b/src/Chem4Word.V3/Data/index.html
@@ -11,6 +11,10 @@ <h1>Chemistry for Word Add-In V3</h1>
             <td>Setup Bootstrapper</td>
             <td><a href="/files3/Chem4Word-Setup.exe">Chem4Word-Setup</a></td>
         </tr>
+        <tr>
+            <td>Version 3.0.14 - Release 1</td>
+            <td><a href="/files3/Chem4Word-Setup.3.0.14.Release.1.msi">Chem4Word-Setup 3.0.14 Release 1</a></td>
+        </tr>
         <tr>
             <td>Version 3.0.12 - Beta 12</td>
             <td><a href="/files3/Chem4Word-Setup.3.0.12.Beta.12.msi">Chem4Word-Setup 3.0.12 Beta 12</a></td>

diff --git a/src/Chem4Word.V3/Helpers/UpdateHelper.cs b/src/Chem4Word.V3/Helpers/UpdateHelper.cs
@@ -115,6 +115,14 @@ public static int CheckForUpdates(int days)
             return Globals.Chem4WordV3.VersionsBehind;
         }
 
+        public static void ReadThisVersion(Assembly assembly)
+        {
+            if (Globals.Chem4WordV3.ThisVersion == null)
+            {
+                Globals.Chem4WordV3.ThisVersion = XDocument.Parse(ResourceHelper.GetStringResource(assembly, "Data.This-Version.xml"));
+            }
+        }
+
         public static bool FetchUpdateInfo()
         {
             string module = $"{_product}.{_class}.{MethodBase.GetCurrentMethod().Name}()";
@@ -126,7 +134,8 @@ public static bool FetchUpdateInfo()
             Globals.Chem4WordV3.VersionsBehind = 0;
 
             var assembly = Assembly.GetExecutingAssembly();
-            Globals.Chem4WordV3.ThisVersion = XDocument.Parse(ResourceHelper.GetStringResource(assembly, "Data.This-Version.xml"));
+
+            ReadThisVersion(assembly);
             if (Globals.Chem4WordV3.ThisVersion != null)
             {
                 string currentVersionNumber = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value;

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.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs
@@ -1936,8 +1936,19 @@ private void OnShowAboutClick(object sender, RibbonControlEventArgs e)
 
                 Assembly assembly = Assembly.GetExecutingAssembly();
                 FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+                UpdateHelper.ReadThisVersion(assembly);
+                if (Globals.Chem4WordV3.ThisVersion != null)
+                {
+                    string[] parts = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value.Split(' ');
+                    string temp = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value;
+                    int idx = temp.IndexOf(" ");
+                    fa.VersionString = $"Chem4Word V3 {temp.Substring(idx+1)} [{fvi.FileVersion}]";
+                }
+                else
+                {
+                    fa.VersionString = $"Chem4Word Version {fvi.FileVersion}";
+                }
 
-                fa.VersionString = $"Chem4Word Version {fvi.FileVersion}";
                 fa.ShowDialog();
             }
             catch (Exception ex)

diff --git a/src/Chem4Word.V3/UI/About.Designer.cs b/src/Chem4Word.V3/UI/About.Designer.cs
diff --git a/src/Chem4Word.V3/UI/AutomaticUpdate.cs b/src/Chem4Word.V3/UI/AutomaticUpdate.cs
@@ -63,7 +63,7 @@ private void OnReleasesPageLinkClicked(object sender, LinkLabelLinkClickedEventA
 
             try
             {
-                Process.Start("https://github.com/Chem4Word/Version3/releases");
+                Process.Start("https://github.com/Chem4Word/Version3/releases/latest");
                 DialogResult = DialogResult.Cancel;
             }
             catch (Exception ex)

diff --git a/src/Chem4Word.V3/UI/Settings.Designer.cs b/src/Chem4Word.V3/UI/Settings.Designer.cs
diff --git a/src/Chem4WordTests/Properties/AssemblyInfo.cs b/src/Chem4WordTests/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/ChemDoodlePoc/Properties/AssemblyInfo.cs b/src/ChemDoodlePoc/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Chemistry/Chem4Word.Model/Converters/Json/JSONConverter.cs b/src/Chemistry/Chem4Word.Model/Converters/Json/JSONConverter.cs
@@ -15,7 +15,6 @@ namespace Chem4Word.Model.Converters
 {
     /// <summary>
     /// Converts a Model from and to JSON
-    /// Only handles one molecule right now!
     /// </summary>
     public class JSONConverter : IConverter
     {

diff --git a/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs b/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
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.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Common/Telemetry/Properties/AssemblyInfo.cs b/src/Common/Telemetry/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Common/Telemetry/WmiHelper.cs b/src/Common/Telemetry/WmiHelper.cs
@@ -85,7 +85,19 @@ private void GatherCpuData()
                 try
                 {
                     string temp = mgtObject["Name"].ToString();
-                    temp = temp.Replace("\t", " ").Replace("  ", " ");
+                    // Replace tab with space
+                    temp = temp.Replace("\t", " ");
+                    // Replace upto 15 double spaces with single space
+                    int i = 0;
+                    while (temp.IndexOf("..") != -1)
+                    {
+                        temp = temp.Replace("  ", " ");
+                        i++;
+                        if (i > 15)
+                        {
+                            break;
+                        }
+                    }
                     _cpuName = temp;
                 }
                 catch

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.0.12.6575")]
-[assembly: AssemblyFileVersion("3.0.12.6575")]
+[assembly: AssemblyVersion("3.0.14.6591")]
+[assembly: AssemblyFileVersion("3.0.14.6591")]
diff --git a/src/Installer/Chem4WordSetup/Setup.cs b/src/Installer/Chem4WordSetup/Setup.cs
@@ -34,7 +34,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/Chem4Word-Setup.3.0.9.Beta.9.msi";
+        private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.14.Release.1.msi";
         private const string VstoInstaller = "https://www.chem4word.co.uk/files3/vstor_redist.exe";
 
         private WebClient _webClient;

diff --git a/src/Installer/Chem4WordUpdater/Chem4WordUpdater.csproj b/src/Installer/Chem4WordUpdater/Chem4WordUpdater.csproj
@@ -16,6 +16,21 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -118,13 +133,34 @@
   <ItemGroup>
     <Content Include="Chem4Word.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if "$(ConfigurationName)" == "Vso-Ci" (
-rem
-) else (
-xcopy "$(TargetDir)$(TargetName).exe" "$(SolutionDir)$(SolutionName)\$(OutDir)" /C /f /r /y /i
-)</PostBuildEvent>
+echo "goto :nocopy"
+goto :nocopy
+)
+
+if "$(ConfigurationName)" == "Setup" (
+echo "Signing file"
+$(SolutionDir)\Tools\DigiCertUtil.exe sign /sha1 "6217CFB6A0926B17939F104EE2A282CDBE8A0BF7" /noInput $(TargetFileName)
+)
+
+echo "Copying file"
+xcopy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)$(SolutionName)\$(OutDir)" /C /f /r /y /i
+
+:nocopy</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.