diff --git a/LICENSE.md b/LICENSE.md index f89627c0..d15f7961 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2022, The .NET Foundation. The software is licensed under the (the "License"); +Copyright (c) 2023, 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) 2022 Chem4Word + Copyright (c) 2023 Chem4Word Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 04ad83f4..90e9a5fd 100644 --- a/README.md +++ b/README.md @@ -19,50 +19,49 @@ Azure Devops Build must be set to use VS2022 build agent | Package | Version | Licence | Reference Count | |--|--|--|--| |Azure.Core.Amqp|1.2.0|MIT|2| -|Azure.Core|1.25.0|MIT|2| -|Azure.Messaging.ServiceBus|7.10.0|MIT|2| -|DocumentFormat.OpenXml|2.17.1|MIT|3| +|Azure.Core|1.27.0|MIT|2| +|Azure.Messaging.ServiceBus|7.12.0|MIT|2| +|DocumentFormat.OpenXml|2.19.0|MIT|2| |DotNetProjects.WpfToolkit.Input|6.1.94|MS-PL|1| -|EntityFramework|6.4.4|Apache-2.0|3| +|EntityFramework|6.4.4|Apache-2.0|2| |Jacobslusser.ScintillaNET|3.6.3|MIT|1| -|Microsoft.Azure.Amqp|2.5.12|MIT|2| -|Microsoft.Bcl.AsyncInterfaces|6.0.0|MIT|2| -|Microsoft.NETCore.Platforms|6.0.5|MIT|2| +|Microsoft.Azure.Amqp|2.6.1|MIT|2| +|Microsoft.Bcl.AsyncInterfaces|7.0.0|MIT|2| +|Microsoft.NETCore.Platforms|7.0.0|MIT|2| |Microsoft.NETCore.Targets|5.0.0|MIT|2| |Microsoft.Xaml.Behaviors.Wpf|1.1.39|MIT|1| |Microsoft_VisualStudio_QualityTools_UnitTestFramework.STW|12.0.21005.1|Microsoft|1| -|Newtonsoft.Json|13.0.1|MIT|16| +|Newtonsoft.Json|13.0.2|MIT|15| |Ookii.Dialogs.WinForms|4.0.0|Public Domain|1| -|Stub.System.Data.SQLite.Core.NetFramework|1.0.116.0|Public Domain|3| +|Stub.System.Data.SQLite.Core.NetFramework|1.0.117.0|Public Domain|2| |System.Buffers|4.5.1|MIT|3| -|System.Collections.Immutable|6.0.0|MIT|1| -|System.Data.SQLite.Core|1.0.116.0|Public Domain|3| -|System.Data.SQLite.EF6|1.0.116.0|Public Domain|3| -|System.Data.SQLite.Linq|1.0.116.0|Public Domain|3| -|System.Data.SQLite|1.0.116.0|Public Domain|3| -|System.Diagnostics.DiagnosticSource|6.0.0|MIT|2| -|System.IO.FileSystem.Primitives|4.3.0|MS-.NET-Library|3| -|System.IO.Packaging|6.0.0|MIT|3| -|System.Memory.Data|6.0.0|MIT|2| +|System.Collections.Immutable|7.0.0|MIT|1| +|System.Data.SQLite.Core|1.0.117.0|Public Domain|2| +|System.Data.SQLite.EF6|1.0.117.0|Public Domain|2| +|System.Data.SQLite.Linq|1.0.117.0|Public Domain|2| +|System.Data.SQLite|1.0.117.0|Public Domain|2| +|System.Diagnostics.DiagnosticSource|7.0.0|Public Domain|2| +|System.IO.FileSystem.Primitives|4.3.0|MS-.NET-Library|2| +|System.IO.Packaging|7.0.0|MIT|2| +|System.Memory.Data|7.0.0|MIT|2| |System.Memory|4.5.5|MIT|3| |System.Net.Http|4.3.4|MS-.NET-Library|9| |System.Numerics.Vectors|4.5.0|MIT|3| |System.Private.Uri|4.3.2|MIT|2| -|System.Resources.Extensions|6.0.0|MIT|1| +|System.Resources.Extensions|7.0.0|MIT|1| |System.Runtime.CompilerServices.Unsafe|6.0.0|MIT|3| |System.Runtime.InteropServices.RuntimeInformation|4.3.0|MS-.NET-Library|2| |System.Security.Cryptography.Algorithms|4.3.1|MS-.NET-Library|9| |System.Security.Cryptography.Encoding|4.3.0|MS-.NET-Library|9| |System.Security.Cryptography.Primitives|4.3.0|MS-.NET-Library|9| |System.Security.Cryptography.X509Certificates|4.3.2|MS-.NET-Library|9| -|System.Text.Encodings.Web|6.0.0|MIT|2| -|System.Text.Json|6.0.5|MIT|2| +|System.Text.Encodings.Web|7.0.0|MIT|2| +|System.Text.Json|7.0.1|MIT|2| |System.Threading.Tasks.Extensions|4.5.4|MIT|2| |System.ValueTuple|4.5.0|MIT|5| |Unofficial.Ionic.Zip|1.9.1.8|Unknown ?|3| -|VirtualizingWrapPanel|1.5.7|MIT|1| |xunit.abstractions|2.0.3|Apache-2.0|1| -|xunit.analyzers|1.0.0|Apache-2.0|1| +|xunit.analyzers|1.1.0|Apache-2.0|1| |xunit.assert|2.4.2|Apache-2.0|1| |xunit.core|2.4.2|Apache-2.0|1| |xunit.extensibility.core|2.4.2|Apache-2.0|1| diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config index b02518ef..103b2f53 100644 --- a/src/.nuget/NuGet.Config +++ b/src/.nuget/NuGet.Config @@ -9,4 +9,7 @@ + + + \ No newline at end of file diff --git a/src/Chem4Word.V3-2.sln b/src/Chem4Word.V3-2.sln index d492f3a5..b0b1c825 100644 --- a/src/Chem4Word.V3-2.sln +++ b/src/Chem4Word.V3-2.sln @@ -89,7 +89,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{53F5 Scripts\Clone-Setup-V2.ps1 = Scripts\Clone-Setup-V2.ps1 Scripts\Clone-Setup-V3.ps1 = Scripts\Clone-Setup-V3.ps1 Scripts\Clone-Setup-V31.ps1 = Scripts\Clone-Setup-V31.ps1 - Scripts\DeepClean.ps1 = Scripts\DeepClean.ps1 + Scripts\Detect-Invalid-Config.ps1 = Scripts\Detect-Invalid-Config.ps1 Scripts\GetBackToSquareOne.ps1 = Scripts\GetBackToSquareOne.ps1 Scripts\Install-Dev-Certificate.ps1 = Scripts\Install-Dev-Certificate.ps1 Scripts\SetAssemblyVersion.ps1 = Scripts\SetAssemblyVersion.ps1 diff --git a/src/Chem4Word.V3/AssemblyReflectionManager.cs b/src/Chem4Word.V3/AssemblyReflectionManager.cs index fb3a66ae..b065fb79 100644 --- a/src/Chem4Word.V3/AssemblyReflectionManager.cs +++ b/src/Chem4Word.V3/AssemblyReflectionManager.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/AssemblyReflectionProxy.cs b/src/Chem4Word.V3/AssemblyReflectionProxy.cs index 2cede630..c562e853 100644 --- a/src/Chem4Word.V3/AssemblyReflectionProxy.cs +++ b/src/Chem4Word.V3/AssemblyReflectionProxy.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Chem4Word.V3.csproj b/src/Chem4Word.V3/Chem4Word.V3.csproj index b163e0ce..3321df28 100644 --- a/src/Chem4Word.V3/Chem4Word.V3.csproj +++ b/src/Chem4Word.V3/Chem4Word.V3.csproj @@ -156,17 +156,17 @@ --> - - ..\packages\Azure.Core.1.25.0\lib\net461\Azure.Core.dll + + ..\packages\Azure.Core.1.27.0\lib\net461\Azure.Core.dll ..\packages\Azure.Core.Amqp.1.2.0\lib\netstandard2.0\Azure.Core.Amqp.dll - - ..\packages\Azure.Messaging.ServiceBus.7.10.0\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll + + ..\packages\Azure.Messaging.ServiceBus.7.12.0\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll - - ..\packages\DocumentFormat.OpenXml.2.17.1\lib\net46\DocumentFormat.OpenXml.dll + + ..\packages\DocumentFormat.OpenXml.2.19.0\lib\net46\DocumentFormat.OpenXml.dll ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -179,10 +179,10 @@ True - ..\packages\Microsoft.Azure.Amqp.2.5.12\lib\net45\Microsoft.Azure.Amqp.dll + ..\packages\Microsoft.Azure.Amqp.2.6.1\lib\net45\Microsoft.Azure.Amqp.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll True @@ -199,7 +199,7 @@ - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll True @@ -218,18 +218,18 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Data.SQLite.EF6.1.0.116.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\packages\System.Data.SQLite.EF6.1.0.117.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\packages\System.Data.SQLite.Linq.1.0.116.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\packages\System.Data.SQLite.Linq.1.0.117.0\lib\net46\System.Data.SQLite.Linq.dll - - ..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll @@ -237,14 +237,14 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\packages\System.IO.Packaging.6.0.0\lib\net461\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.7.0.0\lib\net462\System.IO.Packaging.dll ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\packages\System.Memory.Data.6.0.0\lib\net461\System.Memory.Data.dll + + ..\packages\System.Memory.Data.7.0.0\lib\net462\System.Memory.Data.dll @@ -257,8 +257,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Resources.Extensions.6.0.0\lib\net461\System.Resources.Extensions.dll + + ..\packages\System.Resources.Extensions.7.0.0\lib\net462\System.Resources.Extensions.dll @@ -290,11 +290,11 @@ True - - ..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.6.0.5\lib\net461\System.Text.Json.dll + + ..\packages\System.Text.Json.7.0.1\lib\net462\System.Text.Json.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -698,10 +698,8 @@ - - + - - + \ No newline at end of file diff --git a/src/Chem4Word.V3/Chem4WordOptions.cs b/src/Chem4Word.V3/Chem4WordOptions.cs index a3298098..a619855f 100644 --- a/src/Chem4Word.V3/Chem4WordOptions.cs +++ b/src/Chem4Word.V3/Chem4WordOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Chem4WordV3.cs b/src/Chem4Word.V3/Chem4WordV3.cs index 106aeac5..1998424a 100644 --- a/src/Chem4Word.V3/Chem4WordV3.cs +++ b/src/Chem4Word.V3/Chem4WordV3.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml index 5f14b66f..8bb242c1 100644 --- a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml +++ b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml @@ -2,6 +2,20 @@ f3c4f4db-2fff-46db-b14a-feb8e09f7742 + + 3.2.7 Release 3 + false + 02-Feb-2023 + + Stability: Improved method to purge old V2 installations to increase system stability + Internal: Update NuGet packages + Internal: Fetch location of web services from our web site + Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry + If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word + Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating + + https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.7.Release.3.msi + 3.2.6 Release 2 false @@ -9,10 +23,7 @@ Fix app.config files to remove references to System.Net.Http Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry - If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word - Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating - https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.6.Release.2.msi 3.2.5 Release 1 diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml index 7dabd509..ea84d949 100644 --- a/src/Chem4Word.V3/Data/This-Version.xml +++ b/src/Chem4Word.V3/Data/This-Version.xml @@ -1,6 +1,6 @@  - 3.2.6 Release 2 + 3.2.7 Release 3 false - 05-Dec-2022 + 02-Feb-2023 \ No newline at end of file diff --git a/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs b/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs index 32b57be8..78860774 100644 --- a/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs +++ b/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/ChemistryHelper.cs b/src/Chem4Word.V3/Helpers/ChemistryHelper.cs index a255799f..fcc045a3 100644 --- a/src/Chem4Word.V3/Helpers/ChemistryHelper.cs +++ b/src/Chem4Word.V3/Helpers/ChemistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/ConfigWatcher.cs b/src/Chem4Word.V3/Helpers/ConfigWatcher.cs index 0eb9c3e4..fdf0fdfc 100644 --- a/src/Chem4Word.V3/Helpers/ConfigWatcher.cs +++ b/src/Chem4Word.V3/Helpers/ConfigWatcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs b/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs index b716884a..86cfabd4 100644 --- a/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs +++ b/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/DocumentHelper.cs b/src/Chem4Word.V3/Helpers/DocumentHelper.cs index a20ca62d..ef1e9790 100644 --- a/src/Chem4Word.V3/Helpers/DocumentHelper.cs +++ b/src/Chem4Word.V3/Helpers/DocumentHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs b/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs index ffa4b551..878940c9 100644 --- a/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs +++ b/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/RegistryHelper.cs b/src/Chem4Word.V3/Helpers/RegistryHelper.cs index 36bab23d..7587af7f 100644 --- a/src/Chem4Word.V3/Helpers/RegistryHelper.cs +++ b/src/Chem4Word.V3/Helpers/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/TargetWord.cs b/src/Chem4Word.V3/Helpers/TargetWord.cs index f406c3ea..0cf94bd8 100644 --- a/src/Chem4Word.V3/Helpers/TargetWord.cs +++ b/src/Chem4Word.V3/Helpers/TargetWord.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs b/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs index 859acde6..30d6be1e 100644 --- a/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs +++ b/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/UpdateHelper.cs b/src/Chem4Word.V3/Helpers/UpdateHelper.cs index 349c14d3..e517ad3a 100644 --- a/src/Chem4Word.V3/Helpers/UpdateHelper.cs +++ b/src/Chem4Word.V3/Helpers/UpdateHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. @@ -319,18 +319,18 @@ private static string GetVersionsXmlFile() { string module = $"{_product}.{_class}.{MethodBase.GetCurrentMethod().Name}()"; - string VersionsFile = $"{Constants.Chem4WordVersionFiles}/Chem4Word-Versions.xml"; - string PrimaryDomain = "https://www.chem4word.co.uk"; - string[] Domains = { "https://www.chem4word.co.uk", "http://www.chem4word.com", "https://chem4word.azurewebsites.net" }; - string VersionsFileMarker = "f3c4f4db-2fff-46db-b14a-feb8e09f7742"; + string primaryDomain = Constants.OurDomains.FirstOrDefault(); + string versionsFileMarker = "f3c4f4db-2fff-46db-b14a-feb8e09f7742"; + + string versionsFile = $"{Constants.Chem4WordVersionFiles}/Chem4Word-Versions.xml"; string contents = null; var securityProtocol = ServicePointManager.SecurityProtocol; - ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; + ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls12; bool foundOurXmlFile = false; - foreach (var domain in Domains) + foreach (var domain in Constants.OurDomains) { using (HttpClient client = new HttpClient()) { @@ -342,14 +342,14 @@ private static string GetVersionsXmlFile() client.DefaultRequestHeaders.Add("user-agent", "Chem4Word VersionChecker"); client.BaseAddress = new Uri(domain); - var response = client.GetAsync(VersionsFile).Result; + var response = client.GetAsync(versionsFile).Result; response.EnsureSuccessStatusCode(); string result = response.Content.ReadAsStringAsync().Result; - if (result.Contains(VersionsFileMarker)) + if (result.Contains(versionsFileMarker)) { foundOurXmlFile = true; - contents = domain.Equals(PrimaryDomain) ? result : result.Replace(PrimaryDomain, domain); + contents = domain.Equals(primaryDomain) ? result : result.Replace(primaryDomain, domain); } else { diff --git a/src/Chem4Word.V3/Helpers/Upgrader.cs b/src/Chem4Word.V3/Helpers/Upgrader.cs index 9a17aa34..1c75cf1b 100644 --- a/src/Chem4Word.V3/Helpers/Upgrader.cs +++ b/src/Chem4Word.V3/Helpers/Upgrader.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Helpers/WordSettings.cs b/src/Chem4Word.V3/Helpers/WordSettings.cs index f0abfc4f..de294945 100644 --- a/src/Chem4Word.V3/Helpers/WordSettings.cs +++ b/src/Chem4Word.V3/Helpers/WordSettings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Library/LibraryController.cs b/src/Chem4Word.V3/Library/LibraryController.cs index 8a828dfe..6dc089ef 100644 --- a/src/Chem4Word.V3/Library/LibraryController.cs +++ b/src/Chem4Word.V3/Library/LibraryController.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Library/LibraryHost.cs b/src/Chem4Word.V3/Library/LibraryHost.cs index 37b0cda8..7830a251 100644 --- a/src/Chem4Word.V3/Library/LibraryHost.cs +++ b/src/Chem4Word.V3/Library/LibraryHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs b/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs index a387c03d..d33d006e 100644 --- a/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs +++ b/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Navigator/NavigatorController.cs b/src/Chem4Word.V3/Navigator/NavigatorController.cs index 86c5ccf5..cac8f413 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorController.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorController.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Navigator/NavigatorHost.cs b/src/Chem4Word.V3/Navigator/NavigatorHost.cs index 7a325800..67d63741 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorHost.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Navigator/NavigatorSupport.cs b/src/Chem4Word.V3/Navigator/NavigatorSupport.cs index 4ca59e86..a88ac330 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorSupport.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorSupport.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs b/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs index da190e4a..73e5b4a9 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Properties/Annotations.cs b/src/Chem4Word.V3/Properties/Annotations.cs index 50c7d844..bdc1c406 100644 --- a/src/Chem4Word.V3/Properties/Annotations.cs +++ b/src/Chem4Word.V3/Properties/Annotations.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs index ca235090..3fa9b509 100644 --- a/src/Chem4Word.V3/Properties/AssemblyInfo.cs +++ b/src/Chem4Word.V3/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs index 73febc2e..6c2f03f1 100644 --- a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs +++ b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/AutomaticUpdate.cs b/src/Chem4Word.V3/UI/AutomaticUpdate.cs index 842b082f..90023cd7 100644 --- a/src/Chem4Word.V3/UI/AutomaticUpdate.cs +++ b/src/Chem4Word.V3/UI/AutomaticUpdate.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/ImportErrors.cs b/src/Chem4Word.V3/UI/ImportErrors.cs index 7f05aef8..2bbbb925 100644 --- a/src/Chem4Word.V3/UI/ImportErrors.cs +++ b/src/Chem4Word.V3/UI/ImportErrors.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/PlugInComboItem.cs b/src/Chem4Word.V3/UI/PlugInComboItem.cs index 2347c1c8..bb7baea2 100644 --- a/src/Chem4Word.V3/UI/PlugInComboItem.cs +++ b/src/Chem4Word.V3/UI/PlugInComboItem.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/SystemInfo.cs b/src/Chem4Word.V3/UI/SystemInfo.cs index 005948d6..02d32bcb 100644 --- a/src/Chem4Word.V3/UI/SystemInfo.cs +++ b/src/Chem4Word.V3/UI/SystemInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/UpdateFailure.cs b/src/Chem4Word.V3/UI/UpdateFailure.cs index d3a1b1fc..a871e901 100644 --- a/src/Chem4Word.V3/UI/UpdateFailure.cs +++ b/src/Chem4Word.V3/UI/UpdateFailure.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/WPF/AboutControl.xaml.cs b/src/Chem4Word.V3/UI/WPF/AboutControl.xaml.cs index cbc3fe93..9190cebb 100644 --- a/src/Chem4Word.V3/UI/WPF/AboutControl.xaml.cs +++ b/src/Chem4Word.V3/UI/WPF/AboutControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/WPF/AboutHost.cs b/src/Chem4Word.V3/UI/WPF/AboutHost.cs index c7effbf0..d9c8199c 100644 --- a/src/Chem4Word.V3/UI/WPF/AboutHost.cs +++ b/src/Chem4Word.V3/UI/WPF/AboutHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsControl.xaml.cs b/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsControl.xaml.cs index 712f37d0..54e01321 100644 --- a/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsControl.xaml.cs +++ b/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsHost.cs b/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsHost.cs index 5d1f4f58..c2c1c478 100644 --- a/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsHost.cs +++ b/src/Chem4Word.V3/UI/WPF/Chem4WordSettingsHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/WPF/EditLabelsHost.cs b/src/Chem4Word.V3/UI/WPF/EditLabelsHost.cs index ff1854ac..6c572c8b 100644 --- a/src/Chem4Word.V3/UI/WPF/EditLabelsHost.cs +++ b/src/Chem4Word.V3/UI/WPF/EditLabelsHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/UI/XmlViewer.cs b/src/Chem4Word.V3/UI/XmlViewer.cs index b2c481b9..dd9be0ba 100644 --- a/src/Chem4Word.V3/UI/XmlViewer.cs +++ b/src/Chem4Word.V3/UI/XmlViewer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chem4Word.V3/app.config b/src/Chem4Word.V3/app.config index f28bcb9d..94bb427e 100644 --- a/src/Chem4Word.V3/app.config +++ b/src/Chem4Word.V3/app.config @@ -14,22 +14,6 @@ - - - - - - - - - - - - - - - - @@ -42,22 +26,6 @@ - - - - - - - - - - - - - - - - @@ -72,11 +40,11 @@ - + - + @@ -88,15 +56,15 @@ - + - + - + @@ -140,16 +108,10 @@ - - - - - - - + \ No newline at end of file diff --git a/src/Chem4Word.V3/packages.config b/src/Chem4Word.V3/packages.config index 98278992..4774c8de 100644 --- a/src/Chem4Word.V3/packages.config +++ b/src/Chem4Word.V3/packages.config @@ -1,39 +1,39 @@  - + - - + + - - - + + + - + - + - - - - - + + + + + - + - + - + - - + + diff --git a/src/Chemistry/Chem4Word.ACME/AcmeOptions.cs b/src/Chemistry/Chem4Word.ACME/AcmeOptions.cs index afc6f822..75909285 100644 --- a/src/Chemistry/Chem4Word.ACME/AcmeOptions.cs +++ b/src/Chemistry/Chem4Word.ACME/AcmeOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/AtomHoverAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/AtomHoverAdorner.cs index bed28bf6..31e062bb 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/AtomHoverAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/AtomHoverAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BaseHoverAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BaseHoverAdorner.cs index ad18b7f4..3b6c7ae0 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BaseHoverAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BaseHoverAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BondHoverAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BondHoverAdorner.cs index deaacd5b..a06436f8 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BondHoverAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/BondHoverAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/GroupHoverAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/GroupHoverAdorner.cs index e0870529..e2b492cd 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/GroupHoverAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/GroupHoverAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/HRotatorAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/HRotatorAdorner.cs index fadcbd5a..1fe28bde 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/HRotatorAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/HRotatorAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/ReactionHoverAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/ReactionHoverAdorner.cs index 400202d7..e0a71b48 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/ReactionHoverAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Feedback/ReactionHoverAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/LassoAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/LassoAdorner.cs index a0fe035e..cbce63e5 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/LassoAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/LassoAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/PartialGhostAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/PartialGhostAdorner.cs index 9f557dba..ba3869c1 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/PartialGhostAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/PartialGhostAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/BaseSelectionAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/BaseSelectionAdorner.cs index 3d1adb45..f5b4fa4e 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/BaseSelectionAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/BaseSelectionAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/GroupSelectionAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/GroupSelectionAdorner.cs index 18aca561..791b3ee6 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/GroupSelectionAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/GroupSelectionAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MoleculeSelectionAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MoleculeSelectionAdorner.cs index 8fa2daeb..7940c402 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MoleculeSelectionAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MoleculeSelectionAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiAtomBondAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiAtomBondAdorner.cs index a83426e1..c40878ab 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiAtomBondAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiAtomBondAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiObjectAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiObjectAdorner.cs index 33216214..f5c71175 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiObjectAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/MultiObjectAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/ReactionSelectionAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/ReactionSelectionAdorner.cs index 76c7666f..8dfd04d1 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/ReactionSelectionAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/ReactionSelectionAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleChemistryAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleChemistryAdorner.cs index 42075247..4701f44e 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleChemistryAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleChemistryAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleObjectSelectionAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleObjectSelectionAdorner.cs index b27ccb3e..2fdb425a 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleObjectSelectionAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Selectors/SingleObjectSelectionAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/ChainAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/ChainAdorner.cs index 27aa73a8..cdfa7299 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/ChainAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/ChainAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawBondAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawBondAdorner.cs index 78bc023d..484e79ba 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawBondAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawBondAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawReactionAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawReactionAdorner.cs index daf36cd2..7143516d 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawReactionAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/DrawReactionAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FixedRingAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FixedRingAdorner.cs index 4c795e0e..b343bf91 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FixedRingAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FixedRingAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FloatingSymbolAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FloatingSymbolAdorner.cs index ae2a831f..52bd3cdc 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FloatingSymbolAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/FloatingSymbolAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/NRingAdorner.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/NRingAdorner.cs index c241a8e3..109ee530 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/NRingAdorner.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/NRingAdorner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/RingDrawer.cs b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/RingDrawer.cs index 5a6b3820..ac53bd3e 100644 --- a/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/RingDrawer.cs +++ b/src/Chemistry/Chem4Word.ACME/Adorners/Sketching/RingDrawer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/AdjustScaleToFitContentBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/AdjustScaleToFitContentBehavior.cs index d5ad475f..75b86be9 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/AdjustScaleToFitContentBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/AdjustScaleToFitContentBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/AnnotationBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/AnnotationBehavior.cs index b391d709..d4ed6060 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/AnnotationBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/AnnotationBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/BaseEditBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/BaseEditBehavior.cs index af69716e..2b01855e 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/BaseEditBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/BaseEditBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/CandidatePlacement.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/CandidatePlacement.cs index c13fbf48..00ef6022 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/CandidatePlacement.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/CandidatePlacement.cs @@ -1,4 +1,11 @@ -using System.Windows; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Windows; namespace Chem4Word.ACME.Behaviors { @@ -10,4 +17,4 @@ public class CandidatePlacement public Point PossiblePlacement { get; set; } public bool Crowding { get; set; } } -} \ No newline at end of file +} diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/ChainBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/ChainBehavior.cs index 14e12268..c8589644 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/ChainBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/ChainBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/DeleteBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/DeleteBehavior.cs index e33eca30..d3cb9e1b 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/DeleteBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/DeleteBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/DrawBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/DrawBehavior.cs index 7c1c5f35..6a0f6c3b 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/DrawBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/DrawBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/IgnoreMouseWheelBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/IgnoreMouseWheelBehavior.cs index a966ed96..e2f672e2 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/IgnoreMouseWheelBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/IgnoreMouseWheelBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/NRingBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/NRingBehavior.cs index 99686eea..90ef06ab 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/NRingBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/NRingBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/ReactionBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/ReactionBehavior.cs index 13fb0d17..e18df0d6 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/ReactionBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/ReactionBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/RingBehavior.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/RingBehavior.cs index 67fdb202..a35247a7 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/RingBehavior.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/RingBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Behaviors/SelectBehaviour.cs b/src/Chemistry/Chem4Word.ACME/Behaviors/SelectBehaviour.cs index d8c40746..8a203e1c 100644 --- a/src/Chemistry/Chem4Word.ACME/Behaviors/SelectBehaviour.cs +++ b/src/Chemistry/Chem4Word.ACME/Behaviors/SelectBehaviour.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj b/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj index 6b593dd4..7a845289 100644 --- a/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj +++ b/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj @@ -55,7 +55,7 @@ ..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -63,8 +63,8 @@ ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\packages\System.Collections.Immutable.6.0.0\lib\net461\System.Collections.Immutable.dll + + ..\..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll @@ -443,7 +443,6 @@ - diff --git a/src/Chemistry/Chem4Word.ACME/CmlEditor.xaml.cs b/src/Chemistry/Chem4Word.ACME/CmlEditor.xaml.cs index 7700a393..d0544dd2 100644 --- a/src/Chemistry/Chem4Word.ACME/CmlEditor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/CmlEditor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/BaseCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/BaseCommand.cs index 6edb3032..ee4d74d9 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/BaseCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/BaseCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/InsertTextCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/InsertTextCommand.cs index b8a6d914..92012746 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/InsertTextCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/InsertTextCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SubscriptCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SubscriptCommand.cs index 086a154e..70d10060 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SubscriptCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SubscriptCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SuperscriptCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SuperscriptCommand.cs index 84a19615..0c433b79 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SuperscriptCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Block Editing/SuperscriptCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Editing/CopyCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Editing/CopyCommand.cs index 64d9f0db..f9f9a80e 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Editing/CopyCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Editing/CopyCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Editing/CutCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Editing/CutCommand.cs index 26b1c71a..4af97bd7 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Editing/CutCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Editing/CutCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Editing/PasteCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Editing/PasteCommand.cs index 3dbe8c88..8cd8837d 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Editing/PasteCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Editing/PasteCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Editing/PickElementCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Editing/PickElementCommand.cs index bad1761a..f387ae91 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Editing/PickElementCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Editing/PickElementCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/FuseCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/FuseCommand.cs index ea1ac34a..88600aa3 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/FuseCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/FuseCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Grouping/GroupCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Grouping/GroupCommand.cs index ad4e2f64..58f324a0 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Grouping/GroupCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Grouping/GroupCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Grouping/UnGroupCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Grouping/UnGroupCommand.cs index 546a970a..590e9745 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Grouping/UnGroupCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Grouping/UnGroupCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignBottomsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignBottomsCommand.cs index 3e934d09..65e77dfb 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignBottomsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignBottomsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCentresCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCentresCommand.cs index 9536d249..c075f141 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCentresCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCentresCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCommand.cs index a6261043..c069374b 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignLeftsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignLeftsCommand.cs index 9826034b..28907108 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignLeftsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignLeftsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignMiddlesCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignMiddlesCommand.cs index df28b880..2fb0ddee 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignMiddlesCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignMiddlesCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignOnlyMoleculesCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignOnlyMoleculesCommand.cs index a2f719bb..7fd39312 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignOnlyMoleculesCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignOnlyMoleculesCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignRightsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignRightsCommand.cs index 253999d3..1afc852b 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignRightsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignRightsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignTopsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignTopsCommand.cs index efe9ece8..40c27a12 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignTopsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Alignment/AlignTopsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipCommand.cs index 365154ae..75bb3c1f 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipHorizontalCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipHorizontalCommand.cs index 220d72c6..fc8ff521 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipHorizontalCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipHorizontalCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipVerticalCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipVerticalCommand.cs index 1eb1fcbd..e323ea72 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipVerticalCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Layout/Flipping/FlipVerticalCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/AssignReactionRolesCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/AssignReactionRolesCommand.cs index 00184efc..f8ef162e 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/AssignReactionRolesCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/AssignReactionRolesCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/ClearReactionRolesCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/ClearReactionRolesCommand.cs index 03516e29..1cccda7c 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/ClearReactionRolesCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/ClearReactionRolesCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditAnnotationCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditAnnotationCommand.cs index b3b60bfe..aed1542e 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditAnnotationCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditAnnotationCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditConditionsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditConditionsCommand.cs index cb492dd0..6ac854fd 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditConditionsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditConditionsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditReagentsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditReagentsCommand.cs index c81f03dc..6d213cf7 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditReagentsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Reactions/EditReagentsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/SettingsCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/SettingsCommand.cs index 9a3fec71..6612d583 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/SettingsCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/SettingsCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddAtomCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddAtomCommand.cs index ffe855a5..883523d3 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddAtomCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddAtomCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddHydrogensCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddHydrogensCommand.cs index 24e732e1..88089661 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddHydrogensCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Sketching/AddHydrogensCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Sketching/RemoveHydrogensCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Sketching/RemoveHydrogensCommand.cs index d787b231..bed97436 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Sketching/RemoveHydrogensCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Sketching/RemoveHydrogensCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Undo/RedoCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Undo/RedoCommand.cs index ff4632d6..fbbdc205 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Undo/RedoCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Undo/RedoCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Commands/Undo/UndoCommand.cs b/src/Chemistry/Chem4Word.ACME/Commands/Undo/UndoCommand.cs index b79b5c39..a6c6b130 100644 --- a/src/Chemistry/Chem4Word.ACME/Commands/Undo/UndoCommand.cs +++ b/src/Chemistry/Chem4Word.ACME/Commands/Undo/UndoCommand.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controller.cs b/src/Chemistry/Chem4Word.ACME/Controller.cs index 2db9c0b4..42717cd7 100644 --- a/src/Chemistry/Chem4Word.ACME/Controller.cs +++ b/src/Chemistry/Chem4Word.ACME/Controller.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditor.cs b/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditor.cs index 2dc78a21..acd21ac2 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditor.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorEventArgs.cs b/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorEventArgs.cs index fa5c5288..6de7d8d5 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorEventArgs.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorEventArgs.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorExitArgsType.cs b/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorExitArgsType.cs index 067c1986..d1529727 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorExitArgsType.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/AnnotationEditorExitArgsType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/AtomOption.cs b/src/Chemistry/Chem4Word.ACME/Controls/AtomOption.cs index 9819c11c..d1b2b12b 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/AtomOption.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/AtomOption.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/AtomPropertyEditor.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/AtomPropertyEditor.xaml.cs index 52067703..33c08ff0 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/AtomPropertyEditor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/AtomPropertyEditor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/BondOption.cs b/src/Chemistry/Chem4Word.ACME/Controls/BondOption.cs index 35392259..cb583013 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/BondOption.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/BondOption.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/BondPropertyEditor.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/BondPropertyEditor.xaml.cs index de8cd0fe..be9beec5 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/BondPropertyEditor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/BondPropertyEditor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/ChemistryCanvas.cs b/src/Chemistry/Chem4Word.ACME/Controls/ChemistryCanvas.cs index 2349e2dc..3b62a644 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/ChemistryCanvas.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/ChemistryCanvas.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/ChemistryItem.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/ChemistryItem.xaml.cs index 7a121f94..d434cf7b 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/ChemistryItem.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/ChemistryItem.xaml.cs @@ -1,4 +1,11 @@ -using System.Windows; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Windows; using System.Windows.Controls; using System.Windows.Input; using Chem4Word.ACME.Enums; @@ -192,4 +199,4 @@ private void AcmeDisplay_OnMouseDoubleClick(object sender, MouseButtonEventArgs } } } -} \ No newline at end of file +} diff --git a/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/ApeDesigner.cs b/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/ApeDesigner.cs index 3e38e9c5..36fafaa1 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/ApeDesigner.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/ApeDesigner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/BpeDesigner.cs b/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/BpeDesigner.cs index 5860b27b..b6aa4f6b 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/BpeDesigner.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/DesignTimeModels/BpeDesigner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/DragHandle.cs b/src/Chemistry/Chem4Word.ACME/Controls/DragHandle.cs index 7159ad31..7e6bc12e 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/DragHandle.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/DragHandle.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/EditorCanvas.cs b/src/Chemistry/Chem4Word.ACME/Controls/EditorCanvas.cs index d294f823..ed395c37 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/EditorCanvas.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/EditorCanvas.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/FormulaBlock.cs b/src/Chemistry/Chem4Word.ACME/Controls/FormulaBlock.cs index 25e5f405..cda20cee 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/FormulaBlock.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/FormulaBlock.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/FunctionalGroupBlock.cs b/src/Chemistry/Chem4Word.ACME/Controls/FunctionalGroupBlock.cs index 94b6ca00..a1517c6f 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/FunctionalGroupBlock.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/FunctionalGroupBlock.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/GridAwareItemsControl.cs b/src/Chemistry/Chem4Word.ACME/Controls/GridAwareItemsControl.cs index 19409c51..9dace51a 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/GridAwareItemsControl.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/GridAwareItemsControl.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/ModeButton.cs b/src/Chemistry/Chem4Word.ACME/Controls/ModeButton.cs index bff83a3a..8d00eb35 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/ModeButton.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/ModeButton.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/MoleculePropertyEditor.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/MoleculePropertyEditor.xaml.cs index 0b375ba6..542c91a4 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/MoleculePropertyEditor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/MoleculePropertyEditor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/NamesEditor.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/NamesEditor.xaml.cs index d474b098..9c4865cc 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/NamesEditor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/NamesEditor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/PTPopup.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/PTPopup.xaml.cs index d2187a6e..d1dabec5 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/PTPopup.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/PTPopup.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/ReactionOption.cs b/src/Chemistry/Chem4Word.ACME/Controls/ReactionOption.cs index e7b0ae6a..7f5d943c 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/ReactionOption.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/ReactionOption.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/Settings.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/Settings.xaml.cs index 54c7b806..0f0de0cf 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/Settings.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/Settings.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/SettingsHost.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/SettingsHost.xaml.cs index 2d1e557a..1e603eb9 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/SettingsHost.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/SettingsHost.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/SketcherHost.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/SketcherHost.xaml.cs index 49e44edd..050fb7a8 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/SketcherHost.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/SketcherHost.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/TagItem.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/TagItem.xaml.cs index 0c7c1e63..513617ed 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/TagItem.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/TagItem.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/TaggingControl.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/TaggingControl.xaml.cs index 161c324a..b5a5a3fa 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/TaggingControl.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/TaggingControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/VisualPeriodicTable.xaml.cs b/src/Chemistry/Chem4Word.ACME/Controls/VisualPeriodicTable.xaml.cs index ede63d0b..5de910b4 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/VisualPeriodicTable.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/VisualPeriodicTable.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Controls/ZoomBox.cs b/src/Chemistry/Chem4Word.ACME/Controls/ZoomBox.cs index 765f94bc..1812dd37 100644 --- a/src/Chemistry/Chem4Word.ACME/Controls/ZoomBox.cs +++ b/src/Chemistry/Chem4Word.ACME/Controls/ZoomBox.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/BoolToColorConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/BoolToColorConverter.cs index c003cff6..e667de5d 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/BoolToColorConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/BoolToColorConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/BoolToVisibilityConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/BoolToVisibilityConverter.cs index 896ccb8b..c5b2cda0 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/BoolToVisibilityConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/BoolToVisibilityConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/DefaultNameConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/DefaultNameConverter.cs index 90e40a2a..20a8473b 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/DefaultNameConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/DefaultNameConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/DoNothingConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/DoNothingConverter.cs index 18946fa1..397669eb 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/DoNothingConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/DoNothingConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/ElementConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/ElementConverter.cs index 76f175dc..6b03ff97 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/ElementConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/ElementConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/EnabledConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/EnabledConverter.cs index c3f9d53d..b5e1eb0d 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/EnabledConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/EnabledConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/EnumToBooleanConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/EnumToBooleanConverter.cs index d6380163..165aa5c7 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/EnumToBooleanConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/EnumToBooleanConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/EnumToVisibilityConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/EnumToVisibilityConverter.cs index 1f0e32f0..da26c5f4 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/EnumToVisibilityConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/EnumToVisibilityConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/ModeConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/ModeConverter.cs index 490d9d2d..2d7b9ae2 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/ModeConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/ModeConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/NullableEnumToBooleanConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/NullableEnumToBooleanConverter.cs index 66bf21bd..68315909 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/NullableEnumToBooleanConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/NullableEnumToBooleanConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/TreeViewLineConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/TreeViewLineConverter.cs index 433d4b10..5c0c0661 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/TreeViewLineConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/TreeViewLineConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/ValueToForegroundColorConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/ValueToForegroundColorConverter.cs index ba380b27..75cd281b 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/ValueToForegroundColorConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/ValueToForegroundColorConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Converters/ValueToStringConverter.cs b/src/Chemistry/Chem4Word.ACME/Converters/ValueToStringConverter.cs index 997d6abf..372188c3 100644 --- a/src/Chemistry/Chem4Word.ACME/Converters/ValueToStringConverter.cs +++ b/src/Chemistry/Chem4Word.ACME/Converters/ValueToStringConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Display.xaml.cs b/src/Chemistry/Chem4Word.ACME/Display.xaml.cs index b2b25848..93dc8d34 100644 --- a/src/Chemistry/Chem4Word.ACME/Display.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Display.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/BondGeometry.cs b/src/Chemistry/Chem4Word.ACME/Drawing/BondGeometry.cs index c6d1ef41..c4c01107 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/BondGeometry.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/BondGeometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/FatArrowGeometry.cs b/src/Chemistry/Chem4Word.ACME/Drawing/FatArrowGeometry.cs index 632d0943..ece295b7 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/FatArrowGeometry.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/FatArrowGeometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/BondLayout.cs b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/BondLayout.cs index 40e1e8b5..ce79cb14 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/BondLayout.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/BondLayout.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/DoubleBondLayout.cs b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/DoubleBondLayout.cs index 49f8970a..e361715b 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/DoubleBondLayout.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/DoubleBondLayout.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/TripleBondLayout.cs b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/TripleBondLayout.cs index 21b82381..db2c0e03 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/TripleBondLayout.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/TripleBondLayout.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/WedgeBondLayout.cs b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/WedgeBondLayout.cs index 0a28a345..8d6d2f92 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/WedgeBondLayout.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/LayoutSupport/WedgeBondLayout.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextRunProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextRunProperties.cs index 4a5ce413..4dc2a685 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextRunProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextRunProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextSource.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextSource.cs index 9b330a02..7aee3318 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextSource.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/BlockTextSource.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/FunctionalGroupTextSource.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/FunctionalGroupTextSource.cs index a1eeb62c..d12e1b7a 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/FunctionalGroupTextSource.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/FunctionalGroupTextSource.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/GenericTextParagraphProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/GenericTextParagraphProperties.cs index 65e1005d..7554bb28 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/GenericTextParagraphProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/GenericTextParagraphProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphText.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphText.cs index 65e9c3b3..43f3edce 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphText.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphText.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphUtils.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphUtils.cs index 734d10d2..5d94145a 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphUtils.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/GlyphUtils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunProperties.cs index 3e67a405..a3f3c188 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunTypographyProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunTypographyProperties.cs index 80eb93fe..b4ec5027 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunTypographyProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextRunTypographyProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextSourceRun.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextSourceRun.cs index 641f4f79..bd31ed82 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextSourceRun.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/LabelTextSourceRun.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunProperties.cs index 0a17b9be..e4d496cb 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunTypographyProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunTypographyProperties.cs index ca94cf0f..ed5976c8 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunTypographyProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptTextRunTypographyProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptedGroup.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptedGroup.cs index 2026aebc..56b5414e 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptedGroup.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SubscriptedGroup.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunProperties.cs index 1c219cab..4ae850db 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunTypographyProperties.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunTypographyProperties.cs index b7d8e744..56cdc5f4 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunTypographyProperties.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/SuperscriptTextRunTypographyProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Text/TextSupport.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Text/TextSupport.cs index 4b24135b..b9c0173d 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Text/TextSupport.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Text/TextSupport.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AnnotationVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AnnotationVisual.cs index 8e2a3c6e..67844584 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AnnotationVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AnnotationVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AtomVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AtomVisual.cs index a8204b02..8a69884f 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AtomVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/AtomVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/BondVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/BondVisual.cs index 9045ce3d..0d564d11 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/BondVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/BondVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChargeVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChargeVisual.cs index a9e81cae..d44eed9e 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChargeVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChargeVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChemicalVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChemicalVisual.cs index d8d7eff0..1981a072 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChemicalVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChemicalVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChildTextVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChildTextVisual.cs index 060d9689..ce068e01 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChildTextVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ChildTextVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/FunctionalGroupVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/FunctionalGroupVisual.cs index aafbfe2c..090f6f10 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/FunctionalGroupVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/FunctionalGroupVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/GroupVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/GroupVisual.cs index dad1c07f..70cd19b1 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/GroupVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/GroupVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/HydrogenVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/HydrogenVisual.cs index df63dd61..8777607a 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/HydrogenVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/HydrogenVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/IsotopeVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/IsotopeVisual.cs index beae2529..2d62ed3c 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/IsotopeVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/IsotopeVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeLabelVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeLabelVisual.cs index eaf2a89d..dde6da9f 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeLabelVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeLabelVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeVisual.cs index 46f78a70..06aad669 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/MoleculeVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ReactionVisual.cs b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ReactionVisual.cs index 7261767e..fb3fc78e 100644 --- a/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ReactionVisual.cs +++ b/src/Chemistry/Chem4Word.ACME/Drawing/Visuals/ReactionVisual.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/EditController.cs b/src/Chemistry/Chem4Word.ACME/EditController.cs index 4a217018..2e04d2ee 100644 --- a/src/Chemistry/Chem4Word.ACME/EditController.cs +++ b/src/Chemistry/Chem4Word.ACME/EditController.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Editor.xaml.cs b/src/Chemistry/Chem4Word.ACME/Editor.xaml.cs index 4a10e024..d951bb88 100644 --- a/src/Chemistry/Chem4Word.ACME/Editor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/Editor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Entities/ChargeValue.cs b/src/Chemistry/Chem4Word.ACME/Entities/ChargeValue.cs index dfdde8a8..f8c1ab7d 100644 --- a/src/Chemistry/Chem4Word.ACME/Entities/ChargeValue.cs +++ b/src/Chemistry/Chem4Word.ACME/Entities/ChargeValue.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Entities/IsotopeValue.cs b/src/Chemistry/Chem4Word.ACME/Entities/IsotopeValue.cs index 3cff2ca4..e8a96d1e 100644 --- a/src/Chemistry/Chem4Word.ACME/Entities/IsotopeValue.cs +++ b/src/Chemistry/Chem4Word.ACME/Entities/IsotopeValue.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Entities/WordCloudEntry.cs b/src/Chemistry/Chem4Word.ACME/Entities/WordCloudEntry.cs index b8b17d03..3085555d 100644 --- a/src/Chemistry/Chem4Word.ACME/Entities/WordCloudEntry.cs +++ b/src/Chemistry/Chem4Word.ACME/Entities/WordCloudEntry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Entities/WordCloudTheme.cs b/src/Chemistry/Chem4Word.ACME/Entities/WordCloudTheme.cs index 6c144c20..c6b05fb3 100644 --- a/src/Chemistry/Chem4Word.ACME/Entities/WordCloudTheme.cs +++ b/src/Chemistry/Chem4Word.ACME/Entities/WordCloudTheme.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Entities/WordCloudThemes.cs b/src/Chemistry/Chem4Word.ACME/Entities/WordCloudThemes.cs index e82f5353..769cb0e0 100644 --- a/src/Chemistry/Chem4Word.ACME/Entities/WordCloudThemes.cs +++ b/src/Chemistry/Chem4Word.ACME/Entities/WordCloudThemes.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/1Point5BondType.cs b/src/Chemistry/Chem4Word.ACME/Enums/1Point5BondType.cs index 2887acd6..b0549969 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/1Point5BondType.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/1Point5BondType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/2Point5BondType.cs b/src/Chemistry/Chem4Word.ACME/Enums/2Point5BondType.cs index d874dccf..a608ed3e 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/2Point5BondType.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/2Point5BondType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/ArrowEnds.cs b/src/Chemistry/Chem4Word.ACME/Enums/ArrowEnds.cs index 9f64b004..c2dee014 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/ArrowEnds.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/ArrowEnds.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/ChemistryItemMode.cs b/src/Chemistry/Chem4Word.ACME/Enums/ChemistryItemMode.cs index 3db3ac69..b6c89109 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/ChemistryItemMode.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/ChemistryItemMode.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/DoubleBondType.cs b/src/Chemistry/Chem4Word.ACME/Enums/DoubleBondType.cs index 35fdd5f4..7f134873 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/DoubleBondType.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/DoubleBondType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/SelectionTypeCode.cs b/src/Chemistry/Chem4Word.ACME/Enums/SelectionTypeCode.cs index b21ec01e..fc37963b 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/SelectionTypeCode.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/SelectionTypeCode.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/SingleBondType.cs b/src/Chemistry/Chem4Word.ACME/Enums/SingleBondType.cs index 07d16ad3..59e716b2 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/SingleBondType.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/SingleBondType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Enums/WordCloudThemeWordRotation.cs b/src/Chemistry/Chem4Word.ACME/Enums/WordCloudThemeWordRotation.cs index 25b9bf30..10e79977 100644 --- a/src/Chemistry/Chem4Word.ACME/Enums/WordCloudThemeWordRotation.cs +++ b/src/Chemistry/Chem4Word.ACME/Enums/WordCloudThemeWordRotation.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/ArcArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/ArcArrow.cs index 7e567a0d..89908f32 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/ArcArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/ArcArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/Arrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/Arrow.cs index bec52bad..549db558 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/Arrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/Arrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/BezierArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/BezierArrow.cs index 351b1a37..1cbf1037 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/BezierArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/BezierArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/BlockedArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/BlockedArrow.cs index 99a8285b..e85021e9 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/BlockedArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/BlockedArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/EquilibriumArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/EquilibriumArrow.cs index 8faf0ad6..d1814d0d 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/EquilibriumArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/EquilibriumArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/Harpoon.cs b/src/Chemistry/Chem4Word.ACME/Graphics/Harpoon.cs index ce9ddf68..a48b83b4 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/Harpoon.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/Harpoon.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/QuadraticArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/QuadraticArrow.cs index e0740508..bc8a1701 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/QuadraticArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/QuadraticArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/RegularPolygon.cs b/src/Chemistry/Chem4Word.ACME/Graphics/RegularPolygon.cs index f53a5223..02663c3e 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/RegularPolygon.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/RegularPolygon.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/RetrosyntheticArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/RetrosyntheticArrow.cs index 8e3a05f8..6b97b0bb 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/RetrosyntheticArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/RetrosyntheticArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Graphics/StraightArrow.cs b/src/Chemistry/Chem4Word.ACME/Graphics/StraightArrow.cs index 69c2403c..532bbd31 100644 --- a/src/Chemistry/Chem4Word.ACME/Graphics/StraightArrow.cs +++ b/src/Chemistry/Chem4Word.ACME/Graphics/StraightArrow.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/IHostedWpfEditor.cs b/src/Chemistry/Chem4Word.ACME/IHostedWpfEditor.cs index 378217c7..7989a1f1 100644 --- a/src/Chemistry/Chem4Word.ACME/IHostedWpfEditor.cs +++ b/src/Chemistry/Chem4Word.ACME/IHostedWpfEditor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Interfaces/IPositioner.cs b/src/Chemistry/Chem4Word.ACME/Interfaces/IPositioner.cs index 5d3b7543..1ac58dea 100644 --- a/src/Chemistry/Chem4Word.ACME/Interfaces/IPositioner.cs +++ b/src/Chemistry/Chem4Word.ACME/Interfaces/IPositioner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Interfaces/IRandomizer.cs b/src/Chemistry/Chem4Word.ACME/Interfaces/IRandomizer.cs index 919b8208..ef213bc6 100644 --- a/src/Chemistry/Chem4Word.ACME/Interfaces/IRandomizer.cs +++ b/src/Chemistry/Chem4Word.ACME/Interfaces/IRandomizer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/LabelsEditor.xaml.cs b/src/Chemistry/Chem4Word.ACME/LabelsEditor.xaml.cs index 582464e2..13a241fb 100644 --- a/src/Chemistry/Chem4Word.ACME/LabelsEditor.xaml.cs +++ b/src/Chemistry/Chem4Word.ACME/LabelsEditor.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/AtomPropertiesModel.cs b/src/Chemistry/Chem4Word.ACME/Models/AtomPropertiesModel.cs index 3edeaaf2..dd9ae886 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/AtomPropertiesModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/AtomPropertiesModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/BaseDialogModel.cs b/src/Chemistry/Chem4Word.ACME/Models/BaseDialogModel.cs index 0566e471..27bcf8b3 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/BaseDialogModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/BaseDialogModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/BondPropertiesModel.cs b/src/Chemistry/Chem4Word.ACME/Models/BondPropertiesModel.cs index bbb71eb6..d4e121c4 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/BondPropertiesModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/BondPropertiesModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/ChemistryObject.cs b/src/Chemistry/Chem4Word.ACME/Models/ChemistryObject.cs index 1afbb6cc..d687b69d 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/ChemistryObject.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/ChemistryObject.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/CryptoRandomizer.cs b/src/Chemistry/Chem4Word.ACME/Models/CryptoRandomizer.cs index 2b307584..41d20ccf 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/CryptoRandomizer.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/CryptoRandomizer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/MoleculePropertiesModel.cs b/src/Chemistry/Chem4Word.ACME/Models/MoleculePropertiesModel.cs index d8387341..4f8c012a 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/MoleculePropertiesModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/MoleculePropertiesModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/NamesModel.cs b/src/Chemistry/Chem4Word.ACME/Models/NamesModel.cs index a4cecf1b..79d18bb4 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/NamesModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/NamesModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/NewAtomPlacement.cs b/src/Chemistry/Chem4Word.ACME/Models/NewAtomPlacement.cs index 9996e1f6..1291671b 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/NewAtomPlacement.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/NewAtomPlacement.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/SettingsModel.cs b/src/Chemistry/Chem4Word.ACME/Models/SettingsModel.cs index 8fcd30ef..56c54a7b 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/SettingsModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/SettingsModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/TagControlModel.cs b/src/Chemistry/Chem4Word.ACME/Models/TagControlModel.cs index ba3d9914..d6ac9f44 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/TagControlModel.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/TagControlModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/WordDrawing.cs b/src/Chemistry/Chem4Word.ACME/Models/WordDrawing.cs index c0132eef..92077f81 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/WordDrawing.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/WordDrawing.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Models/WordGroup.cs b/src/Chemistry/Chem4Word.ACME/Models/WordGroup.cs index c493eacf..cbc42c94 100644 --- a/src/Chemistry/Chem4Word.ACME/Models/WordGroup.cs +++ b/src/Chemistry/Chem4Word.ACME/Models/WordGroup.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs index dec96e51..b649831e 100644 --- a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.ACME")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Chemistry/Chem4Word.ACME/Resources/Constants.cs b/src/Chemistry/Chem4Word.ACME/Resources/Constants.cs index 9b2d5655..355f7f0e 100644 --- a/src/Chemistry/Chem4Word.ACME/Resources/Constants.cs +++ b/src/Chemistry/Chem4Word.ACME/Resources/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/UndoHandler.cs b/src/Chemistry/Chem4Word.ACME/UndoHandler.cs index 18a9ecaa..bcfa9f22 100644 --- a/src/Chemistry/Chem4Word.ACME/UndoHandler.cs +++ b/src/Chemistry/Chem4Word.ACME/UndoHandler.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/BindingProxy.cs b/src/Chemistry/Chem4Word.ACME/Utils/BindingProxy.cs index 29ef9a94..f6b6f94f 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/BindingProxy.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/BindingProxy.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/ClipboardMonitor.cs b/src/Chemistry/Chem4Word.ACME/Utils/ClipboardMonitor.cs index fa714477..4a8e4da8 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/ClipboardMonitor.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/ClipboardMonitor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/Common.cs b/src/Chemistry/Chem4Word.ACME/Utils/Common.cs index c8101dc1..254a0a89 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/Common.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/Common.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/CursorUtils.cs b/src/Chemistry/Chem4Word.ACME/Utils/CursorUtils.cs index 884517e8..6c34ebe6 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/CursorUtils.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/CursorUtils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/Geometry.cs b/src/Chemistry/Chem4Word.ACME/Utils/Geometry.cs index 536f1bb6..f77180d0 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/Geometry.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/Geometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/GraphicsHelpers.cs b/src/Chemistry/Chem4Word.ACME/Utils/GraphicsHelpers.cs index 3556e5b8..09665977 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/GraphicsHelpers.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/GraphicsHelpers.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/KeyboardUtils.cs b/src/Chemistry/Chem4Word.ACME/Utils/KeyboardUtils.cs index d4cb7eb1..b4c4deb1 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/KeyboardUtils.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/KeyboardUtils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/RegistryHelper.cs b/src/Chemistry/Chem4Word.ACME/Utils/RegistryHelper.cs index 8f635352..1f2536b6 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/RegistryHelper.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/Snapper.cs b/src/Chemistry/Chem4Word.ACME/Utils/Snapper.cs index ad105aee..f31a4c6c 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/Snapper.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/Snapper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/TextUtils.cs b/src/Chemistry/Chem4Word.ACME/Utils/TextUtils.cs index c715f458..ba71ed77 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/TextUtils.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/TextUtils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/TriggerTracing.cs b/src/Chemistry/Chem4Word.ACME/Utils/TriggerTracing.cs index b1fe77b1..1bafbeb3 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/TriggerTracing.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/TriggerTracing.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/Utils/UIUtils.cs b/src/Chemistry/Chem4Word.ACME/Utils/UIUtils.cs index 2f3cf34c..d7c2ab48 100644 --- a/src/Chemistry/Chem4Word.ACME/Utils/UIUtils.cs +++ b/src/Chemistry/Chem4Word.ACME/Utils/UIUtils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/VisualTreeHelpers.cs b/src/Chemistry/Chem4Word.ACME/VisualTreeHelpers.cs index f73c811f..997fb2dd 100644 --- a/src/Chemistry/Chem4Word.ACME/VisualTreeHelpers.cs +++ b/src/Chemistry/Chem4Word.ACME/VisualTreeHelpers.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.ACME/app.config b/src/Chemistry/Chem4Word.ACME/app.config deleted file mode 100644 index 76f775d7..00000000 --- a/src/Chemistry/Chem4Word.ACME/app.config +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.ACME/packages.config b/src/Chemistry/Chem4Word.ACME/packages.config index 7f60ea53..f7e54413 100644 --- a/src/Chemistry/Chem4Word.ACME/packages.config +++ b/src/Chemistry/Chem4Word.ACME/packages.config @@ -2,9 +2,9 @@ - + - + diff --git a/src/Chemistry/Chem4Word.Libraries/App.config b/src/Chemistry/Chem4Word.Libraries/App.config index 73b0dff8..bea3f440 100644 --- a/src/Chemistry/Chem4Word.Libraries/App.config +++ b/src/Chemistry/Chem4Word.Libraries/App.config @@ -12,34 +12,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -54,19 +30,19 @@ - + - + - + - + diff --git a/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj b/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj index 590724be..a9170d5b 100644 --- a/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj +++ b/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj @@ -58,19 +58,19 @@ ..\..\packages\Unofficial.Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net46\System.Data.SQLite.dll + + ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll - - ..\..\packages\System.Data.SQLite.EF6.1.0.116.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\..\packages\System.Data.SQLite.EF6.1.0.117.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\..\packages\System.Data.SQLite.Linq.1.0.116.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\..\packages\System.Data.SQLite.Linq.1.0.117.0\lib\net46\System.Data.SQLite.Linq.dll @@ -129,8 +129,8 @@ - + - + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.Libraries/Database/ChemistryDataObject.cs b/src/Chemistry/Chem4Word.Libraries/Database/ChemistryDataObject.cs index ed698704..9d396032 100644 --- a/src/Chemistry/Chem4Word.Libraries/Database/ChemistryDataObject.cs +++ b/src/Chemistry/Chem4Word.Libraries/Database/ChemistryDataObject.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Libraries/Database/ChemistryTagDataObject.cs b/src/Chemistry/Chem4Word.Libraries/Database/ChemistryTagDataObject.cs index 761d1638..8792db16 100644 --- a/src/Chemistry/Chem4Word.Libraries/Database/ChemistryTagDataObject.cs +++ b/src/Chemistry/Chem4Word.Libraries/Database/ChemistryTagDataObject.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Libraries/Database/Library.cs b/src/Chemistry/Chem4Word.Libraries/Database/Library.cs index 868225b1..65f56fd9 100644 --- a/src/Chemistry/Chem4Word.Libraries/Database/Library.cs +++ b/src/Chemistry/Chem4Word.Libraries/Database/Library.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Libraries/Database/LibraryTagDataObject.cs b/src/Chemistry/Chem4Word.Libraries/Database/LibraryTagDataObject.cs index 3b5a13c8..7ddf9b22 100644 --- a/src/Chemistry/Chem4Word.Libraries/Database/LibraryTagDataObject.cs +++ b/src/Chemistry/Chem4Word.Libraries/Database/LibraryTagDataObject.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Libraries/Database/Patch.cs b/src/Chemistry/Chem4Word.Libraries/Database/Patch.cs index 1fa34112..59e9664c 100644 --- a/src/Chemistry/Chem4Word.Libraries/Database/Patch.cs +++ b/src/Chemistry/Chem4Word.Libraries/Database/Patch.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Libraries/LibraryOptions.cs b/src/Chemistry/Chem4Word.Libraries/LibraryOptions.cs index acfd8f48..fd6adb7e 100644 --- a/src/Chemistry/Chem4Word.Libraries/LibraryOptions.cs +++ b/src/Chemistry/Chem4Word.Libraries/LibraryOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs index 829ae830..9054d87d 100644 --- a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs @@ -1,4 +1,11 @@ -using System.Reflection; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -9,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Libraries")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -28,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Chemistry/Chem4Word.Libraries/Resources/EssentialOils.zip b/src/Chemistry/Chem4Word.Libraries/Resources/EssentialOils.zip index 3a060f3a..5b4abd14 100644 Binary files a/src/Chemistry/Chem4Word.Libraries/Resources/EssentialOils.zip and b/src/Chemistry/Chem4Word.Libraries/Resources/EssentialOils.zip differ diff --git a/src/Chemistry/Chem4Word.Libraries/packages.config b/src/Chemistry/Chem4Word.Libraries/packages.config index ba814f97..7f661e84 100644 --- a/src/Chemistry/Chem4Word.Libraries/packages.config +++ b/src/Chemistry/Chem4Word.Libraries/packages.config @@ -1,11 +1,11 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.Model2/Annotation.cs b/src/Chemistry/Chem4Word.Model2/Annotation.cs index e1b2ce02..7c97bf39 100644 --- a/src/Chemistry/Chem4Word.Model2/Annotation.cs +++ b/src/Chemistry/Chem4Word.Model2/Annotation.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Atom.cs b/src/Chemistry/Chem4Word.Model2/Atom.cs index 1cb74eef..72e1e660 100644 --- a/src/Chemistry/Chem4Word.Model2/Atom.cs +++ b/src/Chemistry/Chem4Word.Model2/Atom.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/AtomData.cs b/src/Chemistry/Chem4Word.Model2/AtomData.cs index a4330886..4630034c 100644 --- a/src/Chemistry/Chem4Word.Model2/AtomData.cs +++ b/src/Chemistry/Chem4Word.Model2/AtomData.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/BaseObject.cs b/src/Chemistry/Chem4Word.Model2/BaseObject.cs index 73c4d179..08eb6671 100644 --- a/src/Chemistry/Chem4Word.Model2/BaseObject.cs +++ b/src/Chemistry/Chem4Word.Model2/BaseObject.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Bond.cs b/src/Chemistry/Chem4Word.Model2/Bond.cs index 2be96e3a..0908cf29 100644 --- a/src/Chemistry/Chem4Word.Model2/Bond.cs +++ b/src/Chemistry/Chem4Word.Model2/Bond.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Chem4Word.Model2.csproj b/src/Chemistry/Chem4Word.Model2/Chem4Word.Model2.csproj index 193a91c3..07c7b107 100644 --- a/src/Chemistry/Chem4Word.Model2/Chem4Word.Model2.csproj +++ b/src/Chemistry/Chem4Word.Model2/Chem4Word.Model2.csproj @@ -47,7 +47,7 @@ - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConstants.cs b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConstants.cs index 057190bf..52e6209f 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConstants.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConstants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConverter.cs b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConverter.cs index 3c619c06..fcc7fe9a 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConverter.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLHelper.cs b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLHelper.cs index 2cfe5bac..5ae5a137 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLHelper.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLNamespaces.cs b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLNamespaces.cs index dfb11575..0ae963f6 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLNamespaces.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/CML/CMLNamespaces.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/CML/CmlFormat.cs b/src/Chemistry/Chem4Word.Model2/Converters/CML/CmlFormat.cs index b5317187..cb64521a 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/CML/CmlFormat.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/CML/CmlFormat.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/JSON/JSONConverter.cs b/src/Chemistry/Chem4Word.Model2/Converters/JSON/JSONConverter.cs index e0dfa119..063cfadb 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/JSON/JSONConverter.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/JSON/JSONConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/CtabProcessor.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/CtabProcessor.cs index d6e5bf0f..2e22a856 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/CtabProcessor.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/CtabProcessor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/DataProcessor.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/DataProcessor.cs index 0d7d744a..1f8131ff 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/DataProcessor.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/DataProcessor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLConstants.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLConstants.cs index 489aea31..5558c723 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLConstants.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLConstants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLCounts.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLCounts.cs index d6ed834e..f7e0b888 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLCounts.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/MDLCounts.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/PropertyType.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/PropertyType.cs index 26fd3ba2..f90d00f2 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/PropertyType.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/PropertyType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileBase.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileBase.cs index 2ad876f1..245914a6 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileBase.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileBase.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileConverter.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileConverter.cs index 200db67a..e18b147f 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileConverter.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdFileConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdfState.cs b/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdfState.cs index 358200a3..a6ae2ea6 100644 --- a/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdfState.cs +++ b/src/Chemistry/Chem4Word.Model2/Converters/MDL/SdfState.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/CrossedBonds.cs b/src/Chemistry/Chem4Word.Model2/CrossedBonds.cs index 5cf1fc5c..3e22caf1 100644 --- a/src/Chemistry/Chem4Word.Model2/CrossedBonds.cs +++ b/src/Chemistry/Chem4Word.Model2/CrossedBonds.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Element.cs b/src/Chemistry/Chem4Word.Model2/Element.cs index d7d31e7a..90389042 100644 --- a/src/Chemistry/Chem4Word.Model2/Element.cs +++ b/src/Chemistry/Chem4Word.Model2/Element.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/ElementBase.cs b/src/Chemistry/Chem4Word.Model2/ElementBase.cs index 95320b4f..ab49bb9a 100644 --- a/src/Chemistry/Chem4Word.Model2/ElementBase.cs +++ b/src/Chemistry/Chem4Word.Model2/ElementBase.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/ElementConverter.cs b/src/Chemistry/Chem4Word.Model2/ElementConverter.cs index 3b773ab0..2b03bb47 100644 --- a/src/Chemistry/Chem4Word.Model2/ElementConverter.cs +++ b/src/Chemistry/Chem4Word.Model2/ElementConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Enums/BondDirection.cs b/src/Chemistry/Chem4Word.Model2/Enums/BondDirection.cs index 645cd688..9d5a519a 100644 --- a/src/Chemistry/Chem4Word.Model2/Enums/BondDirection.cs +++ b/src/Chemistry/Chem4Word.Model2/Enums/BondDirection.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Enums/BondStereo.cs b/src/Chemistry/Chem4Word.Model2/Enums/BondStereo.cs index 3602ad01..b8936c2f 100644 --- a/src/Chemistry/Chem4Word.Model2/Enums/BondStereo.cs +++ b/src/Chemistry/Chem4Word.Model2/Enums/BondStereo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Enums/ClockDirections.cs b/src/Chemistry/Chem4Word.Model2/Enums/ClockDirections.cs index c425be2b..75a10baa 100644 --- a/src/Chemistry/Chem4Word.Model2/Enums/ClockDirections.cs +++ b/src/Chemistry/Chem4Word.Model2/Enums/ClockDirections.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Enums/FormulaPartType.cs b/src/Chemistry/Chem4Word.Model2/Enums/FormulaPartType.cs index 8d853310..1d9fab67 100644 --- a/src/Chemistry/Chem4Word.Model2/Enums/FormulaPartType.cs +++ b/src/Chemistry/Chem4Word.Model2/Enums/FormulaPartType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/FunctionalGroup.cs b/src/Chemistry/Chem4Word.Model2/FunctionalGroup.cs index a6f39f66..63304f2b 100644 --- a/src/Chemistry/Chem4Word.Model2/FunctionalGroup.cs +++ b/src/Chemistry/Chem4Word.Model2/FunctionalGroup.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/FunctionalGroupPart.cs b/src/Chemistry/Chem4Word.Model2/FunctionalGroupPart.cs index 0aa05dba..af871271 100644 --- a/src/Chemistry/Chem4Word.Model2/FunctionalGroupPart.cs +++ b/src/Chemistry/Chem4Word.Model2/FunctionalGroupPart.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/FunctionalGroupPartType.cs b/src/Chemistry/Chem4Word.Model2/FunctionalGroupPartType.cs index 7283121f..27b69e78 100644 --- a/src/Chemistry/Chem4Word.Model2/FunctionalGroupPartType.cs +++ b/src/Chemistry/Chem4Word.Model2/FunctionalGroupPartType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/FunctionalGroupTerm.cs b/src/Chemistry/Chem4Word.Model2/FunctionalGroupTerm.cs index df5db73e..667235b2 100644 --- a/src/Chemistry/Chem4Word.Model2/FunctionalGroupTerm.cs +++ b/src/Chemistry/Chem4Word.Model2/FunctionalGroupTerm.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/FunctionalGroups.cs b/src/Chemistry/Chem4Word.Model2/FunctionalGroups.cs index 762f8c54..bb73a6d4 100644 --- a/src/Chemistry/Chem4Word.Model2/FunctionalGroups.cs +++ b/src/Chemistry/Chem4Word.Model2/FunctionalGroups.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Geometry/Geometry.cs b/src/Chemistry/Chem4Word.Model2/Geometry/Geometry.cs index dd95f259..6699c388 100644 --- a/src/Chemistry/Chem4Word.Model2/Geometry/Geometry.cs +++ b/src/Chemistry/Chem4Word.Model2/Geometry/Geometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Geometry/Packer.cs b/src/Chemistry/Chem4Word.Model2/Geometry/Packer.cs index 9eae3194..c34b55a4 100644 --- a/src/Chemistry/Chem4Word.Model2/Geometry/Packer.cs +++ b/src/Chemistry/Chem4Word.Model2/Geometry/Packer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Geometry/Separator.cs b/src/Chemistry/Chem4Word.Model2/Geometry/Separator.cs index 94be91bf..8ab91327 100644 --- a/src/Chemistry/Chem4Word.Model2/Geometry/Separator.cs +++ b/src/Chemistry/Chem4Word.Model2/Geometry/Separator.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Group.cs b/src/Chemistry/Chem4Word.Model2/Group.cs index 7db14a70..4c2cfbed 100644 --- a/src/Chemistry/Chem4Word.Model2/Group.cs +++ b/src/Chemistry/Chem4Word.Model2/Group.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/AtomHelpers.cs b/src/Chemistry/Chem4Word.Model2/Helpers/AtomHelpers.cs index 454d0868..0bf5f135 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/AtomHelpers.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/AtomHelpers.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/CalculatedFormula.cs b/src/Chemistry/Chem4Word.Model2/Helpers/CalculatedFormula.cs index 0f0902e1..9e54d96f 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/CalculatedFormula.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/CalculatedFormula.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/ClippingTarget.cs b/src/Chemistry/Chem4Word.Model2/Helpers/ClippingTarget.cs index 9efaf63b..4857c0a4 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/ClippingTarget.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/ClippingTarget.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/FormulaHelper.cs b/src/Chemistry/Chem4Word.Model2/Helpers/FormulaHelper.cs index d0ebbfe2..8308e557 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/FormulaHelper.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/FormulaHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. @@ -115,7 +115,8 @@ public static string FormulaPartsAsUnicode(List parts) { result += string.Concat($"{absCharge}".Select(c => SuperScriptNumbers[c - 48])); } - // ToDo: Unicode Superscript for + or - + + // Unicode Superscript for + or - switch (part.Text) { case "+": diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/Globals.cs b/src/Chemistry/Chem4Word.Model2/Helpers/Globals.cs index f60c2db5..fbcb63ea 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/Globals.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/Globals.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/ModelFormulaPart.cs b/src/Chemistry/Chem4Word.Model2/Helpers/ModelFormulaPart.cs index 57afeb05..111192e2 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/ModelFormulaPart.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/ModelFormulaPart.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/MoleculeFormulaPart.cs b/src/Chemistry/Chem4Word.Model2/Helpers/MoleculeFormulaPart.cs index da3b1e93..f8c34c56 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/MoleculeFormulaPart.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/MoleculeFormulaPart.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Helpers/Utils.cs b/src/Chemistry/Chem4Word.Model2/Helpers/Utils.cs index 4659fa1b..184da242 100644 --- a/src/Chemistry/Chem4Word.Model2/Helpers/Utils.cs +++ b/src/Chemistry/Chem4Word.Model2/Helpers/Utils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/HydrogenTargets.cs b/src/Chemistry/Chem4Word.Model2/HydrogenTargets.cs index 4930d953..10250d4a 100644 --- a/src/Chemistry/Chem4Word.Model2/HydrogenTargets.cs +++ b/src/Chemistry/Chem4Word.Model2/HydrogenTargets.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Interfaces/IChemistryContainer.cs b/src/Chemistry/Chem4Word.Model2/Interfaces/IChemistryContainer.cs index 8076f46e..bc65545f 100644 --- a/src/Chemistry/Chem4Word.Model2/Interfaces/IChemistryContainer.cs +++ b/src/Chemistry/Chem4Word.Model2/Interfaces/IChemistryContainer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Model.cs b/src/Chemistry/Chem4Word.Model2/Model.cs index 2162b180..b2a4187d 100644 --- a/src/Chemistry/Chem4Word.Model2/Model.cs +++ b/src/Chemistry/Chem4Word.Model2/Model.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Molecule.cs b/src/Chemistry/Chem4Word.Model2/Molecule.cs index e8af41cd..1cd45207 100644 --- a/src/Chemistry/Chem4Word.Model2/Molecule.cs +++ b/src/Chemistry/Chem4Word.Model2/Molecule.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/MoleculePropertyBag.cs b/src/Chemistry/Chem4Word.Model2/MoleculePropertyBag.cs index 9d83db5b..b58f6253 100644 --- a/src/Chemistry/Chem4Word.Model2/MoleculePropertyBag.cs +++ b/src/Chemistry/Chem4Word.Model2/MoleculePropertyBag.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/PeriodicTable.cs b/src/Chemistry/Chem4Word.Model2/PeriodicTable.cs index 5095165d..d04a7b07 100644 --- a/src/Chemistry/Chem4Word.Model2/PeriodicTable.cs +++ b/src/Chemistry/Chem4Word.Model2/PeriodicTable.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs index ce1b6eb7..c616516f 100644 --- a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Model2")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Chemistry/Chem4Word.Model2/Reaction.cs b/src/Chemistry/Chem4Word.Model2/Reaction.cs index 7e1d0349..11fc5eb3 100644 --- a/src/Chemistry/Chem4Word.Model2/Reaction.cs +++ b/src/Chemistry/Chem4Word.Model2/Reaction.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/ReactionScheme.cs b/src/Chemistry/Chem4Word.Model2/ReactionScheme.cs index 20a3fd74..b677f7cc 100644 --- a/src/Chemistry/Chem4Word.Model2/ReactionScheme.cs +++ b/src/Chemistry/Chem4Word.Model2/ReactionScheme.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/ReactionType.cs b/src/Chemistry/Chem4Word.Model2/ReactionType.cs index 8a83c972..bf98bcab 100644 --- a/src/Chemistry/Chem4Word.Model2/ReactionType.cs +++ b/src/Chemistry/Chem4Word.Model2/ReactionType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/Ring.cs b/src/Chemistry/Chem4Word.Model2/Ring.cs index 240e9fb6..40fc92f2 100644 --- a/src/Chemistry/Chem4Word.Model2/Ring.cs +++ b/src/Chemistry/Chem4Word.Model2/Ring.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/SubstanceRole.cs b/src/Chemistry/Chem4Word.Model2/SubstanceRole.cs index 88342765..e89d42f7 100644 --- a/src/Chemistry/Chem4Word.Model2/SubstanceRole.cs +++ b/src/Chemistry/Chem4Word.Model2/SubstanceRole.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/TextualProperty.cs b/src/Chemistry/Chem4Word.Model2/TextualProperty.cs index 760402c8..698036e4 100644 --- a/src/Chemistry/Chem4Word.Model2/TextualProperty.cs +++ b/src/Chemistry/Chem4Word.Model2/TextualProperty.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.Model2/packages.config b/src/Chemistry/Chem4Word.Model2/packages.config index 71dec815..a12c1bd0 100644 --- a/src/Chemistry/Chem4Word.Model2/packages.config +++ b/src/Chemistry/Chem4Word.Model2/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.WebServices/Chem4Word.WebServices.csproj b/src/Chemistry/Chem4Word.WebServices/Chem4Word.WebServices.csproj index eb9db83f..8eb2e919 100644 --- a/src/Chemistry/Chem4Word.WebServices/Chem4Word.WebServices.csproj +++ b/src/Chemistry/Chem4Word.WebServices/Chem4Word.WebServices.csproj @@ -47,7 +47,7 @@ - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -100,7 +100,6 @@ - diff --git a/src/Chemistry/Chem4Word.WebServices/ChemicalProperties.cs b/src/Chemistry/Chem4Word.WebServices/ChemicalProperties.cs index 4e46ce3d..08db6825 100644 --- a/src/Chemistry/Chem4Word.WebServices/ChemicalProperties.cs +++ b/src/Chemistry/Chem4Word.WebServices/ChemicalProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.WebServices/ChemicalServices.cs b/src/Chemistry/Chem4Word.WebServices/ChemicalServices.cs index b628f276..17fc4a3d 100644 --- a/src/Chemistry/Chem4Word.WebServices/ChemicalServices.cs +++ b/src/Chemistry/Chem4Word.WebServices/ChemicalServices.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. @@ -11,6 +11,7 @@ using System.Net; using System.Net.Http; using System.Reflection; +using Chem4Word.Core; using Chem4Word.Core.Helpers; using Chem4Word.Telemetry; using IChem4Word.Contracts; @@ -25,6 +26,7 @@ public class ChemicalServices private IChem4WordTelemetry Telemetry { get; } private readonly string _version; + private AzureSettings _settings = new AzureSettings(true); public ChemicalServices(IChem4WordTelemetry telemetry, string version) { @@ -32,8 +34,11 @@ public ChemicalServices(IChem4WordTelemetry telemetry, string version) _version = version; // http://byterot.blogspot.com/2016/07/singleton-httpclient-dns.html - var sp = ServicePointManager.FindServicePoint(new Uri(Constants.Chem4WordWebServiceUri)); - sp.ConnectionLeaseTimeout = 60 * 1000; // 1 minute + if (!string.IsNullOrEmpty(_settings.ChemicalServicesUri)) + { + var sp = ServicePointManager.FindServicePoint(new Uri($"{_settings.ChemicalServicesUri}Resolve")); + sp.ConnectionLeaseTimeout = 60 * 1000; // 1 minute + } } public ChemicalServicesResult GetChemicalServicesResult(string molfile) @@ -47,7 +52,7 @@ public ChemicalServicesResult GetChemicalServicesResult(string molfile) try { - ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; + ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls12; using (HttpClient httpClient = new HttpClient()) { @@ -67,32 +72,35 @@ public ChemicalServicesResult GetChemicalServicesResult(string molfile) try { - var response = httpClient.PostAsync(Constants.Chem4WordWebServiceUri, content).Result; - if (response.Content != null) + if (!string.IsNullOrEmpty(_settings.ChemicalServicesUri)) { - var responseContent = response.Content; - var jsonContent = responseContent.ReadAsStringAsync().Result; - - try - { - data = JsonConvert.DeserializeObject(jsonContent); - } - catch (Exception e3) + var response = httpClient.PostAsync($"{_settings.ChemicalServicesUri}Resolve", content).Result; + if (response.Content != null) { - Telemetry.Write(module, "Exception", e3.Message); - Telemetry.Write(module, "Exception(Data)", jsonContent); - } + var responseContent = response.Content; + var jsonContent = responseContent.ReadAsStringAsync().Result; - if (data != null) - { - if (data.Messages.Any()) + try + { + data = JsonConvert.DeserializeObject(jsonContent); + } + catch (Exception e3) { - Telemetry.Write(module, "Timing", string.Join(Environment.NewLine, data.Messages)); + Telemetry.Write(module, "Exception", e3.Message); + Telemetry.Write(module, "Exception(Data)", jsonContent); } - if (data.Errors.Any()) + if (data != null) { - Telemetry.Write(module, "Exception(Data)", string.Join(Environment.NewLine, data.Errors)); + if (data.Messages.Any()) + { + Telemetry.Write(module, "Timing", string.Join(Environment.NewLine, data.Messages)); + } + + if (data.Errors.Any()) + { + Telemetry.Write(module, "Exception(Data)", string.Join(Environment.NewLine, data.Errors)); + } } } } diff --git a/src/Chemistry/Chem4Word.WebServices/ChemicalServicesResult.cs b/src/Chemistry/Chem4Word.WebServices/ChemicalServicesResult.cs index 015f82d5..ff1dff7a 100644 --- a/src/Chemistry/Chem4Word.WebServices/ChemicalServicesResult.cs +++ b/src/Chemistry/Chem4Word.WebServices/ChemicalServicesResult.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs index 168e2795..92228332 100644 --- a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs @@ -1,4 +1,11 @@ -using System.Reflection; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -9,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.WebServices")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -28,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Chemistry/Chem4Word.WebServices/PropertyCalculator.cs b/src/Chemistry/Chem4Word.WebServices/PropertyCalculator.cs index 053a5d19..c6a8fe37 100644 --- a/src/Chemistry/Chem4Word.WebServices/PropertyCalculator.cs +++ b/src/Chemistry/Chem4Word.WebServices/PropertyCalculator.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Chemistry/Chem4Word.WebServices/app.config b/src/Chemistry/Chem4Word.WebServices/app.config deleted file mode 100644 index be5df299..00000000 --- a/src/Chemistry/Chem4Word.WebServices/app.config +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.WebServices/packages.config b/src/Chemistry/Chem4Word.WebServices/packages.config index 1b818cfd..b85ad2f3 100644 --- a/src/Chemistry/Chem4Word.WebServices/packages.config +++ b/src/Chemistry/Chem4Word.WebServices/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Common/Chem4Word.Core/AzureSettings.cs b/src/Common/Chem4Word.Core/AzureSettings.cs new file mode 100644 index 00000000..df50e05a --- /dev/null +++ b/src/Common/Chem4Word.Core/AzureSettings.cs @@ -0,0 +1,190 @@ +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using Chem4Word.Core.Helpers; +using Microsoft.Win32; +using Newtonsoft.Json; +using System; +using System.Globalization; +using System.Linq; +using System.Net; +using System.Net.Http; + +namespace Chem4Word.Core +{ + [JsonObject(MemberSerialization.OptIn)] + public class AzureSettings + { + /// + /// Used in ChemicalServices.cs; ServicePointManager.FindServicePoint(...) + /// + [JsonProperty] + public string ChemicalServicesUri { get; set; } + + /// + /// Used in AzureServiceBusWriter.cs to construct ServiceBusClient + /// + [JsonProperty] + public string ServiceBusEndPoint { get; set; } + + /// + /// Used in AzureServiceBusWriter.cs to construct ServiceBusClient + /// + [JsonProperty] + public string ServiceBusToken { get; set; } + + /// + /// Used in AzureServiceBusWriter.cs; CreateSender + /// + [JsonProperty] + public string ServiceBusQueue { get; set; } + + /// + /// Stores when last checked + /// + public string LastChecked { get; set; } + + private bool _dirty; + + public AzureSettings() + { + // Must have empty constructor to allow this class to deserialize itself + } + + public AzureSettings(bool load) + { + if (load) + { + Load(); + } + } + + private void Load() + { + var today = DateTime.Today.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture); + + // 1. Attempt to get from registry + GetFromRegistry(); + + // 2. If not found or too old; attempt to get from Chem4Word web site(s) + if (string.IsNullOrEmpty(LastChecked) || !LastChecked.Equals(today)) + { + GetFromWebsite(today); + } + + // 2.1 Save to registry if found + if (_dirty) + { + SaveToRegistry(today); + } + } + + private void GetFromRegistry() + { + var key = Registry.CurrentUser.OpenSubKey(Constants.Chem4WordAzureSettingsRegistryKey, true); + if (key != null) + { + var names = key.GetValueNames(); + + if (names.Contains(nameof(ChemicalServicesUri))) + { + var chemicalServicesUri = key.GetValue(nameof(ChemicalServicesUri)).ToString(); + ChemicalServicesUri = chemicalServicesUri; + } + + if (names.Contains(nameof(ServiceBusEndPoint))) + { + var serviceBusEndPoint = key.GetValue(nameof(ServiceBusEndPoint)).ToString(); + ServiceBusEndPoint = serviceBusEndPoint; + } + + if (names.Contains(nameof(ServiceBusToken))) + { + var serviceBusToken = key.GetValue(nameof(ServiceBusToken)).ToString(); + ServiceBusToken = serviceBusToken; + } + + if (names.Contains(nameof(ServiceBusQueue))) + { + var serviceBusQueue = key.GetValue(nameof(ServiceBusQueue)).ToString(); + ServiceBusQueue = serviceBusQueue; + } + + if (names.Contains(nameof(LastChecked))) + { + var lastChecked = key.GetValue(nameof(LastChecked)).ToString(); + LastChecked = lastChecked; + } + } + } + + private void GetFromWebsite(string today) + { + var file = $"{Constants.Chem4WordVersionFiles}/AzureSettings.json"; + + var securityProtocol = ServicePointManager.SecurityProtocol; + ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls12; + + var found = false; + var temp = string.Empty; + + foreach (var domain in Constants.OurDomains) + { + using (var client = new HttpClient()) + { + try + { + client.DefaultRequestHeaders.Add("user-agent", "Chem4Word GetAzureSettings"); + client.BaseAddress = new Uri(domain); + var response = client.GetAsync(file).Result; + response.EnsureSuccessStatusCode(); + + var result = response.Content.ReadAsStringAsync().Result; + if (result.Contains("Chem4WordAzureSettings")) + { + found = true; + temp = result; + } + } + catch + { + //Debugger.Break() + } + } + + if (found) + { + break; + } + } + + if (!string.IsNullOrEmpty(temp)) + { + var settings = JsonConvert.DeserializeObject(temp); + ChemicalServicesUri = settings.ChemicalServicesUri; + ServiceBusEndPoint = settings.ServiceBusEndPoint; + ServiceBusToken = settings.ServiceBusToken; + ServiceBusQueue = settings.ServiceBusQueue; + LastChecked = today; + _dirty = true; + } + } + + private void SaveToRegistry(string today) + { + var key = Registry.CurrentUser.CreateSubKey(Constants.Chem4WordAzureSettingsRegistryKey); + if (key != null) + { + key.SetValue(nameof(ChemicalServicesUri), ChemicalServicesUri); + key.SetValue(nameof(ServiceBusEndPoint), ServiceBusEndPoint); + key.SetValue(nameof(ServiceBusToken), ServiceBusToken); + key.SetValue(nameof(ServiceBusQueue), ServiceBusQueue); + key.SetValue(nameof(LastChecked), today); + } + } + } +} \ No newline at end of file diff --git a/src/Common/Chem4Word.Core/Chem4Word.Core.csproj b/src/Common/Chem4Word.Core/Chem4Word.Core.csproj index 8c6a0a3b..a025df1a 100644 --- a/src/Common/Chem4Word.Core/Chem4Word.Core.csproj +++ b/src/Common/Chem4Word.Core/Chem4Word.Core.csproj @@ -52,12 +52,30 @@ TRACE + + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + + + ..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + + + ..\..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + + + ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + + + ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + + ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + @@ -68,6 +86,7 @@ + @@ -139,7 +158,9 @@ Chem4Word.Contracts - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Common/Chem4Word.Telemetry/packages.config b/src/Common/Chem4Word.Telemetry/packages.config index 1e663a09..09ab61d1 100644 --- a/src/Common/Chem4Word.Telemetry/packages.config +++ b/src/Common/Chem4Word.Telemetry/packages.config @@ -1,17 +1,17 @@  - + - - - - + + + + - + - + - + @@ -21,8 +21,8 @@ - - + + \ No newline at end of file diff --git a/src/Installer/Chem4WordSetup/Constants.cs b/src/Installer/Chem4WordSetup/Constants.cs index 54f8b002..2a108cbc 100644 --- a/src/Installer/Chem4WordSetup/Constants.cs +++ b/src/Installer/Chem4WordSetup/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordSetup/Program.cs b/src/Installer/Chem4WordSetup/Program.cs index 786435e5..f491cd3e 100644 --- a/src/Installer/Chem4WordSetup/Program.cs +++ b/src/Installer/Chem4WordSetup/Program.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs index 3b4a0d39..c0e3a888 100644 --- a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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 Setup Bootstrapper")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Installer/Chem4WordSetup/RegistryHelper.cs b/src/Installer/Chem4WordSetup/RegistryHelper.cs index b0b3c9a8..4e42ca84 100644 --- a/src/Installer/Chem4WordSetup/RegistryHelper.cs +++ b/src/Installer/Chem4WordSetup/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordSetup/Setup.cs b/src/Installer/Chem4WordSetup/Setup.cs index d08b2bfd..d191f569 100644 --- a/src/Installer/Chem4WordSetup/Setup.cs +++ b/src/Installer/Chem4WordSetup/Setup.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. @@ -24,7 +24,7 @@ public partial class Setup : Form { private const string VersionsFile = "files3-2/Chem4Word-Versions.xml"; private const string PrimaryDomain = "https://www.chem4word.co.uk"; - private static readonly string[] Domains = { "https://www.chem4word.co.uk", "http://www.chem4word.com", "https://chem4word.azurewebsites.net" }; + private static readonly string[] OurDomains = { "https://www.chem4word.co.uk", "http://www.chem4word.com", "https://chem4word.azurewebsites.net" }; private const string VersionsFileMarker = "f3c4f4db-2fff-46db-b14a-feb8e09f7742"; private const string RegistryKeyName = @"SOFTWARE\Chem4Word V3"; @@ -32,7 +32,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-2/Chem4Word-Setup.3.2.6.Release.2.msi"; + private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.7.Release.3.msi"; private const string VstoInstaller = "https://www.chem4word.co.uk/files3-2/vstor_redist.exe"; private WebClient _webClient; @@ -276,7 +276,7 @@ private string GetVersionsXmlFile() var securityProtocol = ServicePointManager.SecurityProtocol; ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; - foreach (var domain in Domains) + foreach (var domain in OurDomains) { using (HttpClient client = new HttpClient()) { diff --git a/src/Installer/Chem4WordSetup/TaskIndicator.cs b/src/Installer/Chem4WordSetup/TaskIndicator.cs index ed0ffd2b..fa831087 100644 --- a/src/Installer/Chem4WordSetup/TaskIndicator.cs +++ b/src/Installer/Chem4WordSetup/TaskIndicator.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordUpdater/Constants.cs b/src/Installer/Chem4WordUpdater/Constants.cs index aca652eb..2882e71c 100644 --- a/src/Installer/Chem4WordUpdater/Constants.cs +++ b/src/Installer/Chem4WordUpdater/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordUpdater/Program.cs b/src/Installer/Chem4WordUpdater/Program.cs index 42157155..ac7ffe35 100644 --- a/src/Installer/Chem4WordUpdater/Program.cs +++ b/src/Installer/Chem4WordUpdater/Program.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs index e31210d6..8414e650 100644 --- a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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("Chem4WordUpdater")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Installer/Chem4WordUpdater/RegistryHelper.cs b/src/Installer/Chem4WordUpdater/RegistryHelper.cs index ce14025f..11e77b4a 100644 --- a/src/Installer/Chem4WordUpdater/RegistryHelper.cs +++ b/src/Installer/Chem4WordUpdater/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/Chem4WordUpdater/Updater.cs b/src/Installer/Chem4WordUpdater/Updater.cs index 243a2345..0218a91d 100644 --- a/src/Installer/Chem4WordUpdater/Updater.cs +++ b/src/Installer/Chem4WordUpdater/Updater.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Installer/WiX.CustomAction/CustomAction.cs b/src/Installer/WiX.CustomAction/CustomAction.cs index abf5b5a5..79fdea29 100644 --- a/src/Installer/WiX.CustomAction/CustomAction.cs +++ b/src/Installer/WiX.CustomAction/CustomAction.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. @@ -109,6 +109,127 @@ private static void ModifyFolderPermissions(Session session) session.Log($" Fixed SpecialFolder.CommonApplicationData {ProgramDataFolder}"); } + [CustomAction] + public static ActionResult CleanSystemRegistry(Session session) + { + session.Log($"Begin {nameof(CleanSystemRegistry)}()"); + + session.Log($" Running as {Environment.UserName}"); + + try + { + // This pass will clean HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Office\Word\Addins on 64 bit machine + // or HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Office\Word\Addins on a 32 bit machine + if (Environment.Is64BitOperatingSystem) + { + session.Log(@" Cleaning HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Office\Word\Addins"); + } + else + { + session.Log(@" Cleaning HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Office\Word\Addins"); + } + var listOfKeys = new List(); + + // Gather locations that (old) add-in has been registered + var rootKey = Registry.LocalMachine.OpenSubKey($@"SOFTWARE\{OfficeKey}\Word\Addins", true); + foreach (var subKey in rootKey.GetSubKeyNames()) + { + var temp = Registry.LocalMachine.OpenSubKey($@"SOFTWARE\{OfficeKey}\Word\Addins\{subKey}", true); + if (temp != null) + { + var value = temp.GetValue("Manifest", "").ToString(); + if (value.Contains("/Chem4Word")) + { + session.Log($" Adding target '{subKey}' with Manifest of '{value}'"); + listOfKeys.Add(subKey); + } + } + } + + foreach (var key in listOfKeys) + { + DeleteSystemKey32(session, $@"SOFTWARE\{OfficeKey}\Word\Addins\", $"{key}"); + } + + if (Environment.Is64BitOperatingSystem) + { + session.Log(@" Cleaning HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Office\Word\Addins"); + listOfKeys.Clear(); + + // Now clear HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Office\Word\Addins on 64 bit machine + RegistryKey rk = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64); + if (rk != null) + { + string keyName = $@"Software\{OfficeKey}\Word\Addins"; + RegistryKey rk2 = rk.OpenSubKey(keyName, true); + if (rk2 != null) + { + foreach (var subKeyName in rk2.GetSubKeyNames()) + { + var rk3 = rk2.OpenSubKey(subKeyName); + if (rk3 != null) + { + var value = rk3.GetValue("Manifest", "").ToString(); + if (value.Contains("/Chem4Word")) + { + session.Log($" Adding target '{subKeyName}' with Manifest of '{value}'"); + listOfKeys.Add(subKeyName); + } + } + } + } + } + } + + foreach (var key in listOfKeys) + { + DeleteSystemKey64(session, key); + } + + } + catch (Exception ex) + { + session.Log($"** Exception: {ex.Message} **"); + } + + session.Log($"End {nameof(CleanSystemRegistry)}()"); + + return ActionResult.Success; + } + + private static void DeleteSystemKey64(Session session, string key) + { + RegistryKey rk = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64); + string keyName = $@"Software\{OfficeKey}\Word\Addins\{key}"; + rk.DeleteSubKeyTree(keyName); + } + + private static void DeleteSystemKey32(Session session, string nameOfKey, string kkk) + { + session.Log($" {nameof(DeleteSystemKey32)}({nameOfKey}, {kkk})"); + + RegistryKey key = Registry.LocalMachine.OpenSubKey($"{nameOfKey}{kkk}", true); + if (key != null) + { + try + { + var values = key.GetValueNames(); + foreach (string value in values) + { + session.Log($" Deleting Value '{value}'"); + key.DeleteValue(value); + } + + key = Registry.LocalMachine.OpenSubKey($"{nameOfKey}", true); + key?.DeleteSubKey(kkk); + } + catch (Exception ex) + { + Debug.WriteLine(ex.Message); + } + } + } + [CustomAction] public static ActionResult CleanUserRegistry(Session session) { @@ -118,14 +239,24 @@ public static ActionResult CleanUserRegistry(Session session) try { - // Possible locations that (old) add-in may have been registered - var listOfKeys = new List() - { - "Chemistry Add-in for Word", - "Chem4Word", - "Chem4Word V3", - "Chem4Word.V3" - }; + var listOfKeys = new List(); + + // Gather locations that (old) add-in has been registered + var rootKey = Registry.CurrentUser.OpenSubKey($@"SOFTWARE\{OfficeKey}\Word\Addins", true); + foreach (var subKey in rootKey.GetSubKeyNames()) + { + var temp = Registry.CurrentUser.OpenSubKey($@"SOFTWARE\{OfficeKey}\Word\Addins\{subKey}", true); + if (temp != null) + { + var value = temp.GetValue("Manifest", "").ToString(); + if (value.Contains("/Chem4Word")) + { + session.Log($" Adding target '{subKey}' with Manifest of '{value}'"); + listOfKeys.Add(subKey); + } + } + } + foreach (var key in listOfKeys) { DeleteUserKey(session, $@"SOFTWARE\{OfficeKey}\Word\Addins\", $"{key}"); @@ -186,7 +317,7 @@ private static void DeleteUserKey(Session session, string nameOfKey, string kkk) var values = key.GetValueNames(); foreach (string value in values) { - session.Log($"Deleting Value '{value}'"); + session.Log($" Deleting Value '{value}'"); key.DeleteValue(value); } diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs index 25015554..82d179ec 100644 --- a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs +++ b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. @@ -15,7 +15,7 @@ [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("WiX.CustomAction")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -34,5 +34,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs index 3df596e6..80e581a1 100644 --- a/src/Installer/WiXInstaller/Product.wxs +++ b/src/Installer/WiXInstaller/Product.wxs @@ -1,7 +1,7 @@  - + @@ -49,14 +49,16 @@ - + + - NOT Installed + NOT Installed + NOT Installed NOT Installed Installed diff --git a/src/Installer/WiXInstaller/Test.cmd b/src/Installer/WiXInstaller/Test.cmd index 7d6c76c1..8a345543 100644 --- a/src/Installer/WiXInstaller/Test.cmd +++ b/src/Installer/WiXInstaller/Test.cmd @@ -1,12 +1,16 @@ +dir bin\Setup\ +rem pause + del setup.log del remove.log -msiexec /i Chem4Word-Setup.3.1.16.Release.6.msi /l*v setup.log +msiexec /i bin\Setup\Chem4Word-Setup.3.1.16.Release.6.msi /l*v setup.log rem pause -msiexec /uninstall Chem4Word-Setup.3.1.16.Release.6.msi /l*v remove.log +msiexec /uninstall bin\Setup\Chem4Word-Setup.3.1.16.Release.6.msi /l*v remove.log -pause +rem pause rem find "Property(" setup.log > properties.log +rem search logs for "Calling custom action WiX.CustomAction" diff --git a/src/Installer/WiXInstaller/WiX-Installer.wixproj b/src/Installer/WiXInstaller/WiX-Installer.wixproj index b7d7becb..ae6ba280 100644 --- a/src/Installer/WiXInstaller/WiX-Installer.wixproj +++ b/src/Installer/WiXInstaller/WiX-Installer.wixproj @@ -6,7 +6,7 @@ 3.10 746e1493-1b1e-482c-8fa4-c147237f4f7b 2.0 - Chem4Word-Setup.3.2.6.Release.2 + Chem4Word-Setup.3.2.7.Release.3 Package SAK SAK diff --git a/src/Notes/Releases.txt b/src/Notes/Releases.txt index 8d4fedb5..806e1426 100644 --- a/src/Notes/Releases.txt +++ b/src/Notes/Releases.txt @@ -1,7 +1,8 @@ # Set Build Numbers -.\SetAssemblyVersion.ps1 -version 3.2.6 -name "Release 2" -released "05-Dec-2022" -path .. +.\SetAssemblyVersion.ps1 -version 3.2.7 -name "Release 3" -released "02-Feb-2023" -path .. +.\SetAssemblyVersion.ps1 -version 3.2.6 -name "Release 2" -released "05-Dec-2022" -path .. .\SetAssemblyVersion.ps1 -version 3.2.5 -name "Release 1" -released "30-Nov-2022" -path .. .\SetAssemblyVersion.ps1 -version 3.2.4 -name "Beta 4" -released "01-Apr-2022" -path .. .\SetAssemblyVersion.ps1 -version 3.2.3 -name "Beta 3" -released "24-Mar-2022" -path .. diff --git a/src/PlugIns/Contracts/IChem4WordCommon.cs b/src/PlugIns/Contracts/IChem4WordCommon.cs index e2f792ce..727ee3bf 100644 --- a/src/PlugIns/Contracts/IChem4WordCommon.cs +++ b/src/PlugIns/Contracts/IChem4WordCommon.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Contracts/IChem4WordEditor.cs b/src/PlugIns/Contracts/IChem4WordEditor.cs index 6194e8dc..2a37b088 100644 --- a/src/PlugIns/Contracts/IChem4WordEditor.cs +++ b/src/PlugIns/Contracts/IChem4WordEditor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Contracts/IChem4WordRenderer.cs b/src/PlugIns/Contracts/IChem4WordRenderer.cs index eba3c68e..26d77323 100644 --- a/src/PlugIns/Contracts/IChem4WordRenderer.cs +++ b/src/PlugIns/Contracts/IChem4WordRenderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Contracts/IChem4WordSearcher.cs b/src/PlugIns/Contracts/IChem4WordSearcher.cs index 728c3dbd..919f0381 100644 --- a/src/PlugIns/Contracts/IChem4WordSearcher.cs +++ b/src/PlugIns/Contracts/IChem4WordSearcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Contracts/IChem4WordTelemetry.cs b/src/PlugIns/Contracts/IChem4WordTelemetry.cs index 7142bcc1..a7bdded5 100644 --- a/src/PlugIns/Contracts/IChem4WordTelemetry.cs +++ b/src/PlugIns/Contracts/IChem4WordTelemetry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs index b1759620..bec955a6 100644 --- a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Contracts")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/AcmeSettingsHost.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/AcmeSettingsHost.cs index 370acdcf..514a8767 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/AcmeSettingsHost.cs +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/AcmeSettingsHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Chem4Word.Editor.ACME.csproj b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Chem4Word.Editor.ACME.csproj index e0efc632..db5a74c2 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Chem4Word.Editor.ACME.csproj +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Chem4Word.Editor.ACME.csproj @@ -102,9 +102,6 @@ AcmeSettingsHost.cs - - - if "$(ConfigurationName)" == "Vso-Ci" ( diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Editor.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Editor.cs index 97861930..6575c098 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Editor.cs +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Editor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.cs index 5c1af425..e8bae2df 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.cs +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/EditorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs index 0dae3524..e2d397e0 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Editor.ACME")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config b/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config deleted file mode 100644 index 76f775d7..00000000 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Options.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Options.cs index abcc1184..57f13423 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Options.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Settings.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Settings.cs index 02faec7c..c52c7bc9 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Settings.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Cdw800Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Chem4Word.Editor.ChemDoodleWeb800.csproj b/src/PlugIns/Editors/ChemDoodleWeb.800/Chem4Word.Editor.ChemDoodleWeb800.csproj index a1efbcc8..223f2b42 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Chem4Word.Editor.ChemDoodleWeb800.csproj +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Chem4Word.Editor.ChemDoodleWeb800.csproj @@ -62,7 +62,7 @@ True - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs index 7d828fd7..5dd5bd8c 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs index 2dfb33ba..efe8f8a6 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs index 6520050d..2d111623 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.ChemDoodleWebEditor800")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs index 60bedc32..bb13d7de 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/packages.config b/src/PlugIns/Editors/ChemDoodleWeb.800/packages.config index e5948576..837065b8 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/packages.config +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Chem4Word.Editor.SimpleWpfEditor.csproj b/src/PlugIns/Editors/SimpleWpfEditor/Chem4Word.Editor.SimpleWpfEditor.csproj index c7dcacab..b0d94ee2 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/Chem4Word.Editor.SimpleWpfEditor.csproj +++ b/src/PlugIns/Editors/SimpleWpfEditor/Chem4Word.Editor.SimpleWpfEditor.csproj @@ -99,9 +99,6 @@ EditorHost.cs - - - if "$(ConfigurationName)" == "Vso-Ci" ( diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs b/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs index c8364da0..8cba1f9f 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs b/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs index 4b645955..760d430a 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs index d41aeb16..a7666636 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.SimpleWpfEditor")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Editors/SimpleWpfEditor/app.config b/src/PlugIns/Editors/SimpleWpfEditor/app.config deleted file mode 100644 index 76f775d7..00000000 --- a/src/PlugIns/Editors/SimpleWpfEditor/app.config +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/PlugIns/Renderers/OoXmlV4/Chem4Word.Renderer.OoXmlV4.csproj b/src/PlugIns/Renderers/OoXmlV4/Chem4Word.Renderer.OoXmlV4.csproj index 2c61e609..68fd01bf 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Chem4Word.Renderer.OoXmlV4.csproj +++ b/src/PlugIns/Renderers/OoXmlV4/Chem4Word.Renderer.OoXmlV4.csproj @@ -42,11 +42,11 @@ DEBUG;TRACE - - ..\..\..\packages\DocumentFormat.OpenXml.2.17.1\lib\net46\DocumentFormat.OpenXml.dll + + ..\..\..\packages\DocumentFormat.OpenXml.2.19.0\lib\net46\DocumentFormat.OpenXml.dll - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -54,8 +54,8 @@ ..\..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\..\..\packages\System.IO.Packaging.6.0.0\lib\net461\System.IO.Packaging.dll + + ..\..\..\packages\System.IO.Packaging.7.0.0\lib\net462\System.IO.Packaging.dll diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/AtomLabelCharacter.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/AtomLabelCharacter.cs index ea0e1e0a..b7037de4 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/AtomLabelCharacter.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/AtomLabelCharacter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/BondLine.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/BondLine.cs index 6fc62753..0b8a0a17 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/BondLine.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/BondLine.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticLine.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticLine.cs index 596d8edc..1f8739b7 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticLine.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticLine.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticRectangle.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticRectangle.cs index 2393983b..9b8885ad 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticRectangle.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticRectangle.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticSpot.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticSpot.cs index 4620581e..e6e7f4ca 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticSpot.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/DiagnosticSpot.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/Diagnostics.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/Diagnostics.cs index 5e9d89c6..3e88028f 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/Diagnostics.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/Diagnostic/Diagnostics.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/GroupOfCharacters.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/GroupOfCharacters.cs index e7a8436e..aa413a90 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/GroupOfCharacters.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/GroupOfCharacters.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/InnerCircle.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/InnerCircle.cs index 487406a8..17869aff 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/InnerCircle.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/InnerCircle.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/MoleculeExtents.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/MoleculeExtents.cs index 729136ba..b9d716d7 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/MoleculeExtents.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/MoleculeExtents.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/OoXmlString.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/OoXmlString.cs index c2b0efe3..d7c9c503 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/OoXmlString.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/OoXmlString.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerInputs.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerInputs.cs index 30583b25..a0f1c9eb 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerInputs.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerInputs.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerOutputs.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerOutputs.cs index fb95a412..6f1f7326 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerOutputs.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/PositionerOutputs.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Entities/SimpleLine.cs b/src/PlugIns/Renderers/OoXmlV4/Entities/SimpleLine.cs index ff5637aa..da4fa1a7 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Entities/SimpleLine.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Entities/SimpleLine.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Enums/BondLineStyle.cs b/src/PlugIns/Renderers/OoXmlV4/Enums/BondLineStyle.cs index 8752d9bc..b4955290 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Enums/BondLineStyle.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Enums/BondLineStyle.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Enums/TextBlockJustification.cs b/src/PlugIns/Renderers/OoXmlV4/Enums/TextBlockJustification.cs index c1a506f8..2f273435 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Enums/TextBlockJustification.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Enums/TextBlockJustification.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlFile.cs b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlFile.cs index 41750d95..8d71658b 100644 --- a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlFile.cs +++ b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlFile.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlHelper.cs b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlHelper.cs index 320c9cf1..caa77882 100644 --- a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlHelper.cs +++ b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlPositioner.cs b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlPositioner.cs index b343e86a..516f229f 100644 --- a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlPositioner.cs +++ b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlPositioner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlRenderer.cs b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlRenderer.cs index ee4c919c..133233e7 100644 --- a/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlRenderer.cs +++ b/src/PlugIns/Renderers/OoXmlV4/OOXML/OoXmlRenderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Options.cs b/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Options.cs index 7ca5f2cb..73576c76 100644 --- a/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Options.cs +++ b/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Settings.cs b/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Settings.cs index f0562a62..ba52b696 100644 --- a/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Settings.cs +++ b/src/PlugIns/Renderers/OoXmlV4/OoXmlV4Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs index 6e946380..5aa0f5b4 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Renderer.OoXmlV4")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Renderers/OoXmlV4/Renderer.cs b/src/PlugIns/Renderers/OoXmlV4/Renderer.cs index 853b4df2..a5fe2025 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Renderer.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Renderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/TTF/TtfCharacter.cs b/src/PlugIns/Renderers/OoXmlV4/TTF/TtfCharacter.cs index 95faa2fc..302c72fc 100644 --- a/src/PlugIns/Renderers/OoXmlV4/TTF/TtfCharacter.cs +++ b/src/PlugIns/Renderers/OoXmlV4/TTF/TtfCharacter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/TTF/TtfContour.cs b/src/PlugIns/Renderers/OoXmlV4/TTF/TtfContour.cs index 120c8068..7ff46f6f 100644 --- a/src/PlugIns/Renderers/OoXmlV4/TTF/TtfContour.cs +++ b/src/PlugIns/Renderers/OoXmlV4/TTF/TtfContour.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/TTF/TtfPoint.cs b/src/PlugIns/Renderers/OoXmlV4/TTF/TtfPoint.cs index 96c5ad4d..7d491a20 100644 --- a/src/PlugIns/Renderers/OoXmlV4/TTF/TtfPoint.cs +++ b/src/PlugIns/Renderers/OoXmlV4/TTF/TtfPoint.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Renderers/OoXmlV4/packages.config b/src/PlugIns/Renderers/OoXmlV4/packages.config index f36610f3..23bce286 100644 --- a/src/PlugIns/Renderers/OoXmlV4/packages.config +++ b/src/PlugIns/Renderers/OoXmlV4/packages.config @@ -1,8 +1,8 @@  - - + + - + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBIOptions.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBIOptions.cs index e64ad2ac..e06d8427 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBIOptions.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBIOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBISettings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBISettings.cs index 4dd67f0f..db7b1052 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBISettings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/ChEBISettings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Chem4Word.Searcher.ChEBIPlugin.csproj b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Chem4Word.Searcher.ChEBIPlugin.csproj index 59c45903..27a932e5 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Chem4Word.Searcher.ChEBIPlugin.csproj +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Chem4Word.Searcher.ChEBIPlugin.csproj @@ -47,7 +47,7 @@ - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -118,9 +118,6 @@ - - Designer - SettingsSingleFileGenerator diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs index 6447d509..f4a8e6bb 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs index 8522f8e0..f0aa910c 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Searcher.ChEBIPlugin")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs index a930ad2f..06f93886 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs index 87459e1a..d8c6e7db 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config deleted file mode 100644 index 7f0a81c3..00000000 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config +++ /dev/null @@ -1,94 +0,0 @@ - - - - -
- - - - - - - - - - http://www.ebi.ac.uk:80/webservices/chebi/2.0/webservice - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/packages.config b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/packages.config index 1b818cfd..b85ad2f3 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/packages.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Chem4Word.Searcher.ExamplePlugIn.csproj b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Chem4Word.Searcher.ExamplePlugIn.csproj index 2e2baf7b..5ddd64ec 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Chem4Word.Searcher.ExamplePlugIn.csproj +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Chem4Word.Searcher.ExamplePlugIn.csproj @@ -52,7 +52,7 @@ - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -95,7 +95,6 @@ - diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleOptions.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleOptions.cs index 2e748117..0a277744 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleOptions.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleSettings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleSettings.cs index 7d4a4ea1..4b663193 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleSettings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/ExampleSettings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs index 53207dfd..c2133535 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Searcher.ExamplePlugIn")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs index 3f9894d3..b69148eb 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/app.config deleted file mode 100644 index 4cf21481..00000000 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/app.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/packages.config b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/packages.config index 1b818cfd..b85ad2f3 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/packages.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Chem4Word.Searcher.OpsinPlugIn.csproj b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Chem4Word.Searcher.OpsinPlugIn.csproj index 8591af71..77b23827 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Chem4Word.Searcher.OpsinPlugIn.csproj +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Chem4Word.Searcher.OpsinPlugIn.csproj @@ -52,7 +52,7 @@ - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -142,7 +142,6 @@ - diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs index 2fbeccf8..22c8532c 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinOptions.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinOptions.cs index 34565f92..ef7ca940 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinOptions.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinSettings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinSettings.cs index 7dc458c6..cbfac17d 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinSettings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/OpsinSettings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs index 7a80bd09..7b886e20 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Searcher.OpsinPlugIn")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs index bee17ef4..6d61f328 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs index bca686b5..18a8a932 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config deleted file mode 100644 index 76f775d7..00000000 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/packages.config b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/packages.config index 1b818cfd..b85ad2f3 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/packages.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Chem4Word.Searcher.PubChemPlugIn.csproj b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Chem4Word.Searcher.PubChemPlugIn.csproj index 9e6730d7..2abcbfa6 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Chem4Word.Searcher.PubChemPlugIn.csproj +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Chem4Word.Searcher.PubChemPlugIn.csproj @@ -52,7 +52,7 @@ - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -144,7 +144,6 @@ - diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs index 6d1bc1cf..b0349df1 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs index 37140ef4..4819ff03 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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.Searcher.PubChemPlugIn")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemOptions.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemOptions.cs index c33790ee..9cfeada7 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemOptions.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemOptions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemSettings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemSettings.cs index 9fd8a269..8376b8c3 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemSettings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/PubChemSettings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs index 03f890fd..c3abfad3 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs index 7811a58e..c605f2c0 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config deleted file mode 100644 index cbbdfb70..00000000 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/packages.config b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/packages.config index 1b818cfd..b85ad2f3 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/packages.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Scripts/Detect-Invalid-Config.ps1 b/src/Scripts/Detect-Invalid-Config.ps1 new file mode 100644 index 00000000..7e039d91 --- /dev/null +++ b/src/Scripts/Detect-Invalid-Config.ps1 @@ -0,0 +1,51 @@ +# Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted + +cls + +$obsolete = @() +$obsolete += "Microsoft.Azure.KeyVault.Core" +$obsolete += "Microsoft.Azure.Services.AppAuthentication" +$obsolete += "Microsoft.IdentityModel.Clients.ActiveDirectory" +$obsolete += "Microsoft.IdentityModel.JsonWebTokens" +$obsolete += "Microsoft.IdentityModel.Logging" +$obsolete += "Microsoft.IdentityModel.Tokens" +$obsolete += "Microsoft.Rest.ClientRuntime" +$obsolete += "Microsoft.Rest.ClientRuntime.Azure" +$obsolete += "System.IdentityModel.Tokens.Jwt" +$obsolete += "WindowsAzure.ServiceBus" +$obsolete += "System.Net.Http" + + +$targets = Get-ChildItem ..\. -include *.csproj -Recurse +$count = 0 + +foreach ($target in $targets) +{ + Write-Host "Folder $($target.DirectoryName)" -ForegroundColor Cyan + + $appConfig = "$($target.DirectoryName)\app.config" + $foundAppConfig = Test-Path -path "$($appConfig)" + + if ($foundAppConfig) + { + Write-Host " Found $($appConfig)" -ForegroundColor Yellow + $flaws = 0 + foreach ($word in $obsolete) + { + $exists = Select-String -Path $appConfig -Pattern $word + if ($exists -ne $null) + { + Write-Host " app.config is flawed because it contains '$($word)'" -ForegroundColor Red + $count++ + $flaws++ + } + } + if ($flaws -gt 0) + { + Write-Host " $($flaws) flaws found in '$($appConfig)'" -ForegroundColor Yellow + } + } +} + +Write-Host "$($count) flaws found" +Exit $count diff --git a/src/Scripts/SetAssemblyVersion.ps1 b/src/Scripts/SetAssemblyVersion.ps1 index e187c1f5..2fdba7c1 100644 --- a/src/Scripts/SetAssemblyVersion.ps1 +++ b/src/Scripts/SetAssemblyVersion.ps1 @@ -19,7 +19,7 @@ function Help { "Sets the AssemblyVersion and AssemblyFileVersion of AssemblyInfo.cs files`n" ".\SetAssemblyVersion.ps1 [VersionNumber] -path [SearchPath] -released [Released] -name [Name]`n" " [VersionNumber] The version number to set, for example: 1.2.3" - " [Released] The release date, for example: 01-Jan-2022" + " [Released] The release date, for example: 31-Jan-2023" " [Name] The name, for example: Beta 2" " [SearchPath] The path to search for AssemblyInfo files.`n" } @@ -43,7 +43,7 @@ function Update-SourceVersion $assemblyVersion = 'AssemblyVersion("' + $version + '")'; $fileVersion = 'AssemblyFileVersion("' + $version + '")'; $company = 'AssemblyCompany("Chem4Word")' - $copyright = 'AssemblyCopyright("© Chem4Word 2022. All rights reserved.")' + $copyright = 'AssemblyCopyright("© Chem4Word 2023. All rights reserved.")' $trademark = 'AssemblyTrademark("Chem4Word")' (Get-Content $o.FullName -encoding UTF8) | ForEach-Object { diff --git a/src/Scripts/SignFiles.cmd b/src/Scripts/SignFiles.cmd index 147cbc10..f423798f 100644 --- a/src/Scripts/SignFiles.cmd +++ b/src/Scripts/SignFiles.cmd @@ -1,6 +1,6 @@ @echo off -set release=Chem4Word-Setup.3.2.6.Release.2.msi +set release=Chem4Word-Setup.3.2.7.Release.3.msi set working=C:\Temp set signclientpath=C:\Tools\Azure\SignClient diff --git a/src/Shared/FolderHelper.cs b/src/Shared/FolderHelper.cs index a48c4932..f972b912 100644 --- a/src/Shared/FolderHelper.cs +++ b/src/Shared/FolderHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Shared/OfficeHelper.cs b/src/Shared/OfficeHelper.cs index 4e939ea3..8fb6d75d 100644 --- a/src/Shared/OfficeHelper.cs +++ b/src/Shared/OfficeHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/Shared/RegistryWOW6432.cs b/src/Shared/RegistryWOW6432.cs index 8ce0063c..6a51e509 100644 --- a/src/Shared/RegistryWOW6432.cs +++ b/src/Shared/RegistryWOW6432.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WPF.ShapeTester/App.config b/src/TestHarness/WPF.ShapeTester/App.config deleted file mode 100644 index f20e56d2..00000000 --- a/src/TestHarness/WPF.ShapeTester/App.config +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestHarness/WPF.ShapeTester/App.xaml.cs b/src/TestHarness/WPF.ShapeTester/App.xaml.cs index ca9fa289..06ef76c5 100644 --- a/src/TestHarness/WPF.ShapeTester/App.xaml.cs +++ b/src/TestHarness/WPF.ShapeTester/App.xaml.cs @@ -1,4 +1,11 @@ -using System.Windows; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Windows; namespace WPF.ShapeTester { @@ -8,4 +15,4 @@ namespace WPF.ShapeTester public partial class App : Application { } -} \ No newline at end of file +} diff --git a/src/TestHarness/WPF.ShapeTester/MainWindow.xaml.cs b/src/TestHarness/WPF.ShapeTester/MainWindow.xaml.cs index c445112d..4fef84f7 100644 --- a/src/TestHarness/WPF.ShapeTester/MainWindow.xaml.cs +++ b/src/TestHarness/WPF.ShapeTester/MainWindow.xaml.cs @@ -1,4 +1,11 @@ -using System.Windows; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Windows; namespace WPF.ShapeTester { @@ -12,4 +19,4 @@ public MainWindow() InitializeComponent(); } } -} \ No newline at end of file +} diff --git a/src/TestHarness/WPF.ShapeTester/Properties/AssemblyInfo.cs b/src/TestHarness/WPF.ShapeTester/Properties/AssemblyInfo.cs index 04731371..29bd829f 100644 --- a/src/TestHarness/WPF.ShapeTester/Properties/AssemblyInfo.cs +++ b/src/TestHarness/WPF.ShapeTester/Properties/AssemblyInfo.cs @@ -1,4 +1,11 @@ -using System.Reflection; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Reflection; using System.Runtime.InteropServices; using System.Windows; @@ -10,7 +17,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("WPF.ShapeTester")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -44,5 +51,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/TestHarness/WPF.ShapeTester/WPF.ShapeTester.csproj b/src/TestHarness/WPF.ShapeTester/WPF.ShapeTester.csproj index 3449d675..6870e082 100644 --- a/src/TestHarness/WPF.ShapeTester/WPF.ShapeTester.csproj +++ b/src/TestHarness/WPF.ShapeTester/WPF.ShapeTester.csproj @@ -106,9 +106,6 @@ Settings.Designer.cs - - - {1e3fc1f1-06cc-44bd-8004-3ef0ce7eeaa7} diff --git a/src/TestHarness/WinForms.TestHarness/App.config b/src/TestHarness/WinForms.TestHarness/App.config index 7eb462d6..4deafd7b 100644 --- a/src/TestHarness/WinForms.TestHarness/App.config +++ b/src/TestHarness/WinForms.TestHarness/App.config @@ -5,81 +5,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/TestHarness/WinForms.TestHarness/ConfigWatcher.cs b/src/TestHarness/WinForms.TestHarness/ConfigWatcher.cs index 33790758..31472e25 100644 --- a/src/TestHarness/WinForms.TestHarness/ConfigWatcher.cs +++ b/src/TestHarness/WinForms.TestHarness/ConfigWatcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/Dumper.cs b/src/TestHarness/WinForms.TestHarness/Dumper.cs index cb9ba340..7bda38bf 100644 --- a/src/TestHarness/WinForms.TestHarness/Dumper.cs +++ b/src/TestHarness/WinForms.TestHarness/Dumper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/EditorHost.cs b/src/TestHarness/WinForms.TestHarness/EditorHost.cs index ee2d0723..07250642 100644 --- a/src/TestHarness/WinForms.TestHarness/EditorHost.cs +++ b/src/TestHarness/WinForms.TestHarness/EditorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/HexViewer.cs b/src/TestHarness/WinForms.TestHarness/HexViewer.cs index d2938497..5dd18d20 100644 --- a/src/TestHarness/WinForms.TestHarness/HexViewer.cs +++ b/src/TestHarness/WinForms.TestHarness/HexViewer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/LayoutResult.cs b/src/TestHarness/WinForms.TestHarness/LayoutResult.cs index c2056ed3..c566794c 100644 --- a/src/TestHarness/WinForms.TestHarness/LayoutResult.cs +++ b/src/TestHarness/WinForms.TestHarness/LayoutResult.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/MainForm.cs b/src/TestHarness/WinForms.TestHarness/MainForm.cs index fb7e77e4..0f3e9c30 100644 --- a/src/TestHarness/WinForms.TestHarness/MainForm.cs +++ b/src/TestHarness/WinForms.TestHarness/MainForm.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/Program.cs b/src/TestHarness/WinForms.TestHarness/Program.cs index 47d1864e..060991ba 100644 --- a/src/TestHarness/WinForms.TestHarness/Program.cs +++ b/src/TestHarness/WinForms.TestHarness/Program.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs index 1115468a..eae76191 100644 --- a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs +++ b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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("WinForms.TestHarness")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/TestHarness/WinForms.TestHarness/ShowCml.cs b/src/TestHarness/WinForms.TestHarness/ShowCml.cs index 1b8a472b..adc9ac66 100644 --- a/src/TestHarness/WinForms.TestHarness/ShowCml.cs +++ b/src/TestHarness/WinForms.TestHarness/ShowCml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/StackViewer.xaml.cs b/src/TestHarness/WinForms.TestHarness/StackViewer.xaml.cs index 361e22d2..68faea3b 100644 --- a/src/TestHarness/WinForms.TestHarness/StackViewer.xaml.cs +++ b/src/TestHarness/WinForms.TestHarness/StackViewer.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/TestHarness/WinForms.TestHarness/WinForms.TestHarness.csproj b/src/TestHarness/WinForms.TestHarness/WinForms.TestHarness.csproj index 0b4b3ecd..ffab03b6 100644 --- a/src/TestHarness/WinForms.TestHarness/WinForms.TestHarness.csproj +++ b/src/TestHarness/WinForms.TestHarness/WinForms.TestHarness.csproj @@ -59,7 +59,7 @@ - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -160,6 +160,7 @@ ShowCml.cs + SettingsSingleFileGenerator @@ -171,9 +172,6 @@ True - - - {1e3fc1f1-06cc-44bd-8004-3ef0ce7eeaa7} diff --git a/src/TestHarness/WinForms.TestHarness/packages.config b/src/TestHarness/WinForms.TestHarness/packages.config index 78a748b6..67900de7 100644 --- a/src/TestHarness/WinForms.TestHarness/packages.config +++ b/src/TestHarness/WinForms.TestHarness/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/App.config b/src/TestHarness/Wpf.FunctionalGroupEditor/App.config deleted file mode 100644 index cb79f98e..00000000 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/App.config +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/App.xaml.cs b/src/TestHarness/Wpf.FunctionalGroupEditor/App.xaml.cs index 6f3bd9bd..c6d68ca5 100644 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/App.xaml.cs +++ b/src/TestHarness/Wpf.FunctionalGroupEditor/App.xaml.cs @@ -1,4 +1,11 @@ -using System.Windows; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Windows; namespace Wpf.FunctionalGroupEditor { @@ -8,4 +15,4 @@ namespace Wpf.FunctionalGroupEditor public partial class App : Application { } -} \ No newline at end of file +} diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/MainWindow.xaml.cs b/src/TestHarness/Wpf.FunctionalGroupEditor/MainWindow.xaml.cs index 7df05f1c..a0622169 100644 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/MainWindow.xaml.cs +++ b/src/TestHarness/Wpf.FunctionalGroupEditor/MainWindow.xaml.cs @@ -1,4 +1,11 @@ -using System; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -112,4 +119,4 @@ private void MainWindow_OnClosing(object sender, CancelEventArgs e) MessageBox.Show("Results on Clipboard !"); } } -} \ No newline at end of file +} diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs index 619d4a4d..4dcdeb6e 100644 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs +++ b/src/TestHarness/Wpf.FunctionalGroupEditor/Properties/AssemblyInfo.cs @@ -1,4 +1,11 @@ -using System.Reflection; +// --------------------------------------------------------------------------- +// Copyright (c) 2023, 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. +// --------------------------------------------------------------------------- + +using System.Reflection; using System.Runtime.InteropServices; using System.Windows; @@ -10,7 +17,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Wpf.FunctionalGroupEditor")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -44,5 +51,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/Wpf.FunctionalGroupEditor.csproj b/src/TestHarness/Wpf.FunctionalGroupEditor/Wpf.FunctionalGroupEditor.csproj index c66cd1d4..f743b610 100644 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/Wpf.FunctionalGroupEditor.csproj +++ b/src/TestHarness/Wpf.FunctionalGroupEditor/Wpf.FunctionalGroupEditor.csproj @@ -50,7 +50,7 @@ - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -123,9 +123,6 @@ Settings.Designer.cs - - - {1E3FC1F1-06CC-44BD-8004-3EF0CE7EEAA7} diff --git a/src/TestHarness/Wpf.FunctionalGroupEditor/packages.config b/src/TestHarness/Wpf.FunctionalGroupEditor/packages.config index 1b818cfd..b85ad2f3 100644 --- a/src/TestHarness/Wpf.FunctionalGroupEditor/packages.config +++ b/src/TestHarness/Wpf.FunctionalGroupEditor/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/UnitTests/App.config b/src/UnitTests/App.config deleted file mode 100644 index c1acde8d..00000000 --- a/src/UnitTests/App.config +++ /dev/null @@ -1,85 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/UnitTests/Chem4WordTests.csproj b/src/UnitTests/Chem4WordTests.csproj index ebd22d2e..e4f24b13 100644 --- a/src/UnitTests/Chem4WordTests.csproj +++ b/src/UnitTests/Chem4WordTests.csproj @@ -67,7 +67,7 @@ ..\packages\Microsoft_VisualStudio_QualityTools_UnitTestFramework.STW.12.0.21005.1\lib\net40\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -152,7 +152,6 @@ - Designer @@ -212,8 +211,8 @@ - - + + diff --git a/src/UnitTests/EditControllerTests.cs b/src/UnitTests/EditControllerTests.cs index ed4a5992..3f2c64fb 100644 --- a/src/UnitTests/EditControllerTests.cs +++ b/src/UnitTests/EditControllerTests.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/UnitTests/FunctionalGroupTests.cs b/src/UnitTests/FunctionalGroupTests.cs index 4894b4ef..4950a3a9 100644 --- a/src/UnitTests/FunctionalGroupTests.cs +++ b/src/UnitTests/FunctionalGroupTests.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/UnitTests/GeneralTests.cs b/src/UnitTests/GeneralTests.cs index 8022ebdf..c74ab7c1 100644 --- a/src/UnitTests/GeneralTests.cs +++ b/src/UnitTests/GeneralTests.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/UnitTests/PersistenceTests.cs b/src/UnitTests/PersistenceTests.cs index bf3122ba..748bec6e 100644 --- a/src/UnitTests/PersistenceTests.cs +++ b/src/UnitTests/PersistenceTests.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/UnitTests/Properties/AssemblyInfo.cs b/src/UnitTests/Properties/AssemblyInfo.cs index b64655b5..8e39497c 100644 --- a/src/UnitTests/Properties/AssemblyInfo.cs +++ b/src/UnitTests/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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("Chem4WordTests")] -[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.6.8374")] -[assembly: AssemblyFileVersion("3.2.6.8374")] +[assembly: AssemblyVersion("3.2.7.8433")] +[assembly: AssemblyFileVersion("3.2.7.8433")] diff --git a/src/UnitTests/ResourceHelper.cs b/src/UnitTests/ResourceHelper.cs index 8d36fd5f..6980dce5 100644 --- a/src/UnitTests/ResourceHelper.cs +++ b/src/UnitTests/ResourceHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/UnitTests/SupportRoutinesTests.cs b/src/UnitTests/SupportRoutinesTests.cs index f600e522..9034de6a 100644 --- a/src/UnitTests/SupportRoutinesTests.cs +++ b/src/UnitTests/SupportRoutinesTests.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2022, The .NET Foundation. +// Copyright (c) 2023, 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. diff --git a/src/UnitTests/packages.config b/src/UnitTests/packages.config index 563485a2..4bdf04e3 100644 --- a/src/UnitTests/packages.config +++ b/src/UnitTests/packages.config @@ -1,10 +1,10 @@  - + - +