From bb1e128c34cb9948c81ea84aa891e9f34738f32b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 17 Nov 2020 06:56:05 +0000
Subject: [PATCH] [master] Update dependencies from dotnet/sdk (#9064)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20509.5 to 6.0.0-alpha.1.20560.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- dotnet-watch: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- Update installer target framework to 6.0
- Install 5.0.0 and 3.1.0 runtime
- Merge remote-tracking branch 'upstream/master' into darc-master-4cce5096-36fd-4b94-ba12-5d198a821a27
- Update SDK to one that targets 6.0
- disable test as tool build for now
- Fix aspnet runtime RID
---
eng/Version.Details.xml | 40 +++++++++----------
eng/Versions.props | 18 ++++-----
global.json | 2 +-
.../targets/GenerateBundledVersions.targets | 2 +-
test/SdkTests/SdkTests.csproj | 1 +
5 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2dd793561..24227d8aa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -47,37 +47,37 @@
https://github.com/dotnet/runtime
72b7d236ad634c2280c73499ebfc2b594995ec06
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
-
+
https://github.com/dotnet/efcore
- 2352499b52cdfc95ddcfd81c4967e12512e00eee
+ 5c27c3c6ecad5d898ca37a733f8c2587c074e1a1
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
-
+
https://github.com/dotnet/aspnetcore
- 062237e054487e2e53c186660e459eda69b75e59
+ 9f72904328357d3747cd605b6e44b9d82065b9bb
https://github.com/dotnet/test-templates
@@ -91,13 +91,13 @@
https://github.com/dotnet/templating
b89c3b306bbcdcf650f027736927254dfa053d9e
-
+
https://github.com/dotnet/sdk
- 927964ad361439cfc42255799722d6b97360ac7c
+ 8c0f92a2af63e5d42b78deaeb1784c7a7d23f8b5
-
+
https://github.com/dotnet/sdk
- 927964ad361439cfc42255799722d6b97360ac7c
+ 8c0f92a2af63e5d42b78deaeb1784c7a7d23f8b5
diff --git a/eng/Versions.props b/eng/Versions.props
index b3a108528..2920260fa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -45,21 +45,21 @@
- 6.0.0-alpha.1.20526.6
- 6.0.0-alpha.1.20526.6
- 6.0.0-alpha.1.20526.6
- 6.0.0-alpha.1.20526.6
- 6.0.0-alpha.1.20526.6
- 6.0.0-alpha.1.20526.6
- 6.0.0-alpha.1.20526.6
+ 6.0.0-alpha.1.20561.2
+ 6.0.0-alpha.1.20561.2
+ 6.0.0-alpha.1.20561.2
+ 6.0.0-alpha.1.20561.2
+ 6.0.0-alpha.1.20561.2
+ 6.0.0-alpha.1.20561.2
+ 6.0.0-alpha.1.20561.2
0.2.0
- 6.0.100-alpha.1.20561.16
- 6.0.100-alpha.1.20561.16
+ 6.0.100-alpha.1.20566.1
+ 6.0.100-alpha.1.20566.1
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
diff --git a/global.json b/global.json
index e88ec845d..4afa25496 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.100-alpha.1.20561.19",
+ "dotnet": "6.0.100-alpha.1.20563.2",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 111130a1b..66d132554 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -288,7 +288,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
- RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')"
+ RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
/>