Skip to content

Commit 31d9860

Browse files
MikeWilliams-UKMikeWilliams-UK
committed
Merged PR 529: Security Update Newtonsoft.Json -> 13.0.1
Security Update Newtonsoft.Json -> 13.0.1 Version Number -> 3.0.40 Related work items: #987
2 parents f16f32c + b339853 commit 31d9860

File tree

43 files changed

+85
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+85
-157
lines changed

‎src/Chem4Word.V3.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29209.62
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D4427174-46F5-4058-8934-4CEAFDBAF60D}"
77
ProjectSection(SolutionItems) = preProject

‎src/Chem4Word.V3/Chem4Word.V3.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@
188188
<Private>True</Private>
189189
</Reference>
190190
<Reference Include="Microsoft.VisualStudio.Tools.Applications.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
191-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
192-
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
191+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
192+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
193193
<Private>True</Private>
194194
</Reference>
195195
<Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,24 @@
22
<!-- This file must be uploaded to https://www.chem4word.co.uk/files3/ folder as Chem4Word-Versions.xml -->
33
<ChangeLog>
44
<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
5+
<Version>
6+
<Number>3.0.40 Release 28</Number>
7+
<IsBeta>false</IsBeta>
8+
<Released>01-Jul-2022</Released>
9+
<Changes>
10+
<Change>Security Update Newtonsoft.Json -> 13.0.1</Change>
11+
<Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
12+
<Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
13+
</Changes>
14+
<Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.40.Release.28.msi</Url>
15+
</Version>
516
<Version>
617
<Number>3.0.39 Release 27</Number>
718
<IsBeta>false</IsBeta>
819
<Released>03-Mar-2022</Released>
920
<Changes>
1021
<Change>Detect Office 2021</Change>
11-
<Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
12-
<Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
1322
</Changes>
14-
<Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.39.Release.27.msi</Url>
1523
</Version>
1624
<Version>
1725
<Number>3.0.38 Release 26</Number>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Version>
3-
<Number>3.0.39 Release 27</Number>
3+
<Number>3.0.40 Release 28</Number>
44
<IsBeta>false</IsBeta>
5-
<Released>03-Mar-2022</Released>
5+
<Released>01-Jul-2022</Released>
66
</Version>

‎src/Chem4Word.V3/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.0.39.8097")]
39-
[assembly: AssemblyFileVersion("3.0.39.8097")]
38+
[assembly: AssemblyVersion("3.0.40.8217")]
39+
[assembly: AssemblyFileVersion("3.0.40.8217")]

‎src/Chem4Word.V3/app.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
<assemblyIdentity name="WindowsBase" publicKeyToken="31bf3856ad364e35" culture="neutral" />
2020
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
2121
</dependentAssembly>
22-
<dependentAssembly>
23-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
25-
</dependentAssembly>
2622
</assemblyBinding>
2723
</runtime>
2824
<entityFramework>

‎src/Chem4WordTests/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.0.39.8097")]
39-
[assembly: AssemblyFileVersion("3.0.39.8097")]
38+
[assembly: AssemblyVersion("3.0.40.8217")]
39+
[assembly: AssemblyFileVersion("3.0.40.8217")]

‎src/Chemistry/Chem4Word.Model/Chem4Word.Model.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
9999
</PropertyGroup>
100100
<ItemGroup>
101-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
101+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
102+
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="PresentationCore" />

‎src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.0.39.8097")]
39-
[assembly: AssemblyFileVersion("3.0.39.8097")]
38+
[assembly: AssemblyVersion("3.0.40.8217")]
39+
[assembly: AssemblyFileVersion("3.0.40.8217")]

‎src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// Build Number
3636
// Revision
3737
//
38-
[assembly: AssemblyVersion("3.0.39.8097")]
39-
[assembly: AssemblyFileVersion("3.0.39.8097")]
38+
[assembly: AssemblyVersion("3.0.40.8217")]
39+
[assembly: AssemblyFileVersion("3.0.40.8217")]

0 commit comments

Comments
 (0)