Skip to content

Commit

Permalink
Merged PR 669: Release V3.3.4
Browse files Browse the repository at this point in the history 
- Internal: Update NuGet Packages
- BugFix: Prevent exception during save to library if structure has '+' annotation

Related work items: #1135
  • Loading branch information
@MikeWilliams-UK
MikeWilliams-UK committed Feb 29, 2024
1 parent eef5baa commit 8ab438e
Show file tree
Hide file tree
Showing 74 changed files with 609 additions and 452 deletions.
61 changes: 31 additions & 30 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,63 +24,64 @@ Azure Devops Build must be set to use VS2022 build agent
| Package | Version | License | Reference Count |
|--|--|--|--|
|Azure.Core.Amqp|1.3.0|MIT|2|
|Azure.Core|1.35.0|MIT|2|
|Azure.Messaging.ServiceBus|7.16.2|MIT|2|
|DocumentFormat.OpenXml|2.20.0|MIT|2|
|Azure.Core|1.38.0|MIT|2|
|Azure.Messaging.ServiceBus|7.17.3|MIT|2|
|DocumentFormat.OpenXml.Framework|3.0.1||2|
|DocumentFormat.OpenXml|3.0.1|MIT|2|
|DotNetProjects.WpfToolkit.Input|6.1.94|MS-PL|1|
|EntityFramework|6.4.4|Apache-2.0|3|
|Google.Protobuf|3.24.4|BSD-3-Clause|1|
|Grpc.Tools|2.59.0|Apache-2.0|1|
|Google.Protobuf|3.25.3|BSD-3-Clause|1|
|Grpc.Tools|2.62.0|Apache-2.0|1|
|Jacobslusser.ScintillaNET|3.6.3|MIT|1|
|Meziantou.Framework.Win32.CredentialManager|1.4.2|MIT|1|
|Microsoft.Azure.Amqp|2.6.3|MIT|2|
|Microsoft.Bcl.AsyncInterfaces|7.0.0|MIT|2|
|Meziantou.Framework.Win32.CredentialManager|1.6.0|MIT|1|
|Microsoft.Azure.Amqp|2.6.5|MIT|2|
|Microsoft.Bcl.AsyncInterfaces|8.0.0|MIT|2|
|Microsoft.NETCore.Platforms|7.0.4|MIT|2|
|Microsoft.TestPlatform.ObjectModel|17.7.2|MIT|1|
|Microsoft.Xaml.Behaviors.Wpf|1.1.75|MIT|1|
|Microsoft.TestPlatform.ObjectModel|17.9.0|MIT|1|
|Microsoft.Xaml.Behaviors.Wpf|1.1.77|MIT|1|
|Microsoft_VisualStudio_QualityTools_UnitTestFramework.STW|12.0.21005.1|Microsoft|1|
|Newtonsoft.Json|13.0.3|MIT|16|
|NuGet.Frameworks|6.7.0|Apache-2.0|1|
|NuGet.Frameworks|6.9.1|Apache-2.0|1|
|Ookii.Dialogs.WinForms|4.0.0|BSD-3-Clause|1|
|Standard.Licensing|1.1.5|MIT|1|
|Standard.Licensing|1.1.7|MIT|1|
|Stub.System.Data.SQLite.Core.NetFramework|1.0.118.0|Public Domain|4|
|System.Buffers|4.5.1|MIT|5|
|System.Collections.Immutable|7.0.0|MIT|2|
|System.ClientModel|1.0.0||2|
|System.Collections.Immutable|8.0.0|MIT|2|
|System.Data.SQLite.Core|1.0.118.0|Public Domain|3|
|System.Data.SQLite.EF6|1.0.118.0|Public Domain|3|
|System.Data.SQLite.Linq|1.0.118.0|Public Domain|3|
|System.Data.SQLite|1.0.118.0|Public Domain|3|
|System.Diagnostics.DiagnosticSource|7.0.2|Public Domain|2|
|System.Diagnostics.DiagnosticSource|8.0.0|Public Domain|2|
|System.IO.Compression.ZipFile|4.3.0|MS-.NET-Library|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.IO.Packaging|8.0.0|MIT|2|
|System.Memory.Data|8.0.0|MIT|2|
|System.Memory|4.5.5|MIT|5|
|System.Net.Http|4.3.4|MS-.NET-Library|9|
|System.Numerics.Vectors|4.5.0|MIT|5|
|System.Reflection.Metadata|7.0.2|MIT|1|
|System.Resources.Extensions|7.0.0|MIT|1|
|System.Reflection.Metadata|8.0.0|MIT|1|
|System.Resources.Extensions|8.0.0|MIT|1|
|System.Runtime.CompilerServices.Unsafe|6.0.0|MIT|5|
|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|7.0.0|MIT|2|
|System.Text.Json|7.0.3|MIT|2|
|System.Text.Encodings.Web|8.0.0|MIT|2|
|System.Text.Json|8.0.2|MIT|2|
|System.Threading.Tasks.Extensions|4.5.4|MIT|2|
|System.ValueTuple|4.5.0|MIT|19|
|VirtualizingWrapPanel|1.5.7|MIT|1|
|VirtualizingWrapPanel|2.0.5|MIT|1|
|xunit.abstractions|2.0.3|Apache-2.0|1|
|xunit.analyzers|1.4.0|Apache-2.0|1|
|xunit.assert|2.5.3|Apache-2.0|1|
|xunit.core|2.5.3|Apache-2.0|1|
|xunit.extensibility.core|2.5.3|Apache-2.0|1|
|xunit.extensibility.execution|2.5.3|Apache-2.0|1|
|xunit.runner.console|2.5.3|Apache-2.0|1|
|xunit.runner.visualstudio|2.5.3|Apache-2.0|1|
|xunit|2.5.3|Apache-2.0|1|

|xunit.analyzers|1.11.0|Apache-2.0|1|
|xunit.assert|2.7.0|Apache-2.0|1|
|xunit.core|2.7.0|Apache-2.0|1|
|xunit.extensibility.core|2.7.0|Apache-2.0|1|
|xunit.extensibility.execution|2.7.0|Apache-2.0|1|
|xunit.runner.console|2.7.0|Apache-2.0|1|
|xunit.runner.visualstudio|2.5.7|Apache-2.0|1|
|xunit|2.7.0|Apache-2.0|1|
## Acknowledgements
1. [CEVOpen](https://github.com/petermr/CEVOpen) - This data represents about 2100 unique chemical names of volatile plant chemicals (essential oils) from the EssoilDB 1.0 database (compiled from the scientific literature over about 10 years in Dr Yadav's laboratory). They are made available for re-use by anyone for any purpose (CC0). We would appreciate acknowledgement of EssoilDB and the following people who extracted and cleaned the data during 2019. (Gitanjali Yadav, Ambarish Kumar, Peter Murray-Rust).

Expand Down
80 changes: 47 additions & 33 deletions src/Chem4Word.V3/Chem4Word.V3.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,32 +156,35 @@
-->
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Azure.Core, Version=1.35.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.35.0\lib\net461\Azure.Core.dll</HintPath>
<Reference Include="Azure.Core, Version=1.38.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.38.0\lib\net461\Azure.Core.dll</HintPath>
</Reference>
<Reference Include="Azure.Core.Amqp, Version=1.3.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.Amqp.1.3.0\lib\netstandard2.0\Azure.Core.Amqp.dll</HintPath>
</Reference>
<Reference Include="Azure.Messaging.ServiceBus, Version=7.16.2.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Messaging.ServiceBus.7.16.2\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll</HintPath>
<Reference Include="Azure.Messaging.ServiceBus, Version=7.17.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Messaging.ServiceBus.7.17.3\lib\netstandard2.0\Azure.Messaging.ServiceBus.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml, Version=2.20.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.2.20.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
<Reference Include="DocumentFormat.OpenXml, Version=3.0.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.3.0.1\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.0.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.0.1\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Meziantou.Framework.Win32.CredentialManager, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Meziantou.Framework.Win32.CredentialManager.1.4.2\lib\net461\Meziantou.Framework.Win32.CredentialManager.dll</HintPath>
<Reference Include="Meziantou.Framework.Win32.CredentialManager, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Meziantou.Framework.Win32.CredentialManager.1.6.0\lib\net462\Meziantou.Framework.Win32.CredentialManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Amqp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.Amqp.2.6.3\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
<HintPath>..\packages\Microsoft.Azure.Amqp.2.6.5\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand All @@ -208,8 +211,8 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Standard.Licensing, Version=1.1.5.0, Culture=neutral, PublicKeyToken=9f81b18f6db6aea5, processorArchitecture=MSIL">
<HintPath>..\packages\Standard.Licensing.1.1.5\lib\net45\Standard.Licensing.dll</HintPath>
<Reference Include="Standard.Licensing, Version=1.1.7.0, Culture=neutral, PublicKeyToken=9f81b18f6db6aea5, processorArchitecture=MSIL">
<HintPath>..\packages\Standard.Licensing.1.1.7\lib\net45\Standard.Licensing.dll</HintPath>
</Reference>
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand All @@ -218,6 +221,9 @@
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ClientModel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\System.ClientModel.1.0.0\lib\netstandard2.0\System.ClientModel.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
Expand All @@ -231,8 +237,8 @@
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Design" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
Expand All @@ -245,14 +251,14 @@
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.IO.Packaging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.7.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
<Reference Include="System.IO.Packaging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.8.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Memory.Data, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.Data.7.0.0\lib\net462\System.Memory.Data.dll</HintPath>
<Reference Include="System.Memory.Data, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.Data.8.0.0\lib\net462\System.Memory.Data.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand All @@ -264,8 +270,8 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Resources.Extensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Resources.Extensions.7.0.0\lib\net462\System.Resources.Extensions.dll</HintPath>
<Reference Include="System.Resources.Extensions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Resources.Extensions.8.0.0\lib\net462\System.Resources.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand Down Expand Up @@ -293,11 +299,11 @@
<Private>True</Private>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=7.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll</HintPath>
<Reference Include="System.Text.Json, Version=8.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.2\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
Expand All @@ -315,8 +321,8 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="UIAutomationProvider" />
<Reference Include="VirtualizingWrapPanel, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtualizingWrapPanel.1.5.7\lib\net452\VirtualizingWrapPanel.dll</HintPath>
<Reference Include="VirtualizingWrapPanel, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtualizingWrapPanel.2.0.5\lib\net462\VirtualizingWrapPanel.dll</HintPath>
</Reference>
<Reference Include="WindowsBase">
<Private>True</Private>
Expand Down Expand Up @@ -511,10 +517,12 @@
<Content Include="Resources\Button Images\Office-2016\Edit-Labels.png" />
<Content Include="Resources\Button Images\Office-2016\File-Open.png" />
<Content Include="Resources\Button Images\Office-2016\File-Save.png" />
<Content Include="Resources\Button Images\Office-2016\Gallery-Delete.png" />
<Content Include="Resources\Button Images\Office-2016\Gallery-Find.png" />
<Content Include="Resources\Button Images\Office-2016\Gallery-Save.png" />
<Content Include="Resources\Button Images\Office-2016\Gallery-Toggle.png" />
<Content Include="Resources\Button Images\Office-2016\Libraries-Manage.png" />
<Content Include="Resources\Button Images\Office-2016\Library-Buy.png" />
<Content Include="Resources\Button Images\Office-2016\Library-Delete.png" />
<Content Include="Resources\Button Images\Office-2016\Library-Find.png" />
<Content Include="Resources\Button Images\Office-2016\Library-Save.png" />
<Content Include="Resources\Button Images\Office-2016\Library-Toggle.png" />
<Content Include="Resources\Button Images\Office-2016\Navigator-Toggle.png" />
<Content Include="Resources\Button Images\Office-2016\Seperate-Molecules.png" />
<Content Include="Resources\Button Images\Office-2016\WebSearch.png" />
Expand Down Expand Up @@ -744,8 +752,14 @@
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
<PostBuildEvent>rem dir "$(SolutionDir)\..\..\Secure-Libraries\Chem4Word.Driver.Closed\bin\$(ConfigurationName)\Chem4Word.Driver.Closed.*"

if exist "$(SolutionDir)\..\..\Secure-Libraries\Chem4Word.Driver.Closed\bin\$(ConfigurationName)\Chem4Word.Driver.Closed.dll" (
xcopy "$(SolutionDir)\..\..\Secure-Libraries\Chem4Word.Driver.Closed\bin\$(ConfigurationName)\Chem4Word.Driver.Closed.*" "$(TargetDir)PlugIns\" /C /f /r /y /i
) else (
echo Can't find secure driver
)
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\System.Data.SQLite.Core.1.0.104.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.104.0\build\net451\System.Data.SQLite.Core.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
Loading

0 comments on commit 8ab438e

Please sign in to comment.