diff --git a/src/Chem4Word.V3/Chem4Word.V3.csproj b/src/Chem4Word.V3/Chem4Word.V3.csproj index 4cc5511..d57f34f 100644 --- a/src/Chem4Word.V3/Chem4Word.V3.csproj +++ b/src/Chem4Word.V3/Chem4Word.V3.csproj @@ -160,20 +160,20 @@ --> - - ..\packages\Azure.Core.1.41.0\lib\net461\Azure.Core.dll + + ..\packages\Azure.Core.1.44.0\lib\net461\Azure.Core.dll - - ..\packages\Azure.Core.Amqp.1.3.0\lib\netstandard2.0\Azure.Core.Amqp.dll + + ..\packages\Azure.Core.Amqp.1.3.1\lib\netstandard2.0\Azure.Core.Amqp.dll - - ..\packages\Azure.Messaging.ServiceBus.7.17.5\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll + + ..\packages\Azure.Messaging.ServiceBus.7.18.2\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll - - ..\packages\DocumentFormat.OpenXml.3.0.2\lib\net46\DocumentFormat.OpenXml.dll + + ..\packages\DocumentFormat.OpenXml.3.1.0\lib\net46\DocumentFormat.OpenXml.dll - - ..\packages\DocumentFormat.OpenXml.Framework.3.0.2\lib\net46\DocumentFormat.OpenXml.Framework.dll + + ..\packages\DocumentFormat.OpenXml.Framework.3.1.0\lib\net46\DocumentFormat.OpenXml.Framework.dll ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll @@ -223,19 +223,19 @@ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\packages\System.ClientModel.1.0.0\lib\netstandard2.0\System.ClientModel.dll + + ..\packages\System.ClientModel.1.2.0\lib\netstandard2.0\System.ClientModel.dll - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll @@ -247,14 +247,14 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\packages\System.Memory.Data.8.0.0\lib\net462\System.Memory.Data.dll + + ..\packages\System.Memory.Data.8.0.1\lib\net462\System.Memory.Data.dll @@ -301,8 +301,8 @@ ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -353,6 +353,7 @@ + @@ -493,6 +494,7 @@ Designer + Designer @@ -704,10 +706,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml index 15bff2f..9090643 100644 --- a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml +++ b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml @@ -5,10 +5,10 @@ 3.2.21 Release 17 false - 30-Sep-2024 + 09-Oct-2024 - BugFix: ... - BugFix: ... + Security: Update NuGet packages (Microsoft Security Advisory CVE-2024-43485 [System.Text.Json]) + Security: Update NuGet packages (Microsoft Security Advisory CVE-2024-43483 [System.IO.Packaging]) BugFix: Ensure strings for doubles are converted using InvariantCulture BugFix: 'System.NullReferenceException: Object reference not set to an instance of an object' sometimes seen after editing a structure to combine two molecules Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry @@ -34,7 +34,7 @@ BugFix: Prevent html input in searchers UX: Prohibit import of binary files BugFix: User unable to hide Hydrogens in Renderer (seen in Word document) - Security: Update NuGet packages (Microsoft Security Advisory CVE-2024-30105) + Security: Update NuGet packages (Microsoft Security Advisory CVE-2024-30105 [System.Text.Json]) diff --git a/src/Chem4Word.V3/Data/Insert Test Messages.reg b/src/Chem4Word.V3/Data/Insert Test Messages.reg new file mode 100644 index 0000000..be1b0d7 Binary files /dev/null and b/src/Chem4Word.V3/Data/Insert Test Messages.reg differ diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml index e00cc93..5e4444a 100644 --- a/src/Chem4Word.V3/Data/This-Version.xml +++ b/src/Chem4Word.V3/Data/This-Version.xml @@ -2,5 +2,5 @@ 3.2.21 Release 17 false - 30-Sep-2024 + 09-Oct-2024 \ No newline at end of file diff --git a/src/Chem4Word.V3/Data/index.html b/src/Chem4Word.V3/Data/index.html index 0de9904..461712e 100644 --- a/src/Chem4Word.V3/Data/index.html +++ b/src/Chem4Word.V3/Data/index.html @@ -2,14 +2,14 @@ - Chemistry for Word Add-In Version 2022 + Chemistry for Word Add-In @@ -18,7 +18,7 @@ -

Chemistry for Word Add-In 2022

+

Chemistry for Word Add-In

@@ -66,17 +66,29 @@

Chemistry for Word Add-In 2022

+

Chem4Word Versions

- - + + + + + + + + + + + +
Version HistoryChem4Word-Versions.xml Version 3.3 (latest)Version 3.2 (this version)Version 3.1
Setup BootstrapperChem4Word-Setup Chem4Word-SetupChem4Word-Setup
Version HistoryChem4Word-Versions.xmlChem4Word-Versions.xmlChem4Word-Versions.xml
-

Third Party

+ +

Third Party dependencies

diff --git a/src/Chem4Word.V3/Helpers/RegistryHelper.cs b/src/Chem4Word.V3/Helpers/RegistryHelper.cs index 8edcf90..f3f07cc 100644 --- a/src/Chem4Word.V3/Helpers/RegistryHelper.cs +++ b/src/Chem4Word.V3/Helpers/RegistryHelper.cs @@ -120,63 +120,85 @@ public static void SendExceptions() private static void SendValues(string module, string level, RegistryKey registryKey) { - var names = registryKey.GetValueNames(); - var values = new List(); + var keys = registryKey.GetValueNames(); + var values = new List(); - foreach (var name in names) + foreach (var key in keys) { - var message = registryKey.GetValue(name).ToString(); + var value = registryKey.GetValue(key).ToString(); - var timestamp = name; + var timestamp = key; var bracket = timestamp.IndexOf("[", StringComparison.InvariantCulture); if (bracket > 0) { timestamp = timestamp.Substring(0, bracket).Trim(); } - values.Add($"{timestamp} {message}"); - registryKey.DeleteValue(name); + var temp = new RegistryMessage + { + Date = timestamp + }; + + bracket = value.IndexOf("]", StringComparison.InvariantCulture); + if (bracket > 0) + { + temp.ProcessId = value.Substring(1, bracket - 1).Trim(); + temp.Message = value.Substring(bracket + 1).Trim(); + } + else + { + temp.Message = value; + } + + values.Add(temp); + registryKey.DeleteValue(key); } // Group the messages by day - var groupedByDay = values - .GroupBy(g => g.Substring(0, 10)) + var days = values + .GroupBy(g => g.Date.Substring(0, 10)) .ToList(); var depth = 0; - foreach (var group in groupedByDay) + foreach (var day in days) { - SendData(module, level, group.ToList(), ref depth); + SendData(module, level, day.ToList(), ref depth); } } - private static void SendData(string module, string level, List values, ref int depth) + private static void SendData(string module, string level, List messages, ref int depth) { - if (values.Any()) + if (messages.Any()) { depth++; - var message = string.Join(Environment.NewLine, values); + // Group messages by process id + var processes = messages + .GroupBy(g => g.ProcessId) + .ToList(); - if (values.Count == 1 || message.Length < 32_000) - { - // Single value or message small enough to send - Globals.Chem4WordV3.Telemetry.Write(module, level, message); - } - else + foreach (var process in processes) { - // Ensure that the recursion doesn't get too deep - if (depth < 4) + var message = string.Join(Environment.NewLine, process.ToList()); + // Maximum length of a message in Azure Service bus is 32K, use 125 for testing + if (message.Length < 32_000) { - // Split it into smaller groups, by hour, minute, second - var extra = depth * 3; - var groups = values - .GroupBy(g => g.Substring(0, 10 + extra)) - .ToList(); - - foreach (var group in groups) + Globals.Chem4WordV3.Telemetry.Write(module, level, message); + } + else + { + if (depth < 4) { - SendData(module, level, group.ToList(), ref depth); + var extra = depth * 3; + + // Re-Group by Hour, Minute, Second based on depth + var groups = messages + .GroupBy(g => g.Date.Substring(0, 10 + extra)) + .ToList(); + foreach (var group in groups) + { + SendData(module, level, group.ToList(), ref depth); + } } } } diff --git a/src/Chem4Word.V3/Helpers/RegistryMessage.cs b/src/Chem4Word.V3/Helpers/RegistryMessage.cs new file mode 100644 index 0000000..11b7c11 --- /dev/null +++ b/src/Chem4Word.V3/Helpers/RegistryMessage.cs @@ -0,0 +1,18 @@ +// --------------------------------------------------------------------------- +// Copyright (c) 2024, The .NET Foundation. +// This software is released under the Apache License, Version 2.0. +// The license and further copyright text can be found in the file LICENSE.md +// at the root directory of the distribution. +// --------------------------------------------------------------------------- + +namespace Chem4Word.Helpers +{ + public class RegistryMessage + { + public string Date { get; set; } + public string ProcessId { get; set; } + public string Message { get; set; } + + public override string ToString() => $"{Date} [{ProcessId}] {Message}"; + } +} \ No newline at end of file diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs index a784f91..8f3ef72 100644 --- a/src/Chem4Word.V3/Properties/AssemblyInfo.cs +++ b/src/Chem4Word.V3/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Chem4Word.V3/app.config b/src/Chem4Word.V3/app.config index d66d410..32fb074 100644 --- a/src/Chem4Word.V3/app.config +++ b/src/Chem4Word.V3/app.config @@ -36,11 +36,11 @@ - + - + @@ -60,16 +60,20 @@ - + - + + + + + @@ -116,8 +120,6 @@ - - - + \ No newline at end of file diff --git a/src/Chem4Word.V3/packages.config b/src/Chem4Word.V3/packages.config index 8044268..1bde916 100644 --- a/src/Chem4Word.V3/packages.config +++ b/src/Chem4Word.V3/packages.config @@ -1,28 +1,28 @@  - - - - - + + + + + - + - - - - - + + + + + - + - + @@ -33,7 +33,7 @@ - + diff --git a/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj b/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj index ff921fe..719cadf 100644 --- a/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj +++ b/src/Chemistry/Chem4Word.ACME/Chem4Word.ACME.csproj @@ -52,7 +52,7 @@ ..\..\packages\DotNetProjects.WpfToolkit.Input.6.1.94\lib\net40\DotNetProjects.Input.Toolkit.dll - ..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.122\lib\net462\Microsoft.Xaml.Behaviors.dll + ..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.135\lib\net462\Microsoft.Xaml.Behaviors.dll ..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs index 90ada9e..59c41e6 100644 --- a/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Chemistry/Chem4Word.ACME/app.config b/src/Chemistry/Chem4Word.ACME/app.config index ac53b79..efcafc2 100644 --- a/src/Chemistry/Chem4Word.ACME/app.config +++ b/src/Chemistry/Chem4Word.ACME/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.ACME/packages.config b/src/Chemistry/Chem4Word.ACME/packages.config index 9ea3494..417cfee 100644 --- a/src/Chemistry/Chem4Word.ACME/packages.config +++ b/src/Chemistry/Chem4Word.ACME/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/Chemistry/Chem4Word.Libraries/App.config b/src/Chemistry/Chem4Word.Libraries/App.config index 1bb65e5..3902dc7 100644 --- a/src/Chemistry/Chem4Word.Libraries/App.config +++ b/src/Chemistry/Chem4Word.Libraries/App.config @@ -54,24 +54,26 @@ - + - + + + + + - - - + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj b/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj index ff06ffc..890c154 100644 --- a/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj +++ b/src/Chemistry/Chem4Word.Libraries/Chem4Word.Libraries.csproj @@ -63,14 +63,14 @@ - - ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll + + ..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - ..\..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\..\packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\..\packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll @@ -127,10 +127,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs index 4f8321a..b08524a 100644 --- a/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Chemistry/Chem4Word.Libraries/packages.config b/src/Chemistry/Chem4Word.Libraries/packages.config index fdbeb19..cafc9d5 100644 --- a/src/Chemistry/Chem4Word.Libraries/packages.config +++ b/src/Chemistry/Chem4Word.Libraries/packages.config @@ -2,10 +2,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs index 4fd9095..4ff8ea5 100644 --- a/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs index c3ddde4..160d66b 100644 --- a/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.WebServices/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Chemistry/Chem4Word.WebServices/app.config b/src/Chemistry/Chem4Word.WebServices/app.config index 204ced5..c6b4988 100644 --- a/src/Chemistry/Chem4Word.WebServices/app.config +++ b/src/Chemistry/Chem4Word.WebServices/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs index da700f7..0aa0c33 100644 --- a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs +++ b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Common/Chem4Word.Telemetry/Chem4Word.Telemetry.csproj b/src/Common/Chem4Word.Telemetry/Chem4Word.Telemetry.csproj index 5386677..bfb4119 100644 --- a/src/Common/Chem4Word.Telemetry/Chem4Word.Telemetry.csproj +++ b/src/Common/Chem4Word.Telemetry/Chem4Word.Telemetry.csproj @@ -56,14 +56,14 @@ TRACE - - ..\..\packages\Azure.Core.1.41.0\lib\net461\Azure.Core.dll + + ..\..\packages\Azure.Core.1.44.0\lib\net461\Azure.Core.dll - - ..\..\packages\Azure.Core.Amqp.1.3.0\lib\netstandard2.0\Azure.Core.Amqp.dll + + ..\..\packages\Azure.Core.Amqp.1.3.1\lib\netstandard2.0\Azure.Core.Amqp.dll - - ..\..\packages\Azure.Messaging.ServiceBus.7.17.5\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll + + ..\..\packages\Azure.Messaging.ServiceBus.7.18.2\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll ..\..\packages\Microsoft.Azure.Amqp.2.6.9\lib\net45\Microsoft.Azure.Amqp.dll @@ -80,8 +80,8 @@ ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\packages\System.ClientModel.1.0.0\lib\netstandard2.0\System.ClientModel.dll + + ..\..\packages\System.ClientModel.1.2.0\lib\netstandard2.0\System.ClientModel.dll @@ -94,8 +94,8 @@ ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\packages\System.Memory.Data.8.0.0\lib\net462\System.Memory.Data.dll + + ..\..\packages\System.Memory.Data.8.0.1\lib\net462\System.Memory.Data.dll @@ -132,8 +132,8 @@ ..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll + + ..\..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs index 5884714..a1facb8 100644 --- a/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs +++ b/src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Common/Chem4Word.Telemetry/app.config b/src/Common/Chem4Word.Telemetry/app.config index 1042ced..34571e2 100644 --- a/src/Common/Chem4Word.Telemetry/app.config +++ b/src/Common/Chem4Word.Telemetry/app.config @@ -8,7 +8,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -28,11 +28,11 @@ - + - + @@ -46,6 +46,10 @@ + + + + \ No newline at end of file diff --git a/src/Common/Chem4Word.Telemetry/packages.config b/src/Common/Chem4Word.Telemetry/packages.config index 00a0f36..3e9deaa 100644 --- a/src/Common/Chem4Word.Telemetry/packages.config +++ b/src/Common/Chem4Word.Telemetry/packages.config @@ -1,17 +1,17 @@  - - - + + + - + - + @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs index ac1f793..7ef6135 100644 --- a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs index c907d52..468ca1a 100644 --- a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Installer/WiX.CustomAction/CustomAction.cs b/src/Installer/WiX.CustomAction/CustomAction.cs index 79f3824..9e74ad9 100644 --- a/src/Installer/WiX.CustomAction/CustomAction.cs +++ b/src/Installer/WiX.CustomAction/CustomAction.cs @@ -113,7 +113,7 @@ public static ActionResult SetupChem4WordUser(Session session) key = key = Registry.CurrentUser.CreateSubKey(actionsKey); } - var versionNumber = "3.2.21.9039"; + var versionNumber = "3.2.21.9048"; string timestamp = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss.fff", CultureInfo.InvariantCulture); key.SetValue(timestamp, $"[-] V{versionNumber} - Installed"); diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs index 3e6caa7..00c5a95 100644 --- a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs +++ b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs index 2f3f950..0103a20 100644 --- a/src/Installer/WiXInstaller/Product.wxs +++ b/src/Installer/WiXInstaller/Product.wxs @@ -1,7 +1,7 @@  - + diff --git a/src/Notes/Releases.txt b/src/Notes/Releases.txt index b7545fc..cc71b86 100644 --- a/src/Notes/Releases.txt +++ b/src/Notes/Releases.txt @@ -1,6 +1,6 @@ # Set Build Numbers -.\Set-Assembly-Version.ps1 -version 3.2.21 -name "Release 17" -released "30-Sep-2024" -path .. +.\Set-Assembly-Version.ps1 -version 3.2.21 -name "Release 17" -released "09-Oct-2024" -path .. .\Set-Assembly-Version.ps1 -version 3.2.20 -name "Release 16" -released "21-Aug-2024" -path .. .\Set-Assembly-Version.ps1 -version 3.2.19 -name "Release 15" -released "07-Aug-2024" -path .. diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs index ba7e03e..129ba3d 100644 --- a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs index 4696e7f..6933c3b 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config b/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config index ac53b79..efcafc2 100644 --- a/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config +++ b/src/PlugIns/Editors/Chem4Word.Editor.ACME/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs index 5616a39..2b9c1d2 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs index c7071fe..bb8401d 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Editors/SimpleWpfEditor/app.config b/src/PlugIns/Editors/SimpleWpfEditor/app.config index ac53b79..efcafc2 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/app.config +++ b/src/PlugIns/Editors/SimpleWpfEditor/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ 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 3e10820..9eddb05 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.3.0.2\lib\net46\DocumentFormat.OpenXml.dll + + ..\..\..\packages\DocumentFormat.OpenXml.3.1.0\lib\net46\DocumentFormat.OpenXml.dll - - ..\..\..\packages\DocumentFormat.OpenXml.Framework.3.0.2\lib\net46\DocumentFormat.OpenXml.Framework.dll + + ..\..\..\packages\DocumentFormat.OpenXml.Framework.3.1.0\lib\net46\DocumentFormat.OpenXml.Framework.dll ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -57,8 +57,8 @@ ..\..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\..\..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll + + ..\..\..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll diff --git a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs index 041b11b..bc4f73a 100644 --- a/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Renderers/OoXmlV4/packages.config b/src/PlugIns/Renderers/OoXmlV4/packages.config index b078008..9a91ff9 100644 --- a/src/PlugIns/Renderers/OoXmlV4/packages.config +++ b/src/PlugIns/Renderers/OoXmlV4/packages.config @@ -1,9 +1,9 @@  - - + + - + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs index 8259ec5..5c670e5 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config index ac53b79..efcafc2 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs index 6504877..31a3dc0 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs index 6ae9c59..9e09da9 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config index ac53b79..efcafc2 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs index 1c390bb..ee82dab 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config index ac53b79..efcafc2 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/Scripts/Sign-Files.cmd b/src/Scripts/Sign-Files.cmd index 7d020d8..6636857 100644 --- a/src/Scripts/Sign-Files.cmd +++ b/src/Scripts/Sign-Files.cmd @@ -6,6 +6,7 @@ set signtoolpath=C:\Tools\Azure\SignTool\sign.exe echo Copying files to %working% copy ..\Chem4Word.V3\Data\Chem4Word-Versions.xml %working% > nul +copy ..\Chem4Word.V3\Data\index.html %working% > nul copy ..\Installer\Chem4WordSetup\bin\Setup\Chem4Word-Setup.exe %working% > nul copy ..\Installer\WiXInstaller\bin\Setup\%release% %working% > nul diff --git a/src/TestHarness/WinForms.TestHarness/App.config b/src/TestHarness/WinForms.TestHarness/App.config index fd1abe8..7534138 100644 --- a/src/TestHarness/WinForms.TestHarness/App.config +++ b/src/TestHarness/WinForms.TestHarness/App.config @@ -35,11 +35,11 @@ - + - + @@ -59,16 +59,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs index 5800fc9..5f6fa5e 100644 --- a/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs +++ b/src/TestHarness/WinForms.TestHarness/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs b/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs index 8dfa2b1..34875ab 100644 --- a/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs +++ b/src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.2.21.9039")] -[assembly: AssemblyFileVersion("3.2.21.9039")] +[assembly: AssemblyVersion("3.2.21.9048")] +[assembly: AssemblyFileVersion("3.2.21.9048")] diff --git a/src/TestHarness/Wpf.UI.Sandbox/app.config b/src/TestHarness/Wpf.UI.Sandbox/app.config index ac53b79..efcafc2 100644 --- a/src/TestHarness/Wpf.UI.Sandbox/app.config +++ b/src/TestHarness/Wpf.UI.Sandbox/app.config @@ -36,16 +36,20 @@ - + - + + + + + \ No newline at end of file diff --git a/src/UnitTests/Chem4WordTests.csproj b/src/UnitTests/Chem4WordTests.csproj index 383bee0..8f90d35 100644 --- a/src/UnitTests/Chem4WordTests.csproj +++ b/src/UnitTests/Chem4WordTests.csproj @@ -1,8 +1,8 @@  + + - - Debug AnyCPU @@ -69,22 +69,22 @@ - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll + ..\packages\Microsoft.TestPlatform.ObjectModel.17.11.1\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll + ..\packages\Microsoft.TestPlatform.ObjectModel.17.11.1\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll ..\packages\Microsoft_VisualStudio_QualityTools_UnitTestFramework.STW.12.0.21005.1\lib\net40\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + ..\packages\Microsoft.TestPlatform.ObjectModel.17.11.1\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NuGet.Frameworks.6.10.1\lib\netstandard2.0\NuGet.Frameworks.dll + + ..\packages\NuGet.Frameworks.6.11.1\lib\netstandard2.0\NuGet.Frameworks.dll @@ -106,8 +106,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.8.0.1\lib\net462\System.Reflection.Metadata.dll @@ -127,14 +127,14 @@ ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll True - - ..\packages\xunit.assert.2.9.0\lib\netstandard1.1\xunit.assert.dll + + ..\packages\xunit.assert.2.9.2\lib\netstandard1.1\xunit.assert.dll - - ..\packages\xunit.extensibility.core.2.9.0\lib\net452\xunit.core.dll + + ..\packages\xunit.extensibility.core.2.9.2\lib\net452\xunit.core.dll - - ..\packages\xunit.extensibility.execution.2.9.0\lib\net452\xunit.execution.desktop.dll + + ..\packages\xunit.extensibility.execution.2.9.2\lib\net452\xunit.execution.desktop.dll @@ -254,8 +254,8 @@ - - + + @@ -281,12 +281,12 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - +
.Net Framework 4.6.2