From 6704a0143f082b65f1a9ad54e7ce2252adc6ba55 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 11:03:58 -0800
Subject: [PATCH 1/6] Update
`$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)`
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index e8ff7e89d5..5909d86b71 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -236,7 +236,7 @@
2.1.1
2.2.0
- 3.1.12-servicing-21070-12
+ 3.1.13-servicing-21117-13
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
From a52244340b43f541d02fb310bedb6ca97b4fd432 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 11:09:13 -0800
Subject: [PATCH 2/6] Update package baselines
---
eng/Baseline.Designer.props | 420 ++++++++++++++++++------------------
eng/Baseline.xml | 200 ++++++++---------
2 files changed, 310 insertions(+), 310 deletions(-)
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 3435aff1b4..29a1cde45a 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,28 +2,28 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
-
-
+
+
+
@@ -37,108 +37,108 @@
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
@@ -146,110 +146,110 @@
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
-
-
-
+
+
+
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
@@ -257,86 +257,86 @@
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
-
+
- 5.0.3
+ 5.0.4
-
-
+
+
@@ -346,8 +346,8 @@
-
-
+
+
@@ -356,8 +356,8 @@
-
-
+
+
@@ -368,14 +368,14 @@
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
@@ -383,50 +383,50 @@
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
@@ -442,27 +442,27 @@
- 5.0.3
+ 5.0.4
-
-
+
+
-
-
+
+
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
@@ -474,185 +474,185 @@
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
-
-
+
+
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
-
-
+
+
-
-
+
+
-
-
+
+
- 5.0.3
+ 5.0.4
-
-
+
+
-
-
+
+
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
-
+
- 5.0.3
+ 5.0.4
-
-
-
-
+
+
+
+
- 5.0.3
+ 5.0.4
@@ -661,65 +661,65 @@
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
@@ -735,42 +735,42 @@
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
-
-
+
+
+
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
@@ -780,73 +780,73 @@
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
-
+
-
+
- 5.0.3
+ 5.0.4
@@ -867,16 +867,16 @@
- 5.0.3
+ 5.0.4
- 5.0.3
+ 5.0.4
-
+
@@ -885,17 +885,17 @@
-
+
- 5.0.3
+ 5.0.4
-
+
- 5.0.3
+ 5.0.4
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index f861709295..dc276a967c 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 0332d9d9293a41f3cf106bef6bfd25efbfbfef88 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 11:13:56 -0800
Subject: [PATCH 3/6] Update SDK and runtime versions
---
global.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/global.json b/global.json
index 5e4856113a..316dfecfae 100644
--- a/global.json
+++ b/global.json
@@ -1,19 +1,19 @@
{
"sdk": {
- "version": "5.0.103"
+ "version": "5.0.104"
},
"tools": {
- "dotnet": "5.0.103",
+ "dotnet": "5.0.104",
"runtimes": {
"dotnet/x64": [
- "2.1.25",
+ "2.1.26",
"$(MicrosoftNETCoreAppInternalPackageVersion)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreAppInternalPackageVersion)"
],
"aspnetcore/x64": [
- "3.1.12"
+ "3.1.13"
]
},
"Git": "2.22.0",
From dfad24463ef2b78ea0a37c50118ebc5025d3d6d9 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:21:05 -0800
Subject: [PATCH 4/6] Re-enable package baseline validation
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 5909d86b71..0e3193d6d8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
5
0
5
- false
+ true
From f190980f6249cf5f6c79d45be190851b7d092862 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:21:41 -0800
Subject: [PATCH 5/6] Update `BaselineGenerator` - handle `netcoreapp5.0` from
`NuspecReader`
---
eng/tools/BaselineGenerator/Program.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs
index e77b35edee..cd8c41d394 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -91,9 +91,11 @@ namespace PackageBaselineGenerator
var baselineVersion = input.Root.Attribute("Version").Value;
// Baseline and .NET Core versions always align in non-preview releases.
+ // But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props.
var parsedVersion = Version.Parse(baselineVersion);
var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
$"{parsedVersion.Major}.{parsedVersion.Minor}";
+ var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
var doc = new XDocument(
new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
@@ -152,11 +154,11 @@ namespace PackageBaselineGenerator
var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
if (string.Equals(
group.TargetFramework.GetShortFolderName(),
- defaultTarget,
+ matchTarget,
StringComparison.OrdinalIgnoreCase))
{
targetCondition =
- $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR {targetCondition})";
+ $"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == '{defaultTarget}')";
}
var itemGroup = new XElement(
From f636f74ac2f2bdf4eb9234531dacd14043e6c04c Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:25:25 -0800
Subject: [PATCH 6/6] Update conditions in Baseline.Designer.props - run fixed
`BaselineGenerator`
---
eng/Baseline.Designer.props | 48 ++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 29a1cde45a..60779e1f16 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -20,7 +20,7 @@
5.0.4
-
+
@@ -79,7 +79,7 @@
5.0.4
-
+
@@ -87,7 +87,7 @@
5.0.4
-
+
@@ -95,7 +95,7 @@
5.0.4
-
+
@@ -110,7 +110,7 @@
5.0.4
-
+
@@ -121,7 +121,7 @@
5.0.4
-
+
@@ -129,7 +129,7 @@
5.0.4
-
+
@@ -140,7 +140,7 @@
5.0.4
-
+
@@ -179,7 +179,7 @@
5.0.4
-
+
@@ -251,7 +251,7 @@
5.0.4
-
+
@@ -370,14 +370,14 @@
5.0.4
-
+
5.0.4
-
+
@@ -385,7 +385,7 @@
5.0.4
-
+
@@ -456,7 +456,7 @@
5.0.4
-
+
@@ -480,14 +480,14 @@
5.0.4
-
+
5.0.4
-
+
@@ -504,7 +504,7 @@
5.0.4
-
+
@@ -513,7 +513,7 @@
5.0.4
-
+
@@ -530,7 +530,7 @@
5.0.4
-
+
@@ -539,7 +539,7 @@
5.0.4
-
+
@@ -642,7 +642,7 @@
5.0.4
-
+
@@ -654,7 +654,7 @@
5.0.4
-
+
@@ -663,14 +663,14 @@
5.0.4
-
+
5.0.4
-
+