Merged PR 662: Merge in latest changes

* Remove invalid bond(s) which have the same start and end atoms on import
* Prevent creation of new invalid bond(s) which have the same start and end atoms
* Update seed libraries to be fully patched

Related work items: #1110

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2023, The .NET Foundation. The software is licensed under the (the "License");
+Copyright (c) 2024, The .NET Foundation. The software is licensed under the (the "License");
 you may not use the software except in compliance with the License.
 
                                  Apache License
@@ -178,7 +178,7 @@ you may not use the software except in compliance with the License.
 
    END OF TERMS AND CONDITIONS
 
-   Copyright (c) 2023 Chem4Word
+   Copyright (c) 2024 Chem4Word
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

src/Chem4Word.V3/AssemblyReflectionManager.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/AssemblyReflectionProxy.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Chem4WordOptions.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Chem4WordV3.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Data/Chem4Word-Versions.xml

@@ -2,6 +2,17 @@
 <!-- This file must be uploaded to https://www.chem4word.co.uk/files3-3/ folder as Chem4Word-Versions.xml -->
 <ChangeLog>
     <Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
+    <Version>
+        <Number>3.3.3 Beta 3</Number>
+        <IsBeta>true</IsBeta>
+        <Released>10-Jan-2024</Released>
+        <Changes>
+            <Change>Internal: Replace seed libraries with patched versions</Change>
+            <Change>I/O: Remove invalid bond(s) which have the same start and end atoms on import</Change>
+            <Change>ACME: Prevent creation of new invalid bond(s) which have the same start and end atoms</Change>
+        </Changes>
+        <Url>https://www.chem4word.co.uk/files3-3/Chem4Word-Setup.3.3.3.Beta.3.msi</Url>
+    </Version>
     <Version>
         <Number>3.3.2 Beta 2</Number>
         <IsBeta>true</IsBeta>
@@ -10,7 +21,6 @@
             <Change>Ensure Help button is never disabled.</Change>
             <Change>Add SketchEl file format support.</Change>
         </Changes>
-        <Url>https://www.chem4word.co.uk/files3-3/Chem4Word-Setup.3.3.2.Beta.2.msi</Url>
     </Version>
     <Version>
         <Number>3.3.1 Beta 1</Number>
@@ -22,7 +32,7 @@
             <Change>Fix Right Click Convert to chemistry issues</Change>
             <Change>Fix Windows 11 detection issue</Change>
             <Change>Update user manual</Change>
-            <Change>Private Beta of Chem4Word 2023 (V3.3)</Change>
+            <Change>Private Beta of Chem4Word 2024 (V3.3)</Change>
         </Changes>
     </Version>
     <Version>
@@ -37,11 +47,11 @@
             <Change>Copied changes from V3.2.*</Change>
             <Change>Stability: Improved method to purge old V2 installations to increase system stability</Change>
             <Change>Internal: Update NuGet packages</Change>
-            <Change>Internal: Fetch location of web services from our web site</Change>
+            <Change>Internal: Fetch location of web services from our website</Change>
             <Change>Added basic library manager</Change>
             <Change>Add new Plug-In type (Driver) to manage multiple libraries</Change>
             <Change>Add new converter to model which reads/writes byte[] from Google protocol buffer of model</Change>
-            <Change>Private Alpha of Chem4Word 2023 (V3.3)</Change>
+            <Change>Private Alpha of Chem4Word 2024 (V3.3)</Change>
         </Changes>
     </Version>
     <EndOfLife>31-Dec-2345</EndOfLife>

src/Chem4Word.V3/Data/This-Version.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Version>
-  <Number>3.3.2 Beta 2</Number>
+  <Number>3.3.3 Beta 3</Number>
   <IsBeta>true</IsBeta>
-  <Released>12-Oct-2023</Released>
+  <Released>17-Jan-2024</Released>
 </Version>

src/Chem4Word.V3/Data/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8" />
-    <title>Chemistry for Word Add-In Version 2023</title>
+    <title>Chemistry for Word Add-In Version 2024</title>
 
     <!-- Analytics -->
     <!-- Global site tag (gtag.js) - Google Analytics -->
@@ -18,7 +18,7 @@
     <link rel="stylesheet" type="text/css" href="/css/slider.css" />
 </head>
 <body bgcolor="white">
-    <h1><a href="https://www.chem4word.co.uk">Chemistry for Word Add-In 2023</a></h1>
+    <h1><a href="https://www.chem4word.co.uk">Chemistry for Word Add-In 2024</a></h1>
 
     <!-- Slideshow container -->
     <div class="slideshow-container fade">

src/Chem4Word.V3/Helpers/ApiHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/C4wAddInInfo.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/ChemistryHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/ChemistryObjectComparer.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/ConfigWatcher.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/DtoHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/LibraryFileHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/ReferenceKeeper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/RegistryHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/TargetWord.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/TaskPaneHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/UpdateHelper.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/Upgrader.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Helpers/WordSettings.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Library/LibraryController.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Library/LibraryHost.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Models/CatalogueEntry.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Models/LibrariesSettingsGridSource.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Models/LibraryDetails.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Models/LibraryDownloadGridSource.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Navigator/NavigatorController.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Navigator/NavigatorHost.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Navigator/NavigatorSupport.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Properties/Annotations.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/Properties/AssemblyInfo.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.
@@ -16,7 +16,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Chem4Word")]
 [assembly: AssemblyProduct("Chem4Word V3")]
-[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")]
+[assembly: AssemblyCopyright("© Chem4Word 2024. All rights reserved.")]
 [assembly: AssemblyTrademark("Chem4Word")]
 [assembly: AssemblyCulture("")]
 
@@ -35,5 +35,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.2.8685")]
-[assembly: AssemblyFileVersion("3.3.2.8685")]
+[assembly: AssemblyVersion("3.3.3.8782")]
+[assembly: AssemblyFileVersion("3.3.3.8782")]

src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.
@@ -734,6 +734,15 @@ public static void PerformEdit()
                                                 var cmlConverter = new CMLConverter();
                                                 var beforeModel = cmlConverter.Import(beforeCml);
 
+                                                if (beforeModel.AllErrors.Count > 0)
+                                                {
+                                                    Globals.Chem4WordV3.Telemetry.Write(module, "Exception(Data)", string.Join(Environment.NewLine, beforeModel.AllErrors));
+                                                }
+                                                if (beforeModel.AllWarnings.Count > 0)
+                                                {
+                                                    Globals.Chem4WordV3.Telemetry.Write(module, "Exception(Data)", string.Join(Environment.NewLine, beforeModel.AllWarnings));
+                                                }
+
                                                 if (beforeModel.TotalAtomsCount == 0 && !beforeModel.HasReactions)
                                                 {
                                                     UserInteractions.InformUser("This chemistry item has no 2D data to edit!\nPlease use the 'Edit Labels' button.");
@@ -2061,11 +2070,11 @@ private void OnClick_ShowAbout(object sender, RibbonControlEventArgs e)
                         {
                             var temp = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value;
                             var idx = temp.IndexOf(" ", StringComparison.InvariantCulture);
-                            ah.VersionString = $"Chem4Word 2023 {temp.Substring(idx + 1)}";
+                            ah.VersionString = $"Chem4Word 2024 {temp.Substring(idx + 1)}";
                         }
                         else
                         {
-                            ah.VersionString = $"Chem4Word 2023 {fvi.FileVersion}";
+                            ah.VersionString = $"Chem4Word 2024 {fvi.FileVersion}";
                         }
                         ah.ShowDialog();
                     }

src/Chem4Word.V3/UI/AutomaticUpdate.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.

src/Chem4Word.V3/UI/ImportErrors.cs

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-//  Copyright (c) 2023, The .NET Foundation.
+//  Copyright (c) 2024, The .NET Foundation.
 //  This software is released under the Apache License, Version 2.0.
 //  The license and further copyright text can be found in the file LICENSE.md
 //  at the root directory of the distribution.