From 9f6be77ef24696301cf36e147d6a0aa7e5b6e66c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 12 Jan 2021 15:24:26 -0800 Subject: [PATCH 1/3] Rebrand to v5.0.3 - also grab latest 3.1 site extension package --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4db7209fb8..6a1924cedf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 - 2 + 3 @@ -235,7 +235,7 @@ 2.1.1 2.2.0 - 3.1.10-servicing-20520-4 + 3.1.11-servicing-20569-15 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From be0a0fe646f0ae4b4ba27f59984b0c06f82d1e39 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 12 Jan 2021 16:27:46 -0800 Subject: [PATCH 2/3] Update baselines to reflect 5.0.2 release --- eng/Baseline.Designer.props | 424 ++++++++++++++++++------------------ eng/Baseline.xml | 204 ++++++++--------- 2 files changed, 314 insertions(+), 314 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index dc602f30b9..456cfb56ce 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - - + + + @@ -37,108 +37,108 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 @@ -146,110 +146,110 @@ - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - - - + + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 @@ -257,86 +257,86 @@ - 5.0.1 + 5.0.2 - + - + - + - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - + - 5.0.1 + 5.0.2 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 @@ -383,50 +383,50 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - - + + - + - - + + - 5.0.1 + 5.0.2 @@ -442,27 +442,27 @@ - 5.0.1 + 5.0.2 - - + + - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 @@ -474,185 +474,185 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - - + + - - + + - - + + - 5.0.1 + 5.0.2 - - + + - - + + - 5.0.1 + 5.0.2 - + - + - + - + - + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - + - 5.0.1 + 5.0.2 - + - + - 5.0.1 + 5.0.2 - - - - + + + + - 5.0.1 + 5.0.2 @@ -661,65 +661,65 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 @@ -735,42 +735,42 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - - + + + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 @@ -780,73 +780,73 @@ - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 @@ -867,11 +867,11 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 @@ -889,13 +889,13 @@ - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index f294d16181..19cbf790b6 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,108 +1,108 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 83aaf5f2b35b4fdd9a9c2cb0922ec6ba162ab7b7 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 12 Jan 2021 16:34:40 -0800 Subject: [PATCH 3/3] Clean up `darc-int*` feed suppressions a bit --- NuGet.config | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b21c1e0ec..1a73a851d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,15 +19,11 @@ - - - - - - - + + +