diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 3435aff1b4..60779e1f16 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,306 +37,306 @@
- 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
-
+
- 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
-
+
-
+
- 5.0.3
+ 5.0.4
-
-
+
+
@@ -346,8 +346,8 @@
-
-
+
+
@@ -356,8 +356,8 @@
-
-
+
+
@@ -368,65 +368,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
@@ -442,27 +442,27 @@
- 5.0.3
+ 5.0.4
-
-
+
+
-
-
+
+
- 5.0.3
+ 5.0.4
-
-
-
+
+
+
- 5.0.3
+ 5.0.4
@@ -474,252 +474,252 @@
- 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
-
+
- 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
diff --git a/eng/Versions.props b/eng/Versions.props
index b07ca00db5..caaf679141 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
5
0
5
- false
+ true
@@ -236,7 +236,7 @@
2.1.1
2.2.0
- 3.1.12-servicing-21070-12
+ 3.1.13-servicing-21117-13
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
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(
diff --git a/global.json b/global.json
index 53c488aef3..ef66f581db 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",