Merged PR 500: V3.2.1 Beta 1

Create the first public beta Related work items: #915
Chem4Word · Feb 28, 2022 · b4d2cc2 · b4d2cc2
1 parent 17fcc22
commit b4d2cc2
Show file tree

Hide file tree

Showing 37 changed files with 790 additions and 724 deletions.
diff --git a/docs/Chem4Word-Version3-2-Developer-SetUp.docx b/docs/Chem4Word-Version3-2-Developer-SetUp.docx
diff --git a/docs/Chem4Word-Version3-2-Technical-Manual.docx b/docs/Chem4Word-Version3-2-Technical-Manual.docx
diff --git a/docs/Chem4Word-Version3-2-User-Manual.docx b/docs/Chem4Word-Version3-2-User-Manual.docx
diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file must be uploaded to https://www.chem4word.co.uk/files3-2/ folder as Chem4Word-Versions.xml -->
 <ChangeLog>
-  <Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
-  <Version>
-    <Number>3.2.0 Alpha 0</Number>
-    <IsBeta>true</IsBeta>
-    <Released>31-Jan-2022</Released>
-    <Changes>
-      <Change>...</Change>
-      <Change>...</Change>
-      <Change>...</Change>
-      <Change>...</Change>
-      <Change>...</Change>
-      <Change>...</Change>
-    </Changes>
-  </Version>
-  <EndOfLife>31-Dec-2345</EndOfLife>
+    <Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
+    <Version>
+        <Number>3.2.1 Beta 1</Number>
+        <IsBeta>true</IsBeta>
+        <Released>28-Feb-2022</Released>
+        <Changes>
+            <Change>First public beta of Chem4Word 2022 (V3.2)</Change>
+        </Changes>
+        <Url>https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.1.Beta.1.msi</Url>
+    </Version>
+    <Version>
+        <Number>3.2.1 Alpha 0</Number>
+        <IsBeta>true</IsBeta>
+        <Released>21-Feb-2022</Released>
+        <Changes>
+            <Change>Private Alpha of Chem4Word 2022 (V3.2)</Change>
+        </Changes>
+    </Version>
+    <EndOfLife>31-Dec-2345</EndOfLife>
 </ChangeLog>
diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml
@@ -2,5 +2,5 @@
 <Version>
   <Number>3.2.1 Beta 1</Number>
   <IsBeta>true</IsBeta>
-  <Released>01-Feb-2022</Released>
+  <Released>28-Feb-2022</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Data/index.html b/src/Chem4Word.V3/Data/index.html
@@ -76,6 +76,10 @@ <h1><a href="https://www.chem4word.co.uk">Chemistry for Word Add-In 2022</a></h1
             <td>Setup Bootstrapper</td>
             <td><a href="/files3-2/Chem4Word-Setup.exe">Chem4Word-Setup</a></td>
         </tr>
+        <tr>
+            <td>Version 3.2.1 - Beta 1</td>
+            <td><a href="/files3-2/Chem4Word-Setup.3.2.1.Beta.1.msi">Chem4Word-Setup 3.2.1 Beta 1</a></td>
+        </tr>
         <tr>
             <td>Version 3.2.0 - Alpha 0</td>
             <td>Chem4Word-Setup 3.2.0 Alpha 0</td>

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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
diff --git a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
diff --git a/src/Common/Chem4Word.Telemetry/SystemHelper.cs b/src/Common/Chem4Word.Telemetry/SystemHelper.cs
@@ -407,7 +407,7 @@ private void GetScreens()
             Screens = string.Join("; ", screens);
         }
 
-        private static string OsBits => Environment.Is64BitOperatingSystem ? "64bit" : "32bit";
+        public static string OsBits => Environment.Is64BitOperatingSystem ? "64bit" : "32bit";
 
         private void GetDotNetVersionFromRegistry()
         {
@@ -421,6 +421,11 @@ private void GetDotNetVersionFromRegistry()
                     int releaseKey = Convert.ToInt32(ndpKey.GetValue("Release"));
 
                     // .Net 4.8
+                    if (releaseKey >= 528449)
+                    {
+                        DotNetVersion = $".NET 4.8 (W11/S2022) [{releaseKey}]";
+                        return;
+                    }
                     if (releaseKey >= 528372)
                     {
                         DotNetVersion = $".NET 4.8 (W10 2004) [{releaseKey}]";

diff --git a/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs b/src/Common/Chem4Word.Telemetry/TelemetryWriter.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -144,31 +145,18 @@ private void FixUpWordVersion()
 
         private void WriteStartUpInfo()
         {
-            // Log Add-In Version
-            WritePrivate("StartUp", "Information", _helper.AddInVersion); // ** Used by Andy's Knime protocol ?
-
-            // Log Word Version
             FixUpWordVersion();
-            WritePrivate("StartUp", "Information", _helper.WordProduct); // ** Used by Andy's Knime protocol
+            AddKnimeProperies();
+
             WritePrivate("StartUp", "Information", $"Internal Version {_helper.WordVersion}");
             if (!string.IsNullOrEmpty(_helper.Click2RunProductIds))
             {
                 WritePrivate("StartUp", "Information", _helper.Click2RunProductIds);
             }
             WritePrivate("StartUp", "Information", Environment.GetCommandLineArgs()[0]);
 
-            // Log System
-            WritePrivate("StartUp", "Information", _helper.SystemOs); // ** Used by Andy's Knime protocol
-            WritePrivate("StartUp", "Information", _helper.DotNetVersion);
             WritePrivate("StartUp", "Information", $"Browser Version: {_helper.BrowserVersion}");
 
-            // Log IP Address
-            if (!_helper.IpAddress.Contains("8.8.8.8"))
-            {
-                WritePrivate("StartUp", "Information", _helper.IpAddress); // ** Used by Andy's Knime protocol
-                WritePrivate("StartUp", "Information", _helper.IpObtainedFrom);
-            }
-
             if (_helper.StartUpTimings != null)
             {
                 WritePrivate("StartUp", "Timing", string.Join(Environment.NewLine, _helper.StartUpTimings));
@@ -284,26 +272,43 @@ private void WriteStartUpInfo()
             }
 #endif
 
-            #region Log critical System Info again to ensure we get it
+            // Add Knime Properies again to ensure they get sent
+            AddKnimeProperies();
 
-            // Log Add-In Version
-            WritePrivate("StartUp", "Information", _helper.AddInVersion); // ** Used by Andy's Knime protocol ?
+            _systemInfoSent = true;
+        }
 
-            // Log Word
-            WritePrivate("StartUp", "Information", _helper.WordProduct); // ** Used by Andy's Knime protocol
+        private void AddKnimeProperies()
+        {
+            // Used by Andy's Knime protocol
 
-            // Log System
-            WritePrivate("StartUp", "Information", _helper.SystemOs); // ** Used by Andy's Knime protocol
+            // OS Info
+            if (string.IsNullOrEmpty(_wmiHelper.OSVersion) || string.IsNullOrEmpty(_wmiHelper.OSCaption))
+            {
+                WritePrivate("StartUp", "Information", _helper.SystemOs);
+            }
+            else
+            {
+                string bits = Environment.Is64BitOperatingSystem ? "64bit" : "32bit";
+                string culture = CultureInfo.CurrentCulture.Name;
+                WritePrivate("StartUp", "Information", $"{_wmiHelper.OSCaption} {bits} [{_wmiHelper.OSVersion}] {culture}");
+            }
+
+            // Dot Net Version
+            WritePrivate("StartUp", "Information", _helper.DotNetVersion);
 
-            // Log IP Address
+            // Word Version
+            WritePrivate("StartUp", "Information", _helper.WordProduct);
+
+            // Add-In Version
+            WritePrivate("StartUp", "Information", _helper.AddInVersion);
+
+            // IP Address
             if (!_helper.IpAddress.Contains("8.8.8.8"))
             {
                 WritePrivate("StartUp", "Information", _helper.IpAddress); // ** Used by Andy's Knime protocol
+                WritePrivate("StartUp", "Information", _helper.IpObtainedFrom);
             }
-
-            #endregion Log critical System Info again to ensure we get it
-
-            _systemInfoSent = true;
         }
 
         private void WritePrivate(string operation, string level, string message)

diff --git a/src/Common/Chem4Word.Telemetry/WmiHelper.cs b/src/Common/Chem4Word.Telemetry/WmiHelper.cs
@@ -16,7 +16,7 @@ namespace Chem4Word.Telemetry
     public class WmiHelper
     {
         private const string QueryProcessor = "SELECT Name,NumberOfLogicalProcessors,CurrentClockSpeed FROM Win32_Processor";
-        private const string QueryOperatingSystem = "SELECT ProductType FROM Win32_OperatingSystem";
+        private const string QueryOperatingSystem = "SELECT ProductType,Caption,Version FROM Win32_OperatingSystem";
         private const string QueryPhysicalMemory = "SELECT Capacity FROM Win32_PhysicalMemory";
         private const string QueryAntiVirusProduct = "SELECT DisplayName,ProductState FROM AntiVirusProduct";
 
@@ -122,6 +122,50 @@ public string PhysicalMemory
             }
         }
 
+        private string _osCaption;
+
+        public string OSCaption
+        {
+            get
+            {
+                if (_osCaption == null)
+                {
+                    try
+                    {
+                        GetWin32OperatingSystemData();
+                    }
+                    catch (Exception)
+                    {
+                        //
+                    }
+                }
+
+                return _osCaption;
+            }
+        }
+
+        private string _osVersion;
+
+        public string OSVersion
+        {
+            get
+            {
+                if (_osVersion == null)
+                {
+                    try
+                    {
+                        GetWin32OperatingSystemData();
+                    }
+                    catch (Exception)
+                    {
+                        //
+                    }
+                }
+
+                return _osVersion;
+            }
+        }
+
         private string _productType;
 
         public string ProductType
@@ -242,6 +286,9 @@ private void GetWin32OperatingSystemData()
                             _productType = Unknown + $" [{productType}]";
                             break;
                     }
+
+                    _osCaption = mgtObject["Caption"].ToString();
+                    _osVersion = mgtObject["Version"].ToString();
                 }
             }
             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.2.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
diff --git a/src/Installer/Chem4WordSetup/Setup.Designer.cs b/src/Installer/Chem4WordSetup/Setup.Designer.cs
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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]
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.1.8067")]
-[assembly: AssemblyFileVersion("3.2.1.8067")]
+[assembly: AssemblyVersion("3.2.1.8094")]
+[assembly: AssemblyFileVersion("3.2.1.8094")]