Skip to content

Commit

Permalink
Merge in 'release/5.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Sep 22, 2021
2 parents e67f223 + 897e63f commit 1103fc0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Expand Up @@ -51,13 +51,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21427.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21471.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21427.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21471.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 4 additions & 4 deletions global.json
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "5.0.207",
"dotnet": "5.0.401",
"runtimes": {
"dotnet": [
"3.1.19"
Expand All @@ -11,12 +11,12 @@
}
},
"sdk": {
"version": "5.0.207",
"version": "5.0.401",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21427.7",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21427.7"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21471.4",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21471.4"
}
}

0 comments on commit 1103fc0

Please sign in to comment.