Merged PR 37583: [internal/release/6.0.1xx] Merge from public

Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
This commit is contained in:
Sean Reeser 2024-02-21 22:15:56 +00:00
commit 28e71a2d7e

View file

@ -211,9 +211,9 @@
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha> <Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22570.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.24121.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>38385bc8b19cebe7ae7d20771646158785ee5bdc</Sha> <Sha>2e6cb1a0008be982effb0c5d9e96a4ff138352d4</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" /> <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">