Skip to content

Commit

Permalink
Merged PR 40481: [internal/release/6.0.4xx] Merge from public
Browse files Browse the repository at this point in the history
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary
  • Loading branch information
vseanreesermsft committed Jun 14, 2024
2 parents e074ed2 + 5c4965d commit 89f5155
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24270.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24270.1"
}
}

0 comments on commit 89f5155

Please sign in to comment.