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 all 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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@
<MicrosoftVSUtilitiesInternalVersion>16.3.42</MicrosoftVSUtilitiesInternalVersion>
<MicrosoftVSSDKBuildToolsVersion>17.4.2116</MicrosoftVSSDKBuildToolsVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion Condition="'$(DotNetBuildFromSource)' == 'true'">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 +96,5 @@
(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>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion playground/AdapterUtilitiesPlayground/AdapterUtilitiesPlayground.csproj
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ....TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
<ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
<ProjectReference Include="..\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
<PackageReference Include="Newtonsoft.Json">
<Version>$(JsonNetVersion)</Version>
<Version>$(NewtonsoftJsonVersion)</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkMinimum)' ">
Expand Down
2 changes: 1 addition & 1 deletion ...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
</PropertyGroup>

<ItemGroup Label="NuGet">
<NuspecProperty Include="JsonNetVersion=$(JsonNetVersion)" />
<NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
<NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec
View file
Open in desktop
Expand Up @@ -5,11 +5,11 @@

<dependencies>
<group targetFramework="net462">
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
</group>
<group targetFramework="netstandard2.0">
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
</group>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" Condition=" '$(DotNetBuildFromSource)' != 'true' " />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
</PropertyGroup>

<ItemGroup Label="NuGet">
<NuspecProperty Include="JsonNetVersion=$(JsonNetVersion)" />
<NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
<NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@

<dependencies>
<group targetFramework="net462">
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
</group>
<group targetFramework="netstandard2.0">
Expand Down
2 changes: 1 addition & 1 deletion src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.csproj
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup Label="NuGet">
<NuspecProperty Include="JsonNetVersion=$(JsonNetVersion)" />
<NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
<NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
<dependencies>
<group targetFramework="netcoreapp3.1">
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Newtonsoft.Json" version="$NewtonsoftJsonVersion$"/>
</group>

<group targetFramework="net462"></group>
Expand Down
2 changes: 1 addition & 1 deletion ...tform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>$(JsonNetVersion)</Version>
<Version>$(NewtonsoftJsonVersion)</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
Expand Down