Skip to content

Commit 85e316c

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/5.0' changes
2 parents 0390944 + 3b960e4 commit 85e316c

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

‎eng/Version.Details.xml

+26-26
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,57 @@
1010
</Dependency>
1111
</ProductDependencies>
1212
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21552.7">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21565.1">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
15+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21552.7">
17+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21565.1">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
19+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21552.7">
21+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.21565.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
23+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21552.7">
25+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.21565.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
27+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21552.7">
29+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.21565.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
31+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21552.7">
33+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.21565.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
35+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21552.7">
37+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21565.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
39+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21552.7">
41+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.21565.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
43+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21552.7">
45+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.21565.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
47+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21552.7">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.21565.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
51+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21552.7">
53+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.21565.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
55+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21552.7">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.21565.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
59+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21552.7">
61+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.21565.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
63+
<Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
6464
</Dependency>
6565
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.21565.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props

+10-10
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
</ItemGroup>
4949
<PropertyGroup>
5050
<!-- Arcade dependencies -->
51-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21552.7</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21552.7</MicrosoftDotNetBuildTasksFeedVersion>
53-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21552.7</MicrosoftDotNetCodeAnalysisVersion>
54-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21552.7</MicrosoftDotNetGenAPIVersion>
55-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21552.7</MicrosoftDotNetGenFacadesVersion>
56-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21552.7</MicrosoftDotNetXUnitExtensionsVersion>
57-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21552.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
58-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21552.7</MicrosoftDotNetBuildTasksPackagingVersion>
59-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21552.7</MicrosoftDotNetRemoteExecutorVersion>
60-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21552.7</MicrosoftDotNetVersionToolsTasksVersion>
51+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.21565.1</MicrosoftDotNetApiCompatVersion>
52+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.21565.1</MicrosoftDotNetBuildTasksFeedVersion>
53+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.21565.1</MicrosoftDotNetCodeAnalysisVersion>
54+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.21565.1</MicrosoftDotNetGenAPIVersion>
55+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.21565.1</MicrosoftDotNetGenFacadesVersion>
56+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.21565.1</MicrosoftDotNetXUnitExtensionsVersion>
57+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21565.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
58+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.21565.1</MicrosoftDotNetBuildTasksPackagingVersion>
59+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.21565.1</MicrosoftDotNetRemoteExecutorVersion>
60+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.21565.1</MicrosoftDotNetVersionToolsTasksVersion>
6161
<!-- Installer dependencies -->
6262
<MicrosoftNETCoreAppVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppVersion>
6363
<MicrosoftNETCoreDotNetHostVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreDotNetHostVersion>

‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21552.7",
16-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21552.7",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.21565.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21565.1",
1717
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.21565.1",
18-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21552.7",
18+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21565.1",
1919
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2020
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
2121
"Microsoft.Build.NoTargets": "2.0.1",

0 commit comments

Comments
 (0)