Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Newtonsoft.Json from 13.0.1 to 13.0.3 #4681

Merged
merged 5 commits into from Sep 6, 2023
Merged

Upgrade Newtonsoft.Json from 13.0.1 to 13.0.3 #4681

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54601d4
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Aug 29, 2023
3e0b00d
Update Newtonsoft.Json from 13.0.1 to 13.0.3
mthalman Aug 29, 2023
20c8f4f
Revert everything back to 13.0.1
mthalman Sep 5, 2023
5d16822
Use NewtonsoftJsonVersion instead of JsonNetVersion
mthalman Sep 5, 2023
ec3a6f9
Use 13.0.3 for source-build
mthalman Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Expand Up @@ -14,9 +14,9 @@
<Sha>5ce78f66d89ea529e459abddb129ab36cb5bd936</Sha>
<SourceBuild RepoName="diagnostics" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23424.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23429.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>e3cc6c792114ebdfe6627742d2820dbe1ae5bc47</Sha>
<Sha>0603839a51f5e18b89c60a3690aff5e81fa666ca</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23414.1">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@
<MicrosoftVSTelemetryVersion>17.6.46</MicrosoftVSTelemetryVersion>
<MicrosoftVSUtilitiesInternalVersion>16.3.42</MicrosoftVSUtilitiesInternalVersion>
<MicrosoftVSSDKBuildToolsVersion>17.4.2116</MicrosoftVSSDKBuildToolsVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<RoslynBannedApiAnalyzersVersion>3.3.3</RoslynBannedApiAnalyzersVersion>
<RoslynPublicApiAnalyzersVersion>3.3.4-beta1.21554.2</RoslynPublicApiAnalyzersVersion>
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
Expand Down Expand Up @@ -95,6 +95,6 @@
(or the respective branch. It also needs to be on nuget.org. -->
<NuGetFrameworksVersion>6.5.0</NuGetFrameworksVersion>
<ILAsmPackageVersion>5.0.0</ILAsmPackageVersion>
<JsonNetVersion>13.0.1</JsonNetVersion>
<JsonNetVersion>13.0.3</JsonNetVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj
View file
Open in desktop
Expand Up @@ -10,6 +10,6 @@
<!-- / CVE-2017-11770 -->

<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/package/ThirdPartyNotices.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ and the licenses under which Microsoft received such components are set forth be
informational purposes only. Microsoft reserves all rights not expressly granted herein, whether by
implication, estoppel or otherwise.

1. Newtonsoft version 13.0.1 (https://github.com/JamesNK/Newtonsoft.Json)
1. Newtonsoft version 13.0.3 (https://github.com/JamesNK/Newtonsoft.Json)
2. Mono.Cecil version 0.11.3 (https://github.com/jbevain/cecil)


Expand Down
10 changes: 5 additions & 5 deletions test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
View file
Open in desktop
Expand Up @@ -327,7 +327,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -397,7 +397,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -737,7 +737,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -802,7 +802,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -870,7 +870,7 @@ public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down
2 changes: 1 addition & 1 deletion test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
<!-- TODO: This version would ideally be higher than the newtonsoft version we use in TP to show that the higher version is used.
Currently there is no higher stable version. -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down