From a8c77a90b1cae93becec812606d8ae6594761f78 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Feb 2021 14:56:06 -0800 Subject: [PATCH 1/3] Update to 5.0.3 SDK - also update downlevel runtimes --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index a977635a25..35abd2e76c 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.103" }, "tools": { - "dotnet": "5.0.102", + "dotnet": "5.0.103", "runtimes": { "dotnet/x64": [ - "2.1.24", + "2.1.25", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.11" + "3.1.12" ] }, "Git": "2.22.0", From ea168858653c6c9277bea15800527e0556e43a10 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:06:28 -0800 Subject: [PATCH 2/3] Update package baselines --- eng/Baseline.Designer.props | 416 ++++++++++++++++++------------------ eng/Baseline.xml | 200 ++++++++--------- 2 files changed, 308 insertions(+), 308 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 456cfb56ce..3435aff1b4 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - - + + + @@ -37,108 +37,108 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 @@ -146,110 +146,110 @@ - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - - - + + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 @@ -257,86 +257,86 @@ - 5.0.2 + 5.0.3 - + - + - + - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - 5.0.2 + 5.0.3 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 @@ -383,50 +383,50 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 @@ -442,27 +442,27 @@ - 5.0.2 + 5.0.3 - - + + - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 @@ -474,185 +474,185 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - - + + - - + + - - + + - 5.0.2 + 5.0.3 - - + + - - + + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - 5.0.2 + 5.0.3 - + - + - 5.0.2 + 5.0.3 - - - - + + + + - 5.0.2 + 5.0.3 @@ -661,65 +661,65 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 @@ -735,42 +735,42 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - - + + + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 @@ -780,73 +780,73 @@ - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 @@ -867,11 +867,11 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 @@ -889,13 +889,13 @@ - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 19cbf790b6..f861709295 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 2cd8730864691e78060aa13052750499bce65404 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:21:42 -0800 Subject: [PATCH 3/3] Update branding to 5.0.4 - move to latest Microsoft.AspNetCore.Azure.AppServices.SiteExtension.31 version --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fb3f936243..b104e692f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 - 3 + 4 @@ -235,7 +235,7 @@ 2.1.1 2.2.0 - 3.1.11-servicing-20569-15 + 3.1.12-servicing-21070-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)