Merge pull request #1701 from dseefeld/2.1.21

[release/2.1] Update to August 2020 2.1.517 release (2.1.21)
dotnet · Aug 12, 2020 · d92a1ac · d92a1ac
2 parents 65f91b6 + 0d5db78
commit d92a1ac
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 58 deletions.
diff --git a/.vsts.pipelines/jobs/ci-linux.yml b/.vsts.pipelines/jobs/ci-linux.yml
@@ -87,7 +87,7 @@ jobs:
       logDir=/logs/source-build/logs
       $(docker.run) $(docker.logs.map) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
         mkdir -p $logDir
-        find \"\$PWD\" \
+        find . \
           -depth \
           \( \
           -path './bin/*-report/*' -o \
@@ -183,7 +183,7 @@ jobs:
       $(docker.run) $(docker.logs.map) $(docker.tb.map) $(docker.tb.work) $(imageName) /bin/bash -c "
         mkdir -p $logDir
         cd \"$(tarballName)\"
-        find \"\$PWD\" \
+        find . \
           -depth \
           \( \
           -path './bin/*-report/*' -o \

diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200617-01/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200730-01/final/index.json
diff --git a/build.sh b/build.sh
@@ -19,6 +19,9 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 export DOTNET_MULTILEVEL_LOOKUP=0
 export NUGET_PACKAGES="$SCRIPT_ROOT/packages/"
 
+# Ensure Azure DevOps' BUILD_BUILDNUMBER isn't used
+export BUILD_BUILDNUMBER=
+
 source "$SCRIPT_ROOT/init-tools.sh"
 
 CLIPATH="$SCRIPT_ROOT/Tools/dotnetcli"

diff --git a/dependencies.props b/dependencies.props
@@ -22,8 +22,8 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.1.20</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.1.20</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.1.21</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.1.21</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 

diff --git a/patches/cli/0002-Remove-feed-that-no-longer-exists.patch b/patches/cli/0002-Remove-feed-that-no-longer-exists.patch
@@ -13,8 +13,8 @@ index 0cae8455a..535665c79 100644
 +++ b/build/NugetConfigFile.targets
 @@ -30,7 +30,6 @@
      <add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
-     <add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
-     <add key="myget-vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
+     <add key="dotnet-msbuild" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
+     <add key="myget-vstest" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
 -    <add key="BlobFeed-2.1.3-runtime" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180725-02/final/index.json"/>
          ]]>
        </NugetConfigCLIFeeds>

diff --git a/patches/cli/0003-Remove-System.Security.Principal.Windows-nupkg-ref.patch b/patches/cli/0003-Remove-System.Security.Principal.Windows-nupkg-ref.patch
diff --git a/patches/clicommandlineparser/0001-Ignore-NU5125-error.patch b/patches/clicommandlineparser/0001-Ignore-NU5125-error.patch
@@ -0,0 +1,23 @@
+From 1d2ac4c1ff9da833c7fed9c5b12463c17efc53bb Mon Sep 17 00:00:00 2001
+From: dseefeld <[email protected]>
+Date: Mon, 3 Aug 2020 19:01:37 -0400
+Subject: [PATCH] Ignore NU5125 error
+
+---
+ Directory.Build.props | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index d219e0b..ca7d388 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -4,5 +4,6 @@
+   <PropertyGroup>
+     <RepositoryUrl>https://github.com/dotnet/CliCommandLineParser</RepositoryUrl>
+     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
++    <NoWarn>$(NoWarn);NU5125</NoWarn>
+   </PropertyGroup>
+ </Project>
+-- 
+1.8.3.1
+
diff --git a/repos/core-setup.proj b/repos/core-setup.proj
@@ -21,7 +21,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
-    <OfficialBuildId>20200619-01</OfficialBuildId>
+    <OfficialBuildId>20200730-01</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

diff --git a/repos/coreclr.proj b/repos/coreclr.proj
@@ -18,7 +18,7 @@
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20200617-01</OfficialBuildId>
+    <OfficialBuildId>20200730-01</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/repos/corefx.proj b/repos/corefx.proj
@@ -24,7 +24,7 @@
 
     <PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20200618-12</OfficialBuildId>
+    <OfficialBuildId>20200730-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/cli b/src/cli
diff --git a/src/core-setup b/src/core-setup
diff --git a/src/coreclr b/src/coreclr
diff --git a/src/corefx b/src/corefx
diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
@@ -217,12 +217,12 @@
     <Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.19" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.19" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.20" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.20" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.20" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.20" Rid="linux-x64" />
     <Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
     <Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
     <Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />

diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
@@ -95,9 +95,9 @@
     <Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
     <Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
     <Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-05113-01" IsDirectDependency="true" />
-    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.20" />
-    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.20" />
-    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.20" />
+    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.21" />
+    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.21" />
+    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.21" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
@@ -122,24 +122,24 @@
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.19" />
+    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.20" />
     <Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.19" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.20" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.20" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" />
+    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.20" />
     <Usage Id="Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -273,12 +273,12 @@
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.19" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.19" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.20" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.20" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.20" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.20" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200617-01/final/index.json
		https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200730-01/final/index.json
+1 −1		TestAssets/TestPackages/dotnet-desktop-and-portable/NuGet.Config
+2 −2		build/DependencyVersions.props
+8 −8		build/NugetConfigFile.targets
+1 −1		build/Version.props
+0 −1		src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+2 −2		test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetConfig.cs
+3 −3		test/dotnet.Tests/ParserTests/RestoreParserTests.cs
+1 −1		BranchInfo.props
+1 −1		BuildToolsVersion.txt
+1 −1		azure-pipelines.yml
+4 −4		buildpipeline/Core-Setup-Windows-Arm-BT.json
+4 −4		buildpipeline/Core-Setup-Windows-BT.json
+4 −4		dependencies.props
+1 −1		init-tools.cmd
+1 −1		ILAsmVersion.txt
+6 −6		buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+6 −6		buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+1 −1		buildpipeline/DotNet-Trusted-Publish.json
+6 −6		dependencies.props
+2 −2		init-tools.cmd
+1 −1		init-tools.sh
+1 −1		src/NuGet.Config
+1 −1		src/corefx/System.Globalization.Native/CMakeLists.txt
+10 −1		src/mscorlib/src/System/Threading/CancellationTokenRegistration.cs
+2 −2		src/scripts/pgocheck.py
+1 −1		tests/dir.props
+2 −3		tests/scripts/perf-prep.sh
+1 −1		tests/setup-stress-dependencies.cmd
+1 −1		tests/setup-stress-dependencies.sh
+1 −1		tests/src/NuGet.Config
+1 −1		tests/src/performance/linkbench/assets/MusicStore/Get-Crossgen.ps1
+2 −2		tests/src/sizeondisk/sodbench/SoDBench.cs
+6 −6		buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
+6 −6		buildpipeline/DotNet-CoreFx-Trusted-Windows.json
+8 −8		dependencies.props
+2 −2		dir.props
+1 −1		init-tools.cmd
+1 −1		init-tools.sh
+1 −1		pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+837 −0		pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+293 −0		pkg/Microsoft.NETCore.Platforms/runtime.json
+2 −2		pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+1 −1		pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1
+1 −1		pkg/test/testPackages.proj
+2 −2		run-test.sh
+2 −2		src/NuGet.config
+3 −0		src/packages.builds
+1 −1		tools-local/ILAsmVersion.txt