From 0468fce801380a2c415075253ac93a10e44077c0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 11:59:05 -0700 Subject: [PATCH 1/4] [release/5.0] Update SDK and runtimes --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index fcfeb734fd..1b6aca209f 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.202" + "version": "5.0.203" }, "tools": { - "dotnet": "5.0.202", + "dotnet": "5.0.203", "runtimes": { "dotnet/x64": [ - "2.1.27", + "2.1.28", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.14" + "3.1.15" ] }, "Git": "2.22.0", From 87006571f3f7e8401d5883079b9aeaf9a0ae66eb Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 12:28:02 -0700 Subject: [PATCH 2/4] [release/5.0] 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 b5513e6d2e..87a2693fee 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - - + + + @@ -37,108 +37,108 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 @@ -146,110 +146,110 @@ - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - - - + + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 @@ -257,86 +257,86 @@ - 5.0.5 + 5.0.6 - + - + - + - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - 5.0.5 + 5.0.6 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 @@ -383,50 +383,50 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 @@ -442,27 +442,27 @@ - 5.0.5 + 5.0.6 - - + + - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 @@ -474,185 +474,185 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - - + + - - + + - - + + - 5.0.5 + 5.0.6 - - + + - - + + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - 5.0.5 + 5.0.6 - + - + - 5.0.5 + 5.0.6 - - - - + + + + - 5.0.5 + 5.0.6 @@ -661,65 +661,65 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 @@ -735,42 +735,42 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - - + + + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 @@ -780,73 +780,73 @@ - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 @@ -867,11 +867,11 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 @@ -889,13 +889,13 @@ - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 6f97d86722..0a3fdf2861 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. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5d73c92894b0054d60ecd714b5ac678d6cb98c29 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 12:32:23 -0700 Subject: [PATCH 3/4] [release/5.0] Update 3.1.x site extension version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 227cc65414..f919af7ec5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 2.1.1 2.2.0 - 3.1.14-servicing-21166-8 + 3.1.15-servicing-21215-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From 2278169982517fd5cb6fa592d1dabe2f0265d63d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 14:56:14 -0700 Subject: [PATCH 4/4] [release/5.0] Re-enable baseline validation --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f919af7ec5..f3abd87b00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 7 - false + true