Skip to content

Commit

Permalink
[release/8.0.1xx] Update dependencies from dotnet/source-build-extern…
Browse files Browse the repository at this point in the history
…als (#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
  • Loading branch information
dotnet-maestro[bot] authored Aug 30, 2023
1 parent 4d8151d commit ddd7ec0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23428.2">
<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>13370d763ada41a7eacae2b19ad1b2e35dd78ae6</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.23428.2">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftApplicationInsightsPackageVersion>2.21.0</MicrosoftApplicationInsightsPackageVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ddd7ec0

Please sign in to comment.