Skip to content

Commit 7e62f01

Browse files
committed
Merge remote-tracking branch 'upstream/release/5.0' into internal/release/5.0
2 parents 4d22246 + 7e55d5c commit 7e62f01

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>
106-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21427.7">
106+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21471.4">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
108+
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21427.7">
110+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21471.4">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
112+
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21427.7">
114+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21471.4">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
116+
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21427.7">
118+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21471.4">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
120+
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21427.7">
122+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21471.4">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>2e26f9ebee3ac27803aa5f2df50192a46393d108</Sha>
124+
<Sha>f2ebec887288367b18d3299cce38ae3365215555</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
</PropertyGroup>
4343
<!-- Packages that come from https://github.com/dotnet/arcade -->
4444
<PropertyGroup>
45-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21427.7</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.21427.7</MicrosoftDotNetCodeAnalysisPackageVersion>
47-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21427.7</MicrosoftDotNetGenAPIVersion>
45+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21471.4</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.21471.4</MicrosoftDotNetCodeAnalysisPackageVersion>
47+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21471.4</MicrosoftDotNetGenAPIVersion>
4848
</PropertyGroup>
4949
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
5050
<PropertyGroup>

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "5.0.100",
3+
"dotnet": "5.0.401",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21427.7",
16-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21427.7"
15+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21471.4",
16+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21471.4"
1717
},
1818
"sdk": {
19-
"version": "5.0.100"
19+
"version": "5.0.401"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)