From ddd7ec0ffd244b64f34832ceaac791d4cd8ec934 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:31:28 +0000 Subject: [PATCH] [release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#35008) [release/8.0.1xx] Update dependencies from dotnet/source-build-externals - Update Newtonsoft.Json from 13.0.1 to 13.0.3 - Updated expected TFM dir name for Newtonsoft.Json 13.0.1's highest TFM is netstandard2.0 13.0.3's highest TFM is net6.0 - Revert test changes - Fix the failures for It_publishes_the_project_correctly test --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../GivenThatWeWantToPublishAProjectWithAllFeatures.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6286cc49ca2..9dabf2c7d0d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -330,9 +330,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 13370d763ada41a7eacae2b19ad1b2e35dd78ae6 + 0603839a51f5e18b89c60a3690aff5e81fa666ca diff --git a/eng/Versions.props b/eng/Versions.props index 877aa39a815f..465845165a5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 2.1.0-preview2-26306-03 2.21.0 2.0.1-servicing-26011-01 - 13.0.1 + 13.0.3 1.2.0-beta.435 7.0.0 4.0.0 diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs index 22c71b8338e3..f0889c2c1ab8 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs @@ -36,7 +36,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string [] // TestLibrary has a hard dependency on Newtonsoft.Json. // TestApp has a PrivateAssets=All dependency on Microsoft.Extensions.DependencyModel, which depends on Newtonsoft.Json. // This verifies that P2P references get walked correctly when doing PrivateAssets exclusion. - VerifyDependency(dependencyContext, "Newtonsoft.Json", targetFramework == "net6.0" ? "lib/netstandard2.0/" : "lib/netstandard1.3/", null); + VerifyDependency(dependencyContext, "Newtonsoft.Json", targetFramework == "net6.0" ? "lib/net6.0/" : "lib/netstandard1.3/", null); // Verify P2P references get created correctly in the .deps.json file. VerifyDependency(dependencyContext, "TestLibrary", "", null,