Merged PR 559: Release 1

- Internal: Fix inability to render structure with only a reaction - Internal: Correct some internal testing settings - Performance: Optimised collection access in Molecule for Atoms and Bonds - Security: Updated NuGet packages to latest versions ## Before submitting this PR for code review, please make sure: - [X] "Describe the changes being made to the code and why" above has been replaced - [X] All new files have the standard license headers - [X] CodeMaid has been run against all new or updated files - [X] The code builds clean without any errors or new warnings - [X] All NuGet packages have been updated and Readme.md updated - [X] All Unit Tests pass - [X] You have followed the [Chem4Word Coding Standards](https://chem4word.visualstudio.com/C4W-VNext/_wiki/wikis/C4W-VNext.wiki/2/Coding-Standards) - [X] You have updated the change history (/src/Chem4Word.V3/Data/Chem4Word-Versions.xml) - [X] If appropriate you have updated the manual (/docs/Chem4Word-Version3-2-User-Manual.docx) - [X] The build pipeline is green Related work items: #1019
Chem4Word · Nov 30, 2022 · 9353f1e · 9353f1e
1 parent 78d9fa9
commit 9353f1e
Show file tree

Hide file tree

Showing 68 changed files with 81 additions and 4,840 deletions.
diff --git a/src/Chem4Word.V3-2.sln b/src/Chem4Word.V3-2.sln
@@ -132,8 +132,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chem4Word.Libraries", "Chem
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chem4Word.WebServices", "Chemistry\Chem4Word.WebServices\Chem4Word.WebServices.csproj", "{54F9D4A6-E151-4C65-9D68-16C620B7A6BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinForms.TestLibrary", "TestHarness\WinForms.TestLibrary\WinForms.TestLibrary.csproj", "{0C03B577-B730-4978-A3FB-9FD90E293CE8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF.ShapeTester", "TestHarness\WPF.ShapeTester\WPF.ShapeTester.csproj", "{66114688-4B34-4B67-B14D-49F961683CBB}"
 EndProject
 Global
@@ -681,28 +679,6 @@ Global
 		{54F9D4A6-E151-4C65-9D68-16C620B7A6BC}.Vso-Ci|x64.Build.0 = Debug|Any CPU
 		{54F9D4A6-E151-4C65-9D68-16C620B7A6BC}.Vso-Ci|x86.ActiveCfg = Debug|Any CPU
 		{54F9D4A6-E151-4C65-9D68-16C620B7A6BC}.Vso-Ci|x86.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Release|x64.Build.0 = Release|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Release|x86.Build.0 = Release|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Setup|Any CPU.ActiveCfg = Setup|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Setup|x64.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Setup|x64.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Setup|x86.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Setup|x86.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Vso-Ci|Any CPU.ActiveCfg = Vso-Ci|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Vso-Ci|x64.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Vso-Ci|x64.Build.0 = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Vso-Ci|x86.ActiveCfg = Debug|Any CPU
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8}.Vso-Ci|x86.Build.0 = Debug|Any CPU
 		{66114688-4B34-4B67-B14D-49F961683CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{66114688-4B34-4B67-B14D-49F961683CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66114688-4B34-4B67-B14D-49F961683CBB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -756,7 +732,6 @@ Global
 		{06F77354-9BC7-47A6-9459-2E1D56772C6E} = {0DDBF19B-5D71-4593-A839-D0CF35C6BF3F}
 		{2A5F1D74-CE8E-4874-A803-F3499BB3CFBC} = {0A7C66AA-7788-4EA5-AC94-8CBB354010CD}
 		{54F9D4A6-E151-4C65-9D68-16C620B7A6BC} = {0A7C66AA-7788-4EA5-AC94-8CBB354010CD}
-		{0C03B577-B730-4978-A3FB-9FD90E293CE8} = {2E9CE94F-9664-44CB-90B5-D1E0253E528C}
 		{66114688-4B34-4B67-B14D-49F961683CBB} = {2E9CE94F-9664-44CB-90B5-D1E0253E528C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml
@@ -3,20 +3,19 @@
 <ChangeLog>
     <Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
     <Version>
-        <Number>3.2.5 Beta 5</Number>
-        <IsBeta>true</IsBeta>
-        <Released>07-Sep-2022</Released>
+        <Number>3.2.5 Release 1</Number>
+        <IsBeta>false</IsBeta>
+        <Released>30-Nov-2022</Released>
         <Changes>
-            <Change>...</Change>
-            <Change>...</Change>
-            <Change>...</Change>
+            <Change>Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry</Change>
+            <Change>Internal: Fix inability to render structure with only a reaction</Change>
             <Change>Internal: Correct some internal testing settings</Change>
-	        <Change>Performance: Optimized collection access in Molecule for Atoms and Bonds</Change>
-	        <Change>Security: Updated NuGet packages to latest versions</Change>
+            <Change>Performance: Optimised collection access in Molecule for Atoms and Bonds</Change>
+            <Change>Security: Updated NuGet packages to latest versions</Change>
             <Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
             <Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
         </Changes>
-        <Url>https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.5.Beta.5.msi</Url>
+        <Url>https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.5.Release.1.msi</Url>
     </Version>
     <Version>
         <Number>3.2.4 Beta 4</Number>

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.5 Beta 5</Number>
-  <IsBeta>true</IsBeta>
-  <Released>07-Sep-2022</Released>
+  <Number>3.2.5 Release 1</Number>
+  <IsBeta>false</IsBeta>
+  <Released>30-Nov-2022</Released>
 </Version>
diff --git a/src/Chem4Word.V3/Helpers/UpdateHelper.cs b/src/Chem4Word.V3/Helpers/UpdateHelper.cs
@@ -185,8 +185,8 @@ public static void ReadSavedValues()
                     {
                         try
                         {
-                            var isBeta = key.GetValue(Constants.RegistryValueNameEndOfLife).ToString();
-                            Globals.Chem4WordV3.IsEndOfLife = bool.Parse(isBeta);
+                            var isEndOfLife = key.GetValue(Constants.RegistryValueNameEndOfLife).ToString();
+                            Globals.Chem4WordV3.IsEndOfLife = bool.Parse(isEndOfLife);
                         }
                         catch
                         {

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.5.8285")]
-[assembly: AssemblyFileVersion("3.2.5.8285")]
+[assembly: AssemblyVersion("3.2.5.8369")]
+[assembly: AssemblyFileVersion("3.2.5.8369")]
diff --git a/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj b/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj
@@ -138,11 +138,8 @@
     <Compile Include="Graphics\EquilibriumArrow.cs" />
     <Compile Include="Graphics\Harpoon.cs" />
     <Compile Include="Graphics\RetrosyntheticArrow.cs" />
-    <Compile Include="Models\CloudSpace.cs" />
     <Compile Include="Models\CryptoRandomizer.cs" />
     <Compile Include="Controls\FormulaBlock.cs" />
-    <Compile Include="Entities\FrequencyTable.cs" />
-    <Compile Include="Entities\FrequencyTableRow.cs" />
     <Compile Include="Interfaces\IPositioner.cs" />
     <Compile Include="Interfaces\IRandomizer.cs" />
     <Compile Include="Controls\MoleculePropertyEditor.xaml.cs">
@@ -158,17 +155,12 @@
     <Compile Include="Controls\SketcherHost.xaml.cs">
       <DependentUpon>SketcherHost.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Models\SpiralPositioner.cs" />
     <Compile Include="Controls\TaggingControl.xaml.cs">
       <DependentUpon>TaggingControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\TagItem.xaml.cs">
       <DependentUpon>TagItem.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\WordCloud.xaml.cs">
-      <DependentUpon>WordCloud.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Models\WordCloudData.cs" />
     <Compile Include="Entities\WordCloudEntry.cs" />
     <Compile Include="Entities\WordCloudTheme.cs" />
     <Compile Include="Entities\WordCloudThemes.cs" />
@@ -363,10 +355,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\WordCloud.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="LabelsEditor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/src/Chemistry/Chem4Word.ACME/Controls/WordCloud.xaml b/src/Chemistry/Chem4Word.ACME/Controls/WordCloud.xaml