From 1f114dff507ed81030bafbb32b1fdec191ae5414 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 5 Dec 2019 12:33:38 -0800 Subject: [PATCH 1/5] Download runtime from suffixed location in dotnetcli blob storage (#17592) --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/Installers/Windows/WindowsHostingBundle/Product.targets | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7740355842..af95629e3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -393,6 +393,10 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 + + https://github.com/dotnet/core-setup + f3f2dd583fffa254015fc21ff0e45784b333256d + https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index acf792337d..8bdf514784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,6 +70,7 @@ 3.4.0-beta4-19569-03 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 3.1.0 3.1.1-servicing.19576.9 2.1.0 diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index dd2b113f35..ea34ff172d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -26,10 +26,10 @@ - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe From 0a6e4d10e825b426ef77c9edf451e7a72f3a677f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 13:32:22 -0800 Subject: [PATCH 2/5] Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191205.6 (#17624) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.1-servicing.19605.6 - Microsoft.AspNetCore.Razor.Language - 3.1.1-servicing.19605.6 - Microsoft.CodeAnalysis.Razor - 3.1.1-servicing.19605.6 - Microsoft.NET.Sdk.Razor - 3.1.1-servicing.19605.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af95629e3b..b6185dc4c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 964edff52e79094ca3f241d315bb4970671a1de3 - + https://github.com/aspnet/AspNetCore-Tooling - 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 + 9cf15bed711983d35362d62972ab87ccc88ba8ca - + https://github.com/aspnet/AspNetCore-Tooling - 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 + 9cf15bed711983d35362d62972ab87ccc88ba8ca - + https://github.com/aspnet/AspNetCore-Tooling - 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 + 9cf15bed711983d35362d62972ab87ccc88ba8ca - + https://github.com/aspnet/AspNetCore-Tooling - 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 + 9cf15bed711983d35362d62972ab87ccc88ba8ca https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index 8bdf514784..cf49c0ecbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,10 +172,10 @@ 3.1.1-servicing.19576.10 3.1.1-servicing.19576.10 - 3.1.1-servicing.19577.2 - 3.1.1-servicing.19577.2 - 3.1.1-servicing.19577.2 - 3.1.1-servicing.19577.2 + 3.1.1-servicing.19605.6 + 3.1.1-servicing.19605.6 + 3.1.1-servicing.19605.6 + 3.1.1-servicing.19605.6 3.1.0-preview4.19575.4 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 + 3.1.1-servicing.19604.6 3.1.0-rtm.19565.4 - 3.1.1-servicing.19576.5 - 3.1.1-preview4.19576.5 + 3.1.1-servicing.19604.6 + 3.1.1-preview4.19604.6 - 3.1.1-servicing.19576.10 - 3.1.1-servicing.19576.10 - 3.1.1-servicing.19576.10 - 3.1.1-servicing.19576.10 - 3.1.1-servicing.19576.10 - 3.1.1-servicing.19576.10 - 3.1.1-servicing.19576.10 + 3.1.1-servicing.19605.1 + 3.1.1-servicing.19605.1 + 3.1.1-servicing.19605.1 + 3.1.1-servicing.19605.1 + 3.1.1-servicing.19605.1 + 3.1.1-servicing.19605.1 + 3.1.1-servicing.19605.1 3.1.1-servicing.19605.6 3.1.1-servicing.19605.6 From c3fa87ed04f183449c2e0c2c63ac1e17858babc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2019 01:06:40 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/aspnet/Blazor build 20191205.1 (#17642) - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview4.19605.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea08c8908a..ac7e4e0033 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/aspnet/Blazor - 964edff52e79094ca3f241d315bb4970671a1de3 + 7868699de745fd30a654c798a99dc541b77b95c0 https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index c2d4fe4814..532e950574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ 3.1.0 - 3.1.0-preview4.19575.4 + 3.1.0-preview4.19605.1 3.1.1-servicing.19604.6 3.1.1-servicing.19604.6 From bc75981efe0acdfa14101f5db05074232fef296a Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 6 Dec 2019 14:01:09 -0800 Subject: [PATCH 5/5] [release/3.1] Use Microsoft.NETCore.App.Internal for runtime version (#17627) --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 17454ad1bf..49caef6338 100644 --- a/global.json +++ b/global.json @@ -6,10 +6,10 @@ "dotnet": "3.1.100-preview1-014400", "runtimes": { "dotnet/x64": [ - "$(MicrosoftNETCoreAppRuntimeVersion)" + "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ - "$(MicrosoftNETCoreAppRuntimeVersion)" + "$(MicrosoftNETCoreAppInternalPackageVersion)" ] }, "Git": "2.22.0",