diff --git a/NuGet.config b/NuGet.config
index fb08aba6930f..c48dc08f42b3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,8 +4,10 @@
+
+
@@ -19,8 +21,10 @@
+
+
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 3435aff1b4a6..60779e1f16b7 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 f86170929541..dc276a967c75 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/Version.Details.xml b/eng/Version.Details.xml
index 6979e03be8d0..2a163cc3eb06 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,37 +9,37 @@
-->
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
-
- https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- efc2924e6e36db17611c7da480d5bc97a4514cb8
+
+ https://github.com/dotnet/efcore
+ cfd206aa4bc7c878dbbd91959f1c9edada70da93
https://github.com/dotnet/runtime
@@ -199,15 +199,15 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d1e2874de3956c618626ee46554a093f28a330e2
+ c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb
https://github.com/dotnet/runtime
cf258a14b70ad9069470a108f13765e0e5988f51
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d1e2874de3956c618626ee46554a093f28a330e2
+ f27d33729518f5aa478aa818b7b4f54a4d50bef1
https://github.com/dotnet/runtime
@@ -266,9 +266,9 @@
https://github.com/dotnet/runtime
cf258a14b70ad9069470a108f13765e0e5988f51
-
- https://github.com/dotnet/runtime
- cf258a14b70ad9069470a108f13765e0e5988f51
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ f27d33729518f5aa478aa818b7b4f54a4d50bef1
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -294,24 +294,24 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb
+ f27d33729518f5aa478aa818b7b4f54a4d50bef1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb
+ f27d33729518f5aa478aa818b7b4f54a4d50bef1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb
+ f27d33729518f5aa478aa818b7b4f54a4d50bef1
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d1e2874de3956c618626ee46554a093f28a330e2
+ c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb
https://github.com/dotnet/arcade
diff --git a/eng/Versions.props b/eng/Versions.props
index 3ce8b9c1b58f..0e3193d6d843 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
5
0
5
- false
+ true
@@ -59,10 +59,10 @@
5.0.0
- 5.0.3-servicing.21072.12
+ 5.0.4-servicing.21116.14
5.0.0
- 5.0.3
- 5.0.3-servicing.21072.12
+ 5.0.4
+ 5.0.4-servicing.21116.14
5.0.0
5.0.0
5.0.0
@@ -104,7 +104,7 @@
5.0.1
5.0.1
5.0.0
- 5.0.1
+ 5.0.2
5.0.1
5.0.0
5.0.0
@@ -120,21 +120,21 @@
5.0.0
5.0.0
5.0.0
- 5.0.0
+ 5.0.1
5.0.1
5.0.0
5.0.0
5.0.1
- 5.0.3
- 5.0.3
- 5.0.3
- 5.0.3
- 5.0.3
- 5.0.3
- 5.0.3
- 5.0.3
+ 5.0.4
+ 5.0.4
+ 5.0.4
+ 5.0.4
+ 5.0.4
+ 5.0.4
+ 5.0.4
+ 5.0.4
5.0.0-beta.21112.3
@@ -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 e77b35edeeeb..cd8c41d39468 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -91,9 +91,11 @@ private async Task Run()
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 @@ private async Task Run()
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 5e4856113ad7..316dfecfae4e 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",
diff --git a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
index 55d3ad9e6636..31c17ddd10d8 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
@@ -29,4 +29,9 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
index 42c33c219c81..04c8fd3770ce 100644
--- a/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
+++ b/src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
@@ -27,6 +27,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
index 75deedd8cbb7..7956ba1433ed 100644
--- a/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
+++ b/src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
@@ -24,6 +24,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/LargeProject/LargeProject.csproj b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
index 38ee709aec9e..46f4c830f275 100644
--- a/src/Razor/test/testassets/LargeProject/LargeProject.csproj
+++ b/src/Razor/test/testassets/LargeProject/LargeProject.csproj
@@ -31,6 +31,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 6bb3fcca8db2..f5e72f635e57 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -24,6 +24,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
index 2b81a4d5d771..721163731da8 100644
--- a/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
@@ -29,6 +29,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
index f5d0455baf2b..352a8a0e4b94 100644
--- a/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
+++ b/src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
@@ -30,6 +30,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
index 999e94839fe3..9eae58f9bfd0 100644
--- a/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
+++ b/src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
@@ -24,6 +24,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index c4d3fba39973..6356224e8980 100644
--- a/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -29,6 +29,11 @@
+
+
+
+
+
diff --git a/src/Razor/test/testassets/SimplePages/SimplePages.csproj b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
index 999e94839fe3..9eae58f9bfd0 100644
--- a/src/Razor/test/testassets/SimplePages/SimplePages.csproj
+++ b/src/Razor/test/testassets/SimplePages/SimplePages.csproj
@@ -24,6 +24,11 @@
+
+
+
+
+