From aa37fa36176bf8b785fceacf0f7f4468f1a18d0e Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 15 May 2020 15:40:12 +0000 Subject: [PATCH 01/57] Update to preview4 shas --- eng/Version.Details.xml | 56 +++++++++---------- ...-DiagnosticAdapter-from-source-build.patch | 26 +++++++++ .../0001-Don-t-build-fullfx.patch | 2 +- ...table-NETCoreAppRuntime-for-crossgen.patch | 22 ++++---- .../aspnetcore/0007-Fix-version-number.patch | 12 ++-- ...-dependency-not-used-in-source-build.patch | 34 +++++------ patches/aspnetcore/0011-Add-FreeBSD.patch | 10 ++-- ...Support-global.json-on-arm64-as-well.patch | 2 +- .../0001-Set-final-5.4-branding-3100.patch | 2 +- 9 files changed, 96 insertions(+), 70 deletions(-) create mode 100644 patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67b14d8a2f..492c730226 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 421b20fb860907c45673de791177e3fd61402197 + bce0a98620c1c5a110b2bba9912f3d5929069c6b https://github.com/dotnet/source-build-reference-packages @@ -22,51 +22,51 @@ c01a538851a8ab1a1fbeb2e6243f391fff7587b4 aspnet-xdt - + https://github.com/mono/linker - a9bfc450a9da6b050ba043ca43b9241beb6f3f60 + 7573e99c7665f565fe4a6ac4784d5c641213d5e1 linker - + https://github.com/dotnet/runtime - d12f79a4d1b908636b96005fe30f547e54cea3ee + 47ec733ba79b196e4e09d0c89bad245155002353 runtime - + https://github.com/dotnet/runtime - d12f79a4d1b908636b96005fe30f547e54cea3ee + 47ec733ba79b196e4e09d0c89bad245155002353 runtime-portable - + https://github.com/dotnet/AspNetCore-Tooling - 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 + 56c0dbb97a3c542fa9865aad33fe442341786a09 aspnetcore-tooling - + https://github.com/dotnet/templating - 247f60e9e34a03ed99e855eb1ea0c20931a968db + bb2aad9a623680ecefd731784c97fcbf9e908730 - + https://github.com/dotnet/roslyn - 6f2112b58316c97c4f1b97e0f282aef4346947fc + 3d85b48dd5e533c7d47e916e2cff417f46bdce10 - + https://github.com/microsoft/msbuild - 13cfe7fc5a97772e4045671c71fa31a3c0856af0 + 80e487bff4b7adced47cab46b3481f1a5f2b3178 - + https://github.com/NuGet/NuGet.Client - 64f2febf7d1de8b0228eca5afed97a96c5a30bba + 1c2681b16a0bb9be9271abe043a1cbf892761ef8 nuget-client - + https://github.com/dotnet/Extensions - a309c864ab86230b6f118843481673cdd89d6258 + aadd7e9a6bf2bdaa48f7b1aae781a03704adc713 aspnet-extensions - + https://github.com/dotnet/sdk - 11d68c998c996a9e033760f4769132cf867de167 + d06773deef64b4045a2f8256a383fd8dbef6050e sdk @@ -84,9 +84,9 @@ https://github.com/dotnet/xliff-tasks a52f3d7fb58470749ee4035fbbcb7e63c78b0459 - + https://github.com/dotnet/AspNetCore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + cdfa43bbe0ecc13757cc6517c9a253de77c3ec56 aspnetcore @@ -94,9 +94,9 @@ 32fddd23b1e53272472f6feb27f5e12a445b7236 cli - + https://github.com/dotnet/fsharp - 1e9d40c8897796e21850bd6dca40e15df69a1c97 + 1bcfb7bc27dc2d482341137150023fc1534506e6 https://github.com/aspnet/websdk @@ -104,7 +104,7 @@ https://github.com/microsoft/vstest - 55e7e45431c9c05656c999b902686e7402664573 + 5fd8bb7eabc542fbda5ed8e436f68ca975de0655 https://github.com/dotnet/toolset @@ -134,4 +134,4 @@ 6e37cdfe96ac8b06a923242120169fafacd720e6 - + \ No newline at end of file diff --git a/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch b/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch new file mode 100644 index 0000000000..32b6b14a4c --- /dev/null +++ b/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch @@ -0,0 +1,26 @@ +From c12a7ef7bcc068523cd4157afd62d8569db96ef5 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 14 May 2020 18:13:54 +0000 +Subject: [PATCH] Exclude DiagnosticAdapter from source build This project is + used for tests only, which aren't built in source-build. Plus, it is being + removed from aspnet-extensions in preview4. + +--- + src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj +index 57dd0b0..4c81d3b 100644 +--- a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj ++++ b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj +@@ -2,6 +2,7 @@ + + + netstandard2.0;netcoreapp2.0 ++ true + + + +-- +1.8.3.1 + diff --git a/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch b/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch index 7e82d4df02..e0119d0810 100644 --- a/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch +++ b/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch @@ -53,7 +53,7 @@ index e5e8d92..b0a7c5e 100644 $(MSBuildThisFileDirectory)..\..\ $(RazorSdkDirectoryRoot)tasks\ -- <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1 +- <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp5.0 - <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46 + <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework) + <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472 diff --git a/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch b/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch index f00ba8cd7b..ced989443c 100644 --- a/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch +++ b/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch @@ -1,7 +1,7 @@ -From 4ffe64a8df883980482e50e73184d613e6438f77 Mon Sep 17 00:00:00 2001 +From c89f4580ca89162ce1dbc91330ce43ea21379083 Mon Sep 17 00:00:00 2001 From: dseefeld -Date: Tue, 29 Oct 2019 18:19:03 +0000 -Subject: [PATCH 02/15] Use non-portable NETCoreAppRuntime for crossgen +Date: Wed, 13 May 2020 19:46:47 +0000 +Subject: [PATCH] Use non-portable NETCoreAppRuntime for crossgen --- eng/Dependencies.props | 1 + @@ -9,10 +9,10 @@ Subject: [PATCH 02/15] Use non-portable NETCoreAppRuntime for crossgen 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Dependencies.props b/eng/Dependencies.props -index 8e7bb0ecd5..fca75d926c 100644 +index ecee11a..b01ead4 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props -@@ -113,6 +113,7 @@ and are generated based on the last package release. +@@ -101,6 +101,7 @@ and are generated based on the last package release. @@ -21,12 +21,12 @@ index 8e7bb0ecd5..fca75d926c 100644 diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -index 4a7b1c9c4f..b63c15c275 100644 +index e7b3fd2..6b8e22f 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -107,7 +107,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - x64_arm64\$(CrossgenToolPackagePath) - x86_arm\$(CrossgenToolPackagePath) +@@ -109,7 +109,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + $(CrossCompileDirectory)\$(CrossgenToolPackagePath) - $([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', '$(MicrosoftNETCoreAppRuntimeVersion)')) + $(RuntimeIdentifier) @@ -35,7 +35,7 @@ index 4a7b1c9c4f..b63c15c275 100644 $([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)')) $([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)')) $(AssetTargetFallback);native,Version=0.0 -@@ -122,7 +124,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant +@@ -124,7 +126,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Runtime;Native @@ -45,5 +45,5 @@ index 4a7b1c9c4f..b63c15c275 100644 Platform=$(TargetArchitecture) -- -2.21.0 +1.8.3.1 diff --git a/patches/aspnetcore/0007-Fix-version-number.patch b/patches/aspnetcore/0007-Fix-version-number.patch index 103b99a5c4..b6cb3993ee 100644 --- a/patches/aspnetcore/0007-Fix-version-number.patch +++ b/patches/aspnetcore/0007-Fix-version-number.patch @@ -4,17 +4,17 @@ Date: Thu, 14 Nov 2019 17:27:30 +0000 Subject: [PATCH 07/15] Fix version number --- - .../Web.JS/dist/Release/blazor.server.js | Bin 214579 -> 214576 bytes + .../Web.JS/dist/Release/blazor.server.js | Bin 219749 -> 219764 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js -index 30d3ae39491b6f3d13a946fce4931aa230d09955..e336b70bfde097c4dd930d792c16faef5ca453e1 100644 +index e04bab52cc11b7112c8083fee0525fc1a3dd9e1f..46abfb1be1c30e4483d2b086b010c070d301dfcb 100644 GIT binary patch -delta 23 -ecmdno!@Hq}x1oixg=q`3rW?DFQf;iJH5UM4R|e_; +delta 39 +ucmaF5h4;%A-i8*&7N#xCu~Fg$MX6<(spWb`dPW9@X6AavO0}_?)?5HBdJM+^ -delta 26 -hcmdnc!@IeMx1oixg=q`3rW==`Zc1vIQf;iJH2{0J2u=V1 +delta 24 +fcmeyeh4<+e-i8*&7N#xCu~8f;sbxyFv6|KZfw~C% -- 2.21.0 diff --git a/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch b/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch index 6ae0afc294..74199c0bfb 100644 --- a/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch +++ b/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch @@ -1,18 +1,18 @@ -From 3829e75aaf2dba35176514e113354bead3b2aae1 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Thu, 14 Nov 2019 17:34:41 +0000 -Subject: [PATCH 08/15] Remove Yarn dependency - not used in source-build +From bd3d05d942daaf3559d77fb6afde5a96b2c6135f Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 14 May 2020 16:29:28 +0000 +Subject: [PATCH] Remove Yarn dependency - not used in source-build --- - eng/targets/Npm.Common.targets | 3 --- - global.json | 1 - - .../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj | 3 --- - .../SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj | 3 --- - src/Shared/E2ETesting/E2ETesting.targets | 3 --- + eng/targets/Npm.Common.targets | 3 --- + global.json | 1 - + .../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj | 3 --- + src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj | 3 --- + src/Shared/E2ETesting/E2ETesting.targets | 3 --- 5 files changed, 13 deletions(-) diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets -index 062a9d3a8f..3f91b02d42 100644 +index 3460edd..cc80c02 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -1,8 +1,5 @@ @@ -25,7 +25,7 @@ index 062a9d3a8f..3f91b02d42 100644 $(PackageId.Replace('@','').Replace('/','-')) $(NormalizedPackageId)-$(PackageVersion).tgz diff --git a/global.json b/global.json -index 3070303dd9..0f03d68bd8 100644 +index 15a1a65..e858f5d 100644 --- a/global.json +++ b/global.json @@ -24,7 +24,6 @@ @@ -33,11 +33,11 @@ index 3070303dd9..0f03d68bd8 100644 }, "msbuild-sdks": { - "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19607.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1" } diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj -index e67862ea45..29c3b8c137 100644 +index ccc02ac..aa02134 100644 --- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj @@ -16,9 +16,6 @@ @@ -51,7 +51,7 @@ index e67862ea45..29c3b8c137 100644 diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj -index 3db479b01e..ad0149356f 100644 +index 3d7be41..ccf7054 100644 --- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj @@ -20,9 +20,6 @@ @@ -65,7 +65,7 @@ index 3db479b01e..ad0149356f 100644 diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets -index 500d910a30..2ccf1a431c 100644 +index f3e7327..ad906e8 100644 --- a/src/Shared/E2ETesting/E2ETesting.targets +++ b/src/Shared/E2ETesting/E2ETesting.targets @@ -1,7 +1,4 @@ @@ -77,5 +77,5 @@ index 500d910a30..2ccf1a431c 100644 -- -2.21.0 +1.8.3.1 diff --git a/patches/aspnetcore/0011-Add-FreeBSD.patch b/patches/aspnetcore/0011-Add-FreeBSD.patch index 48ab21bdba..78aefa58ee 100644 --- a/patches/aspnetcore/0011-Add-FreeBSD.patch +++ b/patches/aspnetcore/0011-Add-FreeBSD.patch @@ -8,20 +8,20 @@ Subject: [PATCH 11/15] Add FreeBSD 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props -index 38e2f770c5..9ab5379da7 100644 +index be7a5a3..5ab07ca 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -111,6 +111,7 @@ +@@ -115,6 +115,7 @@ win osx + freebsd linux + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) x64 - $(TargetOsName)-$(TargetArchitecture) -@@ -121,6 +122,7 @@ - win-x86; +@@ -127,6 +128,7 @@ win-arm; + win-arm64; osx-x64; + freebsd-x64; linux-musl-x64; diff --git a/patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch b/patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch index 5efa3ce13e..10d6bf0ff9 100644 --- a/patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch +++ b/patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch @@ -24,7 +24,7 @@ index 0f03d68bd8..31c0835b5d 100644 +++ b/global.json @@ -5,10 +5,7 @@ "tools": { - "dotnet": "3.1.100", + "dotnet": "5.0.100-preview.2.20120.3", "runtimes": { - "dotnet/x64": [ - "$(MicrosoftNETCoreAppInternalPackageVersion)" diff --git a/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch b/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch index d24d67f7ab..96e1f9fd4a 100644 --- a/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch +++ b/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch @@ -13,7 +13,7 @@ index 5bcc5c6..a5ec763 100644 +++ b/build/config.props @@ -26,7 +26,7 @@ changes we might have made. --> - 0 + 2 - false + true From 8191aab870580a049e09597ac58dd89026392ec8 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 15 May 2020 17:52:16 +0000 Subject: [PATCH 02/57] Reconcile patches with version updates --- eng/Version.Details.xml | 20 +- .../0001-Try-without-fullfx-build.patch | 25 - ...-MS.Internal.Ext.Refs-for-AspNetCore.patch | 39 -- ...-DiagnosticAdapter-from-source-build.patch | 26 - .../0002-dont-call-dotnet-without-path.patch | 29 - ...SBuild-version-to-reference-versions.patch | 18 +- .../0001-Don-t-call-dotnet-without-path.patch | 29 - ...04-Exclude-analyzer-for-source-build.patch | 35 +- .../aspnetcore/0007-Fix-version-number.patch | 20 +- ...-dependency-not-used-in-source-build.patch | 4 +- .../0009-TargetFramework-changes.patch | 232 ------- ...port-building-for-arm64-on-arm64-nix.patch | 88 --- .../0014-Only-build-for-netcoreapp.patch | 657 ------------------ ...lude-test-projects-from-source-build.patch | 63 +- ...-t-add-sources-when-building-offline.patch | 16 +- ...ions-of-MSBuild-reference-assemblies.patch | 18 +- .../0001-Set-final-5.4-branding-3100.patch | 2 +- ...uild-NET-Fx-binaries-in-source-build.patch | 16 +- .../0008-Remove-unneeded-feeds.patch | 4 +- ...y-override-PackageVersion-properties.patch | 6 +- ...02-Exclude-optdata-from-source-build.patch | 4 +- ...3-Enable-source-link-in-source-build.patch | 37 - .../0004-do-not-fail-on-test-chmod.patch | 14 +- ...ckage-build-to-pass-in-Configuration.patch | 8 +- ...de-harvestPackages-from-source-build.patch | 31 - .../0001-Don-t-call-dotnet-with-no-path.patch | 29 - 26 files changed, 135 insertions(+), 1335 deletions(-) delete mode 100644 patches/aspnet-extensions/0001-Try-without-fullfx-build.patch delete mode 100644 patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch delete mode 100644 patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch delete mode 100644 patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch delete mode 100644 patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch delete mode 100644 patches/aspnetcore/0009-TargetFramework-changes.patch delete mode 100644 patches/aspnetcore/0013-Support-building-for-arm64-on-arm64-nix.patch delete mode 100644 patches/aspnetcore/0014-Only-build-for-netcoreapp.patch delete mode 100644 patches/runtime/0003-Enable-source-link-in-source-build.patch delete mode 100644 patches/runtime/0010-Exclude-harvestPackages-from-source-build.patch delete mode 100644 patches/templating/0001-Don-t-call-dotnet-with-no-path.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 492c730226..adc2948557 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,27 +22,27 @@ c01a538851a8ab1a1fbeb2e6243f391fff7587b4 aspnet-xdt - + https://github.com/mono/linker 7573e99c7665f565fe4a6ac4784d5c641213d5e1 linker - + https://github.com/dotnet/runtime 47ec733ba79b196e4e09d0c89bad245155002353 runtime - + https://github.com/dotnet/runtime 47ec733ba79b196e4e09d0c89bad245155002353 runtime-portable - + https://github.com/dotnet/AspNetCore-Tooling 56c0dbb97a3c542fa9865aad33fe442341786a09 aspnetcore-tooling - + https://github.com/dotnet/templating bb2aad9a623680ecefd731784c97fcbf9e908730 @@ -54,17 +54,17 @@ https://github.com/microsoft/msbuild 80e487bff4b7adced47cab46b3481f1a5f2b3178 - + https://github.com/NuGet/NuGet.Client 1c2681b16a0bb9be9271abe043a1cbf892761ef8 nuget-client - + https://github.com/dotnet/Extensions aadd7e9a6bf2bdaa48f7b1aae781a03704adc713 aspnet-extensions - + https://github.com/dotnet/sdk d06773deef64b4045a2f8256a383fd8dbef6050e sdk @@ -84,7 +84,7 @@ https://github.com/dotnet/xliff-tasks a52f3d7fb58470749ee4035fbbcb7e63c78b0459 - + https://github.com/dotnet/AspNetCore cdfa43bbe0ecc13757cc6517c9a253de77c3ec56 aspnetcore @@ -134,4 +134,4 @@ 6e37cdfe96ac8b06a923242120169fafacd720e6 - \ No newline at end of file + diff --git a/patches/aspnet-extensions/0001-Try-without-fullfx-build.patch b/patches/aspnet-extensions/0001-Try-without-fullfx-build.patch deleted file mode 100644 index c792682271..0000000000 --- a/patches/aspnet-extensions/0001-Try-without-fullfx-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1858749e71834454779414e41d2298e68a9f2314 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 23 Jan 2020 14:38:19 +0000 -Subject: [PATCH] Try without fullfx build - ---- - .../DI/src/Microsoft.Extensions.DependencyInjection.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj b/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj -index eb488c625..f57632234 100644 ---- a/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj -+++ b/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj -@@ -2,7 +2,7 @@ - - - Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection. -- $(DefaultNetCoreTargetFramework);net461;netstandard2.0;netstandard2.1 -+ $(DefaultNetCoreTargetFramework);netstandard2.0;netstandard2.1 - true - dependencyinjection;di - true --- -2.21.1 - diff --git a/patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch b/patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch deleted file mode 100644 index c40944ffe6..0000000000 --- a/patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 407d8826574ef6342e4f314e980a8ada7090ffee Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Fri, 7 Feb 2020 20:55:51 +0000 -Subject: [PATCH] Build-MS.Internal.Ext.Refs-for-AspNetCore - ---- - .../ref/Microsoft.Internal.Extensions.Refs.csproj | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj -index c89ec063a..952d69edc 100644 ---- a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj -+++ b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj -@@ -4,11 +4,11 @@ - $(DefaultNetCoreTargetFramework) - - -- false -+ true - true - false - -- true -+ false - true - - -@@ -49,7 +49,7 @@ - - - -- -+ - - - --- -2.21.1 - diff --git a/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch b/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch deleted file mode 100644 index 32b6b14a4c..0000000000 --- a/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c12a7ef7bcc068523cd4157afd62d8569db96ef5 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 14 May 2020 18:13:54 +0000 -Subject: [PATCH] Exclude DiagnosticAdapter from source build This project is - used for tests only, which aren't built in source-build. Plus, it is being - removed from aspnet-extensions in preview4. - ---- - src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -index 57dd0b0..4c81d3b 100644 ---- a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -+++ b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.0;netcoreapp2.0 -+ true - - - --- -1.8.3.1 - diff --git a/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch b/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch deleted file mode 100644 index 1c4dd8273c..0000000000 --- a/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0c8defec29ee1144a70f20870b3e46c31509cc13 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Wed, 30 Oct 2019 19:41:56 +0000 -Subject: [PATCH 2/4] dont call dotnet without path - ---- - eng/common/tools.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 94965a8..8e14f8b 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -362,9 +362,9 @@ function MSBuild { - - # Work around issues with Azure Artifacts credential provider - # https://github.com/dotnet/arcade/issues/3932 -- if [[ "$ci" == true ]]; then -- dotnet nuget locals http-cache -c -- fi -+# if [[ "$ci" == true ]]; then -+# dotnet nuget locals http-cache -c -+# fi - - local toolset_dir="${_InitializeToolset%/*}" - local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" --- -2.7.4 - diff --git a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch index a3780d8ea3..a4c1462638 100644 --- a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch +++ b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch @@ -1,7 +1,7 @@ -From 7aaf76c72b2b5bb9781eca190ae59920e8def8b8 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Wed, 13 Nov 2019 16:35:48 +0000 -Subject: [PATCH 4/4] Pin MSBuild version to reference versions +From 266ab46a74e95417479013537d09594043772105 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 16:32:21 +0000 +Subject: [PATCH] Pin MSBuild version to reference versions --- src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 4 ++-- @@ -24,7 +24,7 @@ index 4f8ecce..5a433ed 100644 diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj -index 128866b..5abcc32 100644 +index 3ea0d8e..74fc451 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj @@ -18,8 +18,8 @@ @@ -35,9 +35,9 @@ index 128866b..5abcc32 100644 - + + - - - + + + -- -2.7.4 +1.8.3.1 diff --git a/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch b/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch deleted file mode 100644 index 792a67b0a2..0000000000 --- a/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bb464a57817f07a3dbf9e3b888f3e22abdd15a15 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 23 Oct 2019 20:04:55 -0500 -Subject: [PATCH 01/15] Don't call dotnet without path - ---- - eng/common/tools.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 6221830226..d3635b8c65 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -370,9 +370,9 @@ function MSBuild { - - # Work around issues with Azure Artifacts credential provider - # https://github.com/dotnet/arcade/issues/3932 -- if [[ "$ci" == true ]]; then -- dotnet nuget locals http-cache -c -- fi -+# if [[ "$ci" == true ]]; then -+# dotnet nuget locals http-cache -c -+# fi - - local toolset_dir="${_InitializeToolset%/*}" - local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" --- -2.21.0 - diff --git a/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch b/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch index 08e7590cd7..1af88ce1dd 100644 --- a/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch +++ b/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch @@ -1,25 +1,26 @@ -From 4689d480f34f9a7fd6a6da0f05d3de574a855a14 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Thu, 14 Nov 2019 16:52:25 +0000 -Subject: [PATCH 04/15] Exclude analyzer for source-build +From 865c08ee0df93337ce36f4b9467748b3a6a5286b Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 16:38:48 +0000 +Subject: [PATCH] Exclude analyzer for source-build --- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Directory.Build.props | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 27c4622d2b..563894e4e5 100644 +index 6e658ac..851d142 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -101,7 +101,7 @@ - $(RuntimeInstallerBaseName)-internal - - -- -+ - - - +@@ -111,7 +111,8 @@ + AND '$(IsBenchmarkProject)' != 'true' + AND '$(IsTestAssetProject)' != 'true' + AND '$(MSBuildProjectName)' != 'Internal.AspNetCore.Analyzers' +- AND '$(MSBuildProjectExtension)' == '.csproj'"> ++ AND '$(MSBuildProjectExtension)' == '.csproj' ++ AND '$(DotNetBuildFromSource)' != 'true'"> + -Date: Thu, 14 Nov 2019 17:27:30 +0000 -Subject: [PATCH 07/15] Fix version number +From c5921623cc382a61833b67c8423e35a334ca4719 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 16:42:32 +0000 +Subject: [PATCH] Fix version number --- - .../Web.JS/dist/Release/blazor.server.js | Bin 219749 -> 219764 bytes + .../Web.JS/dist/Release/blazor.server.js | Bin 219758 -> 219774 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js -index e04bab52cc11b7112c8083fee0525fc1a3dd9e1f..46abfb1be1c30e4483d2b086b010c070d301dfcb 100644 +index f1f41f61cfe14079e54648698b103aa32e6ff3a3..9dd91d3aa0873f391768c81feb9134debabc98e9 100644 GIT binary patch -delta 39 -ucmaF5h4;%A-i8*&7N#xCu~Fg$MX6<(spWb`dPW9@X6AavO0}_?)?5HBdJM+^ +delta 40 +vcmaF2h4QDn$}zZJ{}De delta 24 -fcmeyeh4<+e-i8*&7N#xCu~8f;sbxyFv6|KZfw~C% +fcmeyjh4 -Date: Thu, 14 Nov 2019 21:04:08 +0000 -Subject: [PATCH 09/15] TargetFramework changes - ---- - .../ref/Microsoft.AspNetCore.Components.Authorization.csproj | 4 ++-- - .../Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj | 4 ++-- - .../Web/ref/Microsoft.AspNetCore.Components.Web.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.DataProtection.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.Http.Features.csproj | 4 ++-- - .../ref/Microsoft.Extensions.Identity.Core.csproj | 4 ++-- - .../ref/Microsoft.Extensions.Identity.Stores.csproj | 4 ++-- - .../Core/ref/Microsoft.AspNetCore.Authorization.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.Connections.Abstractions.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.Http.Connections.Common.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj | 4 ++-- - .../ref/Microsoft.AspNetCore.SignalR.Common.csproj | 4 ++-- - 13 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj -index 3a91e8a4b8..5e6c8fb34c 100644 ---- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj -+++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj -index 2ef391ee71..8f199d6035 100644 ---- a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj -+++ b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj -index 18b1e18b02..13a6a503eb 100644 ---- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj -+++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj -index 06e7d533c7..91b47483f9 100644 ---- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj -+++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj -index 49dd84084b..42e3a30cc5 100644 ---- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj -+++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj -index f2b88f0ca1..d312e44940 100644 ---- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj -+++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj -index 1fc6eeebc2..9bd6ba236a 100644 ---- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj -+++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj -index 81e68a47ce..f277fc6634 100644 ---- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj -+++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj -index b0cf327ff4..6c84d4e54d 100644 ---- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj -+++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj -index c6a77eb8ef..9eccf06da0 100644 ---- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj -+++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj -index 8ae1a927db..ca3ba9ad87 100644 ---- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj -+++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj -index 19480b336f..2d45dbe1f3 100644 ---- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj -+++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - -diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj -index ce6ebe8ce1..91d7996a3c 100644 ---- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj -+++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj -@@ -1,9 +1,9 @@ - - - -- netstandard2.0;$(DefaultNetCoreTargetFramework) -+ netstandard2.1;netcoreapp3.1 - -- -+ - - - --- -2.21.0 - diff --git a/patches/aspnetcore/0013-Support-building-for-arm64-on-arm64-nix.patch b/patches/aspnetcore/0013-Support-building-for-arm64-on-arm64-nix.patch deleted file mode 100644 index 8721e548ae..0000000000 --- a/patches/aspnetcore/0013-Support-building-for-arm64-on-arm64-nix.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 8ccaaf1a5d607c601790f033c49f126d5c69d79b Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Mon, 11 Nov 2019 13:37:40 -0500 -Subject: [PATCH 13/15] Support building for arm64 on arm64 (*nix) - -This commit allows ASP.NET Core to be built on arm64 machines directly, -without relying on cross-compilation. - -There's a few changes in here: - -1. Ask msbuild to look into the BuildArchitecture - - By default, our build systems assums the machine is x64. This - modifies the build configuration to check the architecture of the - currently running build machine, and set BuildArchitecture to that. - -2. Fix crossgen in Microsoft.AspNetCore.App.Runtime - - We run crossgen for supported architectures (including x64 and - arm64). For that, we need a jit that we can point crossgen to. - Generally, we can rely on the build scripts to find the right - `libclrjit.so`. However, arm64 has multiple `libclirjit.so`, for - different use-cases. There's one for arm64 (for running on arm64) and - there's another one for cross-compiling for arm64 on x64. We need to - figure out and use the right one explicitly rather than assuming the - right one gets picked up. - - See https://github.com/dotnet/core-setup/pull/8468 for similar - changes made in core-setup. - -This also needs https://github.com/aspnet/AspNetCore/pull/14790 to fully -work on arm64. ---- - Directory.Build.props | 1 + - .../src/Microsoft.AspNetCore.App.Runtime.csproj | 12 ++++++++---- - 2 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 9ab5379da7..440558e8c6 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -113,6 +113,7 @@ - osx - freebsd - linux -+ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - x64 - $(TargetOsName)-$(TargetArchitecture) - -diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -index b63c15c275..39f78a11b0 100644 ---- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -97,15 +97,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant - : - %3B - -+ x64_arm -+ x64_arm64 -+ x86_arm -+ - - crossgen - $(CrossgenToolFileName).exe - - $(CrossgenToolFileName) - -- x64_arm\$(CrossgenToolPackagePath) -- x64_arm64\$(CrossgenToolPackagePath) -- x86_arm\$(CrossgenToolPackagePath) -+ $(CrossCompileDirectory)\$(CrossgenToolPackagePath) - - $(RuntimeIdentifier) - $(SourceBuildRuntimeIdentifier) -@@ -303,7 +305,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - $(IntermediateOutputPath)crossgen\ - $(IntermediateOutputPath)platformAssemblies\ -- $(CrossgenToolDir)$(LibPrefix)clrjit$(LibExtension) -+ -+ $(RuntimePackageRoot)runtimes\$(RuntimeIdentifier)\native\$(LibPrefix)clrjit$(LibExtension) -+ $(RuntimepackageRoot)runtimes\$(CrossCompileDirectory)\native\$(LibPrefix)clrjit$(LibExtension) - - - --- -2.21.0 - diff --git a/patches/aspnetcore/0014-Only-build-for-netcoreapp.patch b/patches/aspnetcore/0014-Only-build-for-netcoreapp.patch deleted file mode 100644 index fdf51daff5..0000000000 --- a/patches/aspnetcore/0014-Only-build-for-netcoreapp.patch +++ /dev/null @@ -1,657 +0,0 @@ -From 544b43b4d2784109b0185847426c595be8dc597f Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 23 Jan 2020 20:32:29 +0000 -Subject: [PATCH 14/15] Only build for netcoreapp - ---- - ...AspNetCore.Components.Authorization.csproj | 1 + - ...Microsoft.AspNetCore.Components.Web.csproj | 1 + - ...Microsoft.AspNetCore.DataProtection.csproj | 1 + - ...spNetCore.DataProtection.Extensions.csproj | 1 + - .../Microsoft.AspNetCore.Http.Features.csproj | 1 + - .../Microsoft.Extensions.Identity.Core.csproj | 1 + - ...icrosoft.Extensions.Identity.Stores.csproj | 1 + - .../TagHelpersWebSite/Views/Home/Index.cshtml | 102 +++++++++--------- - .../BlazorServerWeb-CSharp/Pages/Error.razor | 30 +++--- - .../appsettings.Development.json | 20 ++-- - .../appsettings.Development.json | 6 +- - .../appsettings.Development.json | 6 +- - .../content/EmptyWeb-FSharp/appsettings.json | 4 +- - .../GrpcService-CSharp/appsettings.json | 4 +- - .../appsettings.Development.json | 6 +- - .../appsettings.Development.json | 6 +- - .../appsettings.Development.json | 6 +- - .../StarterWeb-FSharp/appsettings.json | 4 +- - .../appsettings.Development.json | 6 +- - .../appsettings.Development.json | 6 +- - .../content/WebApi-FSharp/appsettings.json | 4 +- - .../appsettings.Development.json | 6 +- - .../appsettings.Development.json | 6 +- - .../content/Angular-CSharp/appsettings.json | 6 +- - .../React-CSharp/appsettings.Development.json | 6 +- - .../content/React-CSharp/appsettings.json | 6 +- - .../appsettings.Development.json | 6 +- - .../ReactRedux-CSharp/appsettings.json | 6 +- - .../Microsoft.AspNetCore.Authorization.csproj | 1 + - ...AspNetCore.Connections.Abstractions.csproj | 1 + - ....AspNetCore.Http.Connections.Common.csproj | 1 + - ...t.AspNetCore.SignalR.Protocols.Json.csproj | 1 + - ...Microsoft.AspNetCore.SignalR.Common.csproj | 1 + - 33 files changed, 138 insertions(+), 126 deletions(-) - -diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj -index 5e6c8fb34c..5cf3f1eedb 100644 ---- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj -+++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj -index 13a6a503eb..54cd401221 100644 ---- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj -+++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj -index 91b47483f9..6af17d7d46 100644 ---- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj -+++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj -index 42e3a30cc5..93f4956cdf 100644 ---- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj -+++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj -index d312e44940..14cf5afa7e 100644 ---- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj -+++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj -index 9bd6ba236a..06690fb58c 100644 ---- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj -+++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj -index f277fc6634..164354cb85 100644 ---- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj -+++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml -index 77699bd939..0a26a53b06 100644 ---- a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml -+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml -@@ -1,52 +1,52 @@ --@using TagHelpersWebSite.Models --@using Microsoft.AspNetCore.Mvc.Razor -- --@model WebsiteContext --@{ -- ViewBag.Title = "Home Page"; --} -- --@addTagHelper *, TagHelpersWebSite -- --@section css { -- --} -- --@functions { -- public void RenderTemplate(string title, Func template) -- { -- Output.WriteLine("

Rendering Template:

"); -- var helperResult = template(title); -- helperResult.WriteTo(Output, HtmlEncoder); -- } --} -- --
--

This website has not been approved yet. Visit www.contoso.com for more information.

--
-- --
--

Current Tag Cloud from Tag Helper

-- --

Current Tag Cloud from ViewComponentHelper:

--
@await Component.InvokeAsync("Tags", new { count = 15 })
-- @{ -- RenderTemplate( -- "Tag Cloud from Template: ", -- @

@item

); -- } --
-- --
--

Dictionary Valued Model Expression

--
--
-- --@section footerContent { --

© @Model.CopyrightYear - My ASP.NET Application

-+@using TagHelpersWebSite.Models -+@using Microsoft.AspNetCore.Mvc.Razor -+ -+@model WebsiteContext -+@{ -+ ViewBag.Title = "Home Page"; -+} -+ -+@addTagHelper *, TagHelpersWebSite -+ -+@section css { -+ -+} -+ -+@functions { -+ public void RenderTemplate(string title, Func template) -+ { -+ Output.WriteLine("

Rendering Template:

"); -+ var helperResult = template(title); -+ helperResult.WriteTo(Output, HtmlEncoder); -+ } -+} -+ -+
-+

This website has not been approved yet. Visit www.contoso.com for more information.

-+
-+ -+
-+

Current Tag Cloud from Tag Helper

-+ -+

Current Tag Cloud from ViewComponentHelper:

-+
@await Component.InvokeAsync("Tags", new { count = 15 })
-+ @{ -+ RenderTemplate( -+ "Tag Cloud from Template: ", -+ @

@item

); -+ } -+
-+ -+
-+

Dictionary Valued Model Expression

-+
-+
-+ -+@section footerContent { -+

© @Model.CopyrightYear - My ASP.NET Application

- } -\ No newline at end of file -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor -index cd87ea9518..79929d7832 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.razor -@@ -1,16 +1,16 @@ --@page "/error" -- -- --

Error.

--

An error occurred while processing your request.

-- --

Development Mode

--

-- Swapping to Development environment will display more detailed information about the error that occurred. --

--

-- The Development environment shouldn't be enabled for deployed applications. -- It can result in displaying sensitive information from exceptions to end users. -- For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development -- and restarting the app. -+@page "/error" -+ -+ -+

Error.

-+

An error occurred while processing your request.

-+ -+

Development Mode

-+

-+ Swapping to Development environment will display more detailed information about the error that occurred. -+

-+

-+ The Development environment shouldn't be enabled for deployed applications. -+ It can result in displaying sensitive information from exceptions to end users. -+ For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development -+ and restarting the app. -

-\ No newline at end of file -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/appsettings.Development.json -index 2defd04095..51737579ef 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/appsettings.Development.json -@@ -1,10 +1,10 @@ --{ -- "DetailedErrors": true, -- "Logging": { -- "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -- } -- } --} -+{ -+ "DetailedErrors": true, -+ "Logging": { -+ "LogLevel": { -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" -+ } -+ } -+} -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json -index 238d518d39..d9d9a9bff6 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json -@@ -1,8 +1,8 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -+ "Default": "Information", -+ "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/appsettings.json -index f5ef230f62..1f292413bb 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/appsettings.json -@@ -1,8 +1,8 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -+ "Default": "Information", -+ "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json -index 238d518d39..d9d9a9bff6 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json -@@ -1,8 +1,8 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -+ "Default": "Information", -+ "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json -index 238d518d39..d9d9a9bff6 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json -@@ -1,8 +1,8 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -+ "Default": "Information", -+ "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, -diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.Development.json -index c9719186fb..a1213fe246 100644 ---- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - ////#if (IndividualLocalAuth) - // }, -diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json -index 8861bc9d6c..7bed5bd8f8 100644 ---- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json -@@ -10,9 +10,9 @@ - ////#endif - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - }, - ////#if (IndividualLocalAuth) -diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.Development.json -index c9719186fb..a1213fe246 100644 ---- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - ////#if (IndividualLocalAuth) - // }, -diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json -index 8861bc9d6c..7bed5bd8f8 100644 ---- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json -@@ -10,9 +10,9 @@ - ////#endif - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - }, - ////#if (IndividualLocalAuth) -diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.Development.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.Development.json -index dba68eb124..8983e0fc1c 100644 ---- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.Development.json -+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.Development.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - } - } -diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.json -index d48929ec8c..d9d9a9bff6 100644 ---- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.json -+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/appsettings.json -@@ -1,9 +1,9 @@ - { - "Logging": { - "LogLevel": { -- "Default": "Information", -- "Microsoft": "Warning", -- "Microsoft.Hosting.Lifetime": "Information" -+ "Default": "Information", -+ "Microsoft": "Warning", -+ "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj -index 6c84d4e54d..7f1202a788 100644 ---- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj -+++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj -index 9eccf06da0..100a08a744 100644 ---- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj -+++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj -index ca3ba9ad87..d7519cc026 100644 ---- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj -+++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj -index 2d45dbe1f3..fc2a517d4b 100644 ---- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj -+++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - -diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj -index 91d7996a3c..21dad45218 100644 ---- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj -+++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.1;netcoreapp3.1 -+ $(DefaultNetCoreTargetFramework) - - - --- -2.21.0 - diff --git a/patches/linker/0002-Exclude-test-projects-from-source-build.patch b/patches/linker/0002-Exclude-test-projects-from-source-build.patch index 1ed84cf81c..3fe2d38b82 100644 --- a/patches/linker/0002-Exclude-test-projects-from-source-build.patch +++ b/patches/linker/0002-Exclude-test-projects-from-source-build.patch @@ -1,19 +1,17 @@ -From df64a5f4320ffa82e7b9c03e5023a89e73e252bb Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Fri, 31 May 2019 11:02:11 -0500 +From da1116df248b8913d5c90dc3d03b0fbd3a789c49 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 17:06:10 +0000 Subject: [PATCH] Exclude test projects from source-build. --- - illink.sln | 60 ---------------------------------------------- - test/Directory.Build.props | 5 ++++ - 2 files changed, 5 insertions(+), 60 deletions(-) - create mode 100644 test/Directory.Build.props + illink.sln | 77 -------------------------------------------------------------- + 1 file changed, 77 deletions(-) diff --git a/illink.sln b/illink.sln -index 3a0216d..d05fa31 100644 +index fdf7615..1e3cfb8 100644 --- a/illink.sln +++ b/illink.sln -@@ -13,14 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "src\ILLink. +@@ -9,14 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILLink.Tasks", "src\ILLink. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A879F5FC-D6C9-4ED4-BEAE-03B5CCE3C136}" EndProject @@ -28,7 +26,18 @@ index 3a0216d..d05fa31 100644 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "analyzer", "analyzer", "{AA0569FB-73E9-4B42-9A19-714BB1229DAE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "analyzer", "src\analyzer\analyzer.csproj", "{96182221-C5C4-436D-9BE0-EC499F9BAF17}" -@@ -83,54 +75,6 @@ Global +@@ -27,10 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linker", "linker", "{80AE20 + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Linker", "src\linker\ref\Mono.Linker.csproj", "{C7338775-E3F2-413D-82FD-C5B5B1455B19}" + EndProject +-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C2969923-7BAA-4FE4-853C-F670B0D3C6C8}" +-EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILLink.Tasks.Tests", "test\ILLink.Tasks.Tests\ILLink.Tasks.Tests.csproj", "{5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}" +-EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU +@@ -65,54 +53,6 @@ Global {A7A026C4-DEB4-4EF6-963E-17E7B98A6527}.Release|x64.Build.0 = Release|Any CPU {A7A026C4-DEB4-4EF6-963E-17E7B98A6527}.Release|x86.ActiveCfg = Release|Any CPU {A7A026C4-DEB4-4EF6-963E-17E7B98A6527}.Release|x86.Build.0 = Release|Any CPU @@ -83,7 +92,24 @@ index 3a0216d..d05fa31 100644 {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|Any CPU.Build.0 = Debug|Any CPU {96182221-C5C4-436D-9BE0-EC499F9BAF17}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -148,10 +92,6 @@ Global +@@ -137,31 +77,14 @@ Global + {C7338775-E3F2-413D-82FD-C5B5B1455B19}.Release|x64.Build.0 = Release|Any CPU + {C7338775-E3F2-413D-82FD-C5B5B1455B19}.Release|x86.ActiveCfg = Release|Any CPU + {C7338775-E3F2-413D-82FD-C5B5B1455B19}.Release|x86.Build.0 = Release|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Debug|x64.ActiveCfg = Debug|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Debug|x64.Build.0 = Debug|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Debug|x86.ActiveCfg = Debug|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Debug|x86.Build.0 = Debug|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Release|Any CPU.Build.0 = Release|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Release|x64.ActiveCfg = Release|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Release|x64.Build.0 = Release|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Release|x86.ActiveCfg = Release|Any CPU +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution @@ -92,19 +118,12 @@ index 3a0216d..d05fa31 100644 - {2C26601F-3E2F-45B9-A02F-58EE9296E19E} = {A879F5FC-D6C9-4ED4-BEAE-03B5CCE3C136} - {10249F19-1B72-4087-AF7F-C95B7672B204} = {A879F5FC-D6C9-4ED4-BEAE-03B5CCE3C136} {96182221-C5C4-436D-9BE0-EC499F9BAF17} = {AA0569FB-73E9-4B42-9A19-714BB1229DAE} + {80AE2045-E62C-4CD6-93E6-8ED34011B457} = {AC840E16-5507-436F-B9B1-46DB20FD395D} + {C7338775-E3F2-413D-82FD-C5B5B1455B19} = {80AE2045-E62C-4CD6-93E6-8ED34011B457} +- {5A27FA80-0E28-4243-88DF-EC8A22C8BFD0} = {C2969923-7BAA-4FE4-853C-F670B0D3C6C8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution -diff --git a/test/Directory.Build.props b/test/Directory.Build.props -new file mode 100644 -index 0000000..583a96c ---- /dev/null -+++ b/test/Directory.Build.props -@@ -0,0 +1,5 @@ -+ -+ -+ true -+ -+ + SolutionGuid = {E43A3901-42B0-48CA-BB36-5CD40A99A6EE} -- 1.8.3.1 diff --git a/patches/linker/0003-Don-t-add-sources-when-building-offline.patch b/patches/linker/0003-Don-t-add-sources-when-building-offline.patch index aaaad54fcb..8cdc1f43ab 100644 --- a/patches/linker/0003-Don-t-add-sources-when-building-offline.patch +++ b/patches/linker/0003-Don-t-add-sources-when-building-offline.patch @@ -1,6 +1,6 @@ -From 1a67d7ad94ba8acc1ed9e9d87edd6ea4bfb851af Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 20 Jun 2019 14:33:10 -0500 +From e9489f4725e6ba261818b074836ada1f6656a946 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 17:16:40 +0000 Subject: [PATCH] Don't add sources when building offline. --- @@ -8,13 +8,13 @@ Subject: [PATCH] Don't add sources when building offline. 1 file changed, 4 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props -index 419ba90..dd4099f 100644 +index 9c23b0c..f569224 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -12,5 +12,9 @@ - 1.5.0 - 15.4.8 - 15.4.8 +@@ -23,5 +23,9 @@ + 5.0.0-beta.20201.2 + + 0.11.2 + + $(RestoreSources); + https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json diff --git a/patches/linker/0004-Use-new-versions-of-MSBuild-reference-assemblies.patch b/patches/linker/0004-Use-new-versions-of-MSBuild-reference-assemblies.patch index 15af2098e3..198abf0e3e 100644 --- a/patches/linker/0004-Use-new-versions-of-MSBuild-reference-assemblies.patch +++ b/patches/linker/0004-Use-new-versions-of-MSBuild-reference-assemblies.patch @@ -1,6 +1,6 @@ -From 00ff9c8c7ea50c43b055b36a9cb2b31a10a66a29 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Sun, 23 Jun 2019 15:26:13 -0500 +From 9cbdfaef4614909c8ceda092ca32a809ecf5cd18 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 17:20:02 +0000 Subject: [PATCH] Use new versions of MSBuild reference assemblies. --- @@ -8,20 +8,20 @@ Subject: [PATCH] Use new versions of MSBuild reference assemblies. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props -index dd4099f..6da6a1d 100644 +index f569224..47d43e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -10,8 +10,8 @@ - 5.0.0-alpha1.19413.7 +@@ -18,8 +18,8 @@ + $(MicrosoftNETSdkILPackageVersion) 1.5.0 - 15.4.8 - 15.4.8 + 15.7.179 + 15.7.179 - - $(RestoreSources); - https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json + 5.0.0-beta.20201.2 + + 0.11.2 -- 1.8.3.1 diff --git a/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch b/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch index 96e1f9fd4a..80ee281d5f 100644 --- a/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch +++ b/patches/nuget-client/0001-Set-final-5.4-branding-3100.patch @@ -13,7 +13,7 @@ index 5bcc5c6..a5ec763 100644 +++ b/build/config.props @@ -26,7 +26,7 @@ changes we might have made. --> - 2 + 3 - false + true diff --git a/patches/nuget-client/0006-Do-not-build-NET-Fx-binaries-in-source-build.patch b/patches/nuget-client/0006-Do-not-build-NET-Fx-binaries-in-source-build.patch index 9e97cb236e..16ed0de3f9 100644 --- a/patches/nuget-client/0006-Do-not-build-NET-Fx-binaries-in-source-build.patch +++ b/patches/nuget-client/0006-Do-not-build-NET-Fx-binaries-in-source-build.patch @@ -1,6 +1,6 @@ -From 1f973c3a7fc244321a48a5ef9fc819f9df74999b Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Tue, 17 Sep 2019 19:13:32 +0000 +From 0fbce434cd42d87a97ef0cfe8b747ebbbd5ec6e1 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 15 May 2020 17:37:14 +0000 Subject: [PATCH] Do not build NET Fx binaries in source build --- @@ -9,27 +9,27 @@ Subject: [PATCH] Do not build NET Fx binaries in source build 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/common.project.props b/build/common.project.props -index 9cb703b..dc53155 100644 +index c1d6278..a1a1248 100644 --- a/build/common.project.props +++ b/build/common.project.props -@@ -15,7 +15,9 @@ +@@ -16,7 +16,9 @@ netcoreapp2.1 netstandard2.0 $(NETFXTargetFramework);$(NETCoreTargetFramework) + $(NETCoreTargetFramework) $(NETFXTargetFramework);$(NetStandardVersion) -+ $(NetStandardVersion) ++ $(NetStandardVersion) $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ $(RepositoryRootDirectory)build\ $(RepositoryRootDirectory)$(RepositoryName).sln diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 3db2db2..340b774 100644 +index 94af373..0730a3a 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,8 @@ - The understanding of target frameworks for NuGet.Packaging. + NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary);net40 + $(TargetFrameworksLibrary) + $(TargetFrameworks);net40 diff --git a/patches/nuget-client/0008-Remove-unneeded-feeds.patch b/patches/nuget-client/0008-Remove-unneeded-feeds.patch index d9055d0322..0622b2d3ab 100644 --- a/patches/nuget-client/0008-Remove-unneeded-feeds.patch +++ b/patches/nuget-client/0008-Remove-unneeded-feeds.patch @@ -11,14 +11,14 @@ diff --git a/NuGet.Config b/NuGet.Config index 440c8b5..1c2ddda 100644 --- a/NuGet.Config +++ b/NuGet.Config -@@ -7,7 +7,6 @@ +@@ -7,7 +7,5 @@ - +- - -- 1.8.3.1 diff --git a/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch b/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch index d8f458ff97..8399ab5971 100644 --- a/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch +++ b/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch @@ -5,23 +5,25 @@ Subject: [PATCH] Conditionally override PackageVersion properties --- src/coreclr/dependencies.props | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index 06a25f2..cf22341 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props -@@ -7,10 +7,10 @@ +@@ -7,11 +7,11 @@ - 1.0.0-beta-build0015 - 2.0.49 - 1.0.4-preview6.19326.1 +- 0.2.61701 - 2.2.0 + 1.0.0-beta-build0015 + 2.0.49 + 1.0.4-preview6.19326.1 ++ 0.2.61701 + 2.2.0 - -+ -+ -+ -+ - - - -@@ -37,9 +41,6 @@ - - - -- -- -- - - - --- -1.8.3.1 - diff --git a/patches/runtime/0004-do-not-fail-on-test-chmod.patch b/patches/runtime/0004-do-not-fail-on-test-chmod.patch index 3f9388e68f..664d33c9e3 100644 --- a/patches/runtime/0004-do-not-fail-on-test-chmod.patch +++ b/patches/runtime/0004-do-not-fail-on-test-chmod.patch @@ -1,6 +1,6 @@ -From f6ecdd9b9bec7b3d9749955b2c0b70f2a2c90b3b Mon Sep 17 00:00:00 2001 +From 4aafc84e554477eacb75885a6f129f9376f486f0 Mon Sep 17 00:00:00 2001 From: dseefeld -Date: Tue, 7 Jan 2020 20:44:38 +0000 +Date: Fri, 15 May 2020 16:02:54 +0000 Subject: [PATCH] do not fail on test chmod --- @@ -8,18 +8,18 @@ Subject: [PATCH] do not fail on test chmod 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj -index 0abad68..846c296 100644 +index 3179312..b88c71f 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj -@@ -70,7 +70,7 @@ +@@ -65,7 +65,7 @@ SkipUnchangedFiles="true" UseHardlinksIfPossible="$(UseHardlink)" /> -- -+ +- ++ - -Date: Fri, 14 Feb 2020 21:02:33 +0000 +Date: Fri, 15 May 2020 16:08:26 +0000 Subject: [PATCH] Update NuGet package build to pass in Configuration --- @@ -8,11 +8,11 @@ Subject: [PATCH] Update NuGet package build to pass in Configuration 1 file changed, 1 insertion(+) diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh -index 15e9126..5a6fa32 100755 +index 634bcb7..1ce1864 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -302,6 +302,7 @@ generate_NugetPackages() - "$__RepoRootDir"/eng/common/build.sh -r -b -projects "$__SourceDir"/.nuget/packages.builds \ + "$__RepoRootDir"/eng/common/build.sh -r -b -projects "$__SourceDir"/.nuget/coreclr-packages.proj \ -verbosity minimal -bl:"$__LogsDir/Nuget_$__TargetOS__$__BuildArch__$__BuildType.binlog" \ /p:PortableBuild=true \ + /p:Configuration=$__BuildType \ diff --git a/patches/runtime/0010-Exclude-harvestPackages-from-source-build.patch b/patches/runtime/0010-Exclude-harvestPackages-from-source-build.patch deleted file mode 100644 index 1731ca5358..0000000000 --- a/patches/runtime/0010-Exclude-harvestPackages-from-source-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 28e4e7324ea4c7294ef451915d0640a23dc59fff Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Tue, 7 Apr 2020 20:25:17 +0000 -Subject: [PATCH] Exclude harvestPackages from source build - ---- - src/libraries/restore/harvestPackages/harvestPackages.depproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libraries/restore/harvestPackages/harvestPackages.depproj b/src/libraries/restore/harvestPackages/harvestPackages.depproj -index 2ae20ec..be507d9 100644 ---- a/src/libraries/restore/harvestPackages/harvestPackages.depproj -+++ b/src/libraries/restore/harvestPackages/harvestPackages.depproj -@@ -1,6 +1,7 @@ -  - - netstandard2.0 -+ true - - - -@@ -41,4 +42,4 @@ - - - -- -\ No newline at end of file -+ --- -1.8.3.1 - diff --git a/patches/templating/0001-Don-t-call-dotnet-with-no-path.patch b/patches/templating/0001-Don-t-call-dotnet-with-no-path.patch deleted file mode 100644 index 3e94270f11..0000000000 --- a/patches/templating/0001-Don-t-call-dotnet-with-no-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 162ec70b0f7d8bc7acc4521a507201ecf09e74e2 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 26 Sep 2019 02:58:28 -0500 -Subject: [PATCH] Don't call dotnet with no path - ---- - eng/common/tools.sh | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 757d5b9e..a8fabf54 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -338,12 +338,6 @@ function MSBuild { - InitializeBuildTool - InitializeToolset - -- # Work around issues with Azure Artifacts credential provider -- # https://github.com/dotnet/arcade/issues/3932 -- if [[ "$ci" == true ]]; then -- dotnet nuget locals http-cache -c -- fi -- - local toolset_dir="${_InitializeToolset%/*}" - local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" - args=( "${args[@]}" "-logger:$logger_path" ) --- -2.18.0 - From bdde46fbe1552974d49ecb3c1603c86227e01d7a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Mon, 18 May 2020 19:05:38 +0000 Subject: [PATCH 03/57] Update arcade version and runtime build commands --- global.json | 2 +- ...0005-Add-source-build-specific-build-script.patch | 12 ++++++------ repos/known-good.proj | 8 ++++---- repos/linker.proj | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/global.json b/global.json index ba37204762..3c387d8cca 100644 --- a/global.json +++ b/global.json @@ -6,7 +6,7 @@ "Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.Traversal": "2.0.2", "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19616.4", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20201.2", "Yarn.MSBuild": "1.15.2" } } diff --git a/patches/runtime/0005-Add-source-build-specific-build-script.patch b/patches/runtime/0005-Add-source-build-specific-build-script.patch index 15dbdab8ff..333c727515 100644 --- a/patches/runtime/0005-Add-source-build-specific-build-script.patch +++ b/patches/runtime/0005-Add-source-build-specific-build-script.patch @@ -89,17 +89,17 @@ index 0000000..758cd7b +echo "installerArgs = [$installerArgs]" +echo "additionalAgs = [$additionalArgs]" + -+echo "Running command: $scriptroot/build.sh $commonArgs -subsetcategory coreclr -subset runtime-corelib-nativecorelib-packages $coreclrArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subsetcategory coreclr -subset runtime-corelib-nativecorelib-packages $coreclrArgs $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; +echo "Running command: $scriptroot/build.sh $commonArgs -projects $scriptroot/src/coreclr/src/tools/crossgen2/crossgen2.sln $coreclrArgs $additionalArgs" +$scriptroot/build.sh $commonArgs -projects $scriptroot/src/coreclr/src/tools/crossgen2/crossgen2.sln $coreclrArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "crossgen2Build.binlog" * {} \; -+echo "Running command: $scriptroot/build.sh $commonArgs -subsetcategory libraries $librariesArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subsetcategory libraries $librariesArgs $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset libs $librariesArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; -+echo "Running command: $scriptroot/build.sh $commonArgs -subsetcategory installer -subset corehost-managed-depproj-pkgproj-bundle $installerArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subsetcategory installer -subset corehost-managed-depproj-pkgproj-bundle $installerArgs $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; -- 1.8.3.1 diff --git a/repos/known-good.proj b/repos/known-good.proj index 1fbcc0f167..c92c202f03 100644 --- a/repos/known-good.proj +++ b/repos/known-good.proj @@ -50,10 +50,10 @@ - - - - + + + + diff --git a/repos/linker.proj b/repos/linker.proj index 86b18a5ec0..6cb7d0226c 100644 --- a/repos/linker.proj +++ b/repos/linker.proj @@ -3,7 +3,7 @@ - ILLink.Tasks + Microsoft.NET.ILLink.Tasks restore /bl:restore.binlog $(BuildCommandArgs) $(ProjectDirectory)illink.sln From a3eb11ee3943569bdffd25124ead4450f4c89a66 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 21 May 2020 16:38:54 +0000 Subject: [PATCH 04/57] Add buildtools to runtime build --- .../runtime/0005-Add-source-build-specific-build-script.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/runtime/0005-Add-source-build-specific-build-script.patch b/patches/runtime/0005-Add-source-build-specific-build-script.patch index 333c727515..273acfd975 100644 --- a/patches/runtime/0005-Add-source-build-specific-build-script.patch +++ b/patches/runtime/0005-Add-source-build-specific-build-script.patch @@ -89,8 +89,8 @@ index 0000000..758cd7b +echo "installerArgs = [$installerArgs]" +echo "additionalAgs = [$additionalArgs]" + -+echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.buildtools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset clr.buildtools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; +echo "Running command: $scriptroot/build.sh $commonArgs -projects $scriptroot/src/coreclr/src/tools/crossgen2/crossgen2.sln $coreclrArgs $additionalArgs" +$scriptroot/build.sh $commonArgs -projects $scriptroot/src/coreclr/src/tools/crossgen2/crossgen2.sln $coreclrArgs $additionalArgs From 3ee6afb3d794f91e56b7f005d65b7d8dd3a7bea1 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 15 May 2020 15:40:12 +0000 Subject: [PATCH 05/57] Update to preview4 shas --- ...-DiagnosticAdapter-from-source-build.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch diff --git a/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch b/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch new file mode 100644 index 0000000000..32b6b14a4c --- /dev/null +++ b/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch @@ -0,0 +1,26 @@ +From c12a7ef7bcc068523cd4157afd62d8569db96ef5 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 14 May 2020 18:13:54 +0000 +Subject: [PATCH] Exclude DiagnosticAdapter from source build This project is + used for tests only, which aren't built in source-build. Plus, it is being + removed from aspnet-extensions in preview4. + +--- + src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj +index 57dd0b0..4c81d3b 100644 +--- a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj ++++ b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj +@@ -2,6 +2,7 @@ + + + netstandard2.0;netcoreapp2.0 ++ true + + + +-- +1.8.3.1 + From 4b81066f3c3864c26533fa021608768134a7ae73 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 15 May 2020 17:52:16 +0000 Subject: [PATCH 06/57] Reconcile patches with version updates --- ...-DiagnosticAdapter-from-source-build.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch diff --git a/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch b/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch deleted file mode 100644 index 32b6b14a4c..0000000000 --- a/patches/aspnet-extensions/0004-Exclude-DiagnosticAdapter-from-source-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c12a7ef7bcc068523cd4157afd62d8569db96ef5 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 14 May 2020 18:13:54 +0000 -Subject: [PATCH] Exclude DiagnosticAdapter from source build This project is - used for tests only, which aren't built in source-build. Plus, it is being - removed from aspnet-extensions in preview4. - ---- - src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -index 57dd0b0..4c81d3b 100644 ---- a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -+++ b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -@@ -2,6 +2,7 @@ - - - netstandard2.0;netcoreapp2.0 -+ true - - - --- -1.8.3.1 - From b072b58e5c28504a04c0bd79851dc5dbddf236e4 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 2 Jun 2020 13:49:59 +0000 Subject: [PATCH 07/57] Add path to ilasm to libraries and installer build and capture clrtools from either portable or non-portable builds --- ...d-source-build-specific-build-script.patch | 9 ++++--- repos/runtime-portable.proj | 22 ---------------- repos/runtime.common.props | 1 - repos/runtime.common.targets | 26 +++++++++++++++++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/patches/runtime/0005-Add-source-build-specific-build-script.patch b/patches/runtime/0005-Add-source-build-specific-build-script.patch index 273acfd975..8c9d397226 100644 --- a/patches/runtime/0005-Add-source-build-specific-build-script.patch +++ b/patches/runtime/0005-Add-source-build-specific-build-script.patch @@ -92,14 +92,15 @@ index 0000000..758cd7b +echo "Running command: $scriptroot/build.sh $commonArgs -subset clr.buildtools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs" +$scriptroot/build.sh $commonArgs -subset clr.buildtools+clr.runtime+clr.corelib+clr.nativecorelib+clr.packages $coreclrArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "coreclrBuild.binlog" * {} \; ++ilasmPath=$(dirname $(find $scriptroot/artifacts/bin -name ilasm)) +echo "Running command: $scriptroot/build.sh $commonArgs -projects $scriptroot/src/coreclr/src/tools/crossgen2/crossgen2.sln $coreclrArgs $additionalArgs" +$scriptroot/build.sh $commonArgs -projects $scriptroot/src/coreclr/src/tools/crossgen2/crossgen2.sln $coreclrArgs $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "crossgen2Build.binlog" * {} \; -+echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset libs $librariesArgs $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; -+echo "Running command: $scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; -- 1.8.3.1 diff --git a/repos/runtime-portable.proj b/repos/runtime-portable.proj index 1d9c675917..0faeb9afc6 100644 --- a/repos/runtime-portable.proj +++ b/repos/runtime-portable.proj @@ -18,28 +18,6 @@ - - - $(ToolPackageExtractDir)coreclr-tools - so - so - dylib - please define AssemblyExtension for $(TargetOS) - - - - - - - - - - - - - - diff --git a/repos/runtime.common.props b/repos/runtime.common.props index 2796f5df5c..b743734c1e 100644 --- a/repos/runtime.common.props +++ b/repos/runtime.common.props @@ -50,7 +50,6 @@ $(LibrariesBuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) $(LibrariesBuildArguments) /p:RuntimeOS=$(OverrideTargetRid) $(LibrariesBuildArguments) /p:PortableBuild=$(OverridePortableBuild) - $(LibrariesBuildArguments) /p:ILAsmToolPath=$(ToolPackageExtractDir)coreclr-tools/ $(LibrariesBuildArguments) /p:BuildAllPackages=true $(LibrariesBuildArguments) /p:VersionSuffix="$(PreReleaseVersionLabel)" $(LibrariesBuildArguments) /p:BuiltSdkPackageOverride="" diff --git a/repos/runtime.common.targets b/repos/runtime.common.targets index c9b3addd89..d1ffa04e48 100644 --- a/repos/runtime.common.targets +++ b/repos/runtime.common.targets @@ -22,6 +22,28 @@ Rid="$(TargetRid)-$(Platform)" /> + + + $(ToolPackageExtractDir)coreclr-tools + so + so + dylib + please define AssemblyExtension for $(TargetOS) + + + + + + + + + + + + + + @@ -50,5 +72,5 @@ Condition="'@(BinariesToCopy)'!=''" /> - - \ No newline at end of file + + From 204ae8cf0ebf3a444aa23ec418ec50641423c08a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 4 Jun 2020 15:04:14 +0000 Subject: [PATCH 08/57] Fix UpdatePackageIndex UsingTask --- ...013-Fix-UpdatePackageIndex-UsingTask.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch diff --git a/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch b/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch new file mode 100644 index 0000000000..5fd04bd4c5 --- /dev/null +++ b/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch @@ -0,0 +1,64 @@ +From 1e81879f94fe1edea8f0bb96f663baf0b2d22ff4 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 4 Jun 2020 14:06:16 +0000 +Subject: [PATCH] Fix UpdatePackageIndex UsingTask + +--- + eng/restore/harvestPackages.targets | 10 ++-------- + src/libraries/libraries-packages.proj | 9 ++++++++- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/eng/restore/harvestPackages.targets b/eng/restore/harvestPackages.targets +index 152888c..29b9747 100644 +--- a/eng/restore/harvestPackages.targets ++++ b/eng/restore/harvestPackages.targets +@@ -1,11 +1,4 @@ +  +- +- $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ +- $(PackagingTaskAssembly)netcoreapp2.1\ +- $(PackagingTaskAssembly)net472\ +- $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll +- +- + + + +@@ -37,4 +30,5 @@ + + + +- +\ No newline at end of file ++ ++ +diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj +index f1ed352..51af452 100644 +--- a/src/libraries/libraries-packages.proj ++++ b/src/libraries/libraries-packages.proj +@@ -6,6 +6,13 @@ + $(AdditionalBuildTargetFrameworks);package-$(Configuration) + + ++ ++ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\ ++ $(PackagingTaskAssembly)netcoreapp2.1\ ++ $(PackagingTaskAssembly)net472\ ++ $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll ++ ++ + + + +@@ -24,7 +31,7 @@ + ones that might do this. After we ship a stable set of packages this target should be ran and the + changes to the package index should be commited to the repo. + --> +- ++ + +-- +1.8.3.1 + From 09714952040dd634d485f87451239dfe15e8e333 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 4 Jun 2020 11:57:11 -0400 Subject: [PATCH 09/57] Fix subsets for installer --- .../runtime/0005-Add-source-build-specific-build-script.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/runtime/0005-Add-source-build-specific-build-script.patch b/patches/runtime/0005-Add-source-build-specific-build-script.patch index 8c9d397226..eeaa71e05f 100644 --- a/patches/runtime/0005-Add-source-build-specific-build-script.patch +++ b/patches/runtime/0005-Add-source-build-specific-build-script.patch @@ -99,8 +99,8 @@ index 0000000..758cd7b +echo "Running command: $scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" +$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; -+echo "Running command: $scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset installer.corehost+installer.managed+installer.depproj+installer.pkgproj+installer.bundle $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs ++echo "Running command: $scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" ++$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; -- 1.8.3.1 From bbb4946e25520a2099ab5a3a251aca051b18fb1b Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 5 Jun 2020 16:12:49 +0000 Subject: [PATCH 10/57] Add patches for runtime and nuget-client --- ...9-Clear-VsToolsPath-for-source-build.patch | 31 +++++++++++++++++++ ...013-Fix-UpdatePackageIndex-UsingTask.patch | 1 + 2 files changed, 32 insertions(+) create mode 100644 patches/nuget-client/0009-Clear-VsToolsPath-for-source-build.patch diff --git a/patches/nuget-client/0009-Clear-VsToolsPath-for-source-build.patch b/patches/nuget-client/0009-Clear-VsToolsPath-for-source-build.patch new file mode 100644 index 0000000000..037e387092 --- /dev/null +++ b/patches/nuget-client/0009-Clear-VsToolsPath-for-source-build.patch @@ -0,0 +1,31 @@ +From fddc11884d6b90ec1c88f88cfd431d3ab04d5658 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 4 Jun 2020 19:44:52 +0000 +Subject: [PATCH] Clear VsToolsPath for source-build + +--- + .../NuGet.VisualStudio.OnlineEnvironment.Client.csproj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/NuGet.VisualStudio.OnlineEnvironment.Client.csproj b/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/NuGet.VisualStudio.OnlineEnvironment.Client.csproj +index e48b5cb..84d3525 100644 +--- a/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/NuGet.VisualStudio.OnlineEnvironment.Client.csproj ++++ b/src/NuGet.Clients/NuGet.VisualStudio.OnlineEnvironment.Client/NuGet.VisualStudio.OnlineEnvironment.Client.csproj +@@ -3,6 +3,7 @@ + + 16.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) ++ + + + +@@ -86,4 +87,4 @@ + + + --> +- +\ No newline at end of file ++ +-- +1.8.3.1 + diff --git a/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch b/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch index 5fd04bd4c5..04c8aa1a87 100644 --- a/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch +++ b/patches/runtime/0013-Fix-UpdatePackageIndex-UsingTask.patch @@ -2,6 +2,7 @@ From 1e81879f94fe1edea8f0bb96f663baf0b2d22ff4 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 4 Jun 2020 14:06:16 +0000 Subject: [PATCH] Fix UpdatePackageIndex UsingTask +Based on runtime PR: https://github.com/dotnet/runtime/pull/37369 --- eng/restore/harvestPackages.targets | 10 ++-------- From 69e30b70dbd091c07e60f1590e2cefc1f80612cf Mon Sep 17 00:00:00 2001 From: dseefeld Date: Mon, 8 Jun 2020 11:28:24 -0400 Subject: [PATCH 11/57] Remove unneeded patches for aspnetcore-tooling --- .../0001-Don-t-build-fullfx.patch | 65 ------------------- .../0003-Import-PackageVersions.props.patch | 24 ------- ...SBuild-version-to-reference-versions.patch | 2 +- 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch delete mode 100644 patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch diff --git a/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch b/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch deleted file mode 100644 index e0119d0810..0000000000 --- a/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 1a5a1cd558339f753323b59c86681a6d83d1ebf6 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Sun, 20 Oct 2019 15:51:49 -0500 -Subject: [PATCH 1/4] Don't build fullfx - ---- - .../src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 10 +++++----- - .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj -index ba32df8..4f8ecce 100644 ---- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj -+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj -@@ -1,7 +1,7 @@ -  - - Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor. -- $(DefaultNetCoreTargetFramework);net46 -+ $(DefaultNetCoreTargetFramework);net472 - - Microsoft.NET.Sdk.Razor.Tasks - $(MSBuildProjectName).nuspec -@@ -19,7 +19,7 @@ - - - -- -+ - - - -@@ -58,11 +58,11 @@ - - - -- -+ - - -- -- -+ -+ - - - -diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets -index e5e8d92..b0a7c5e 100644 ---- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets -+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets -@@ -30,8 +30,8 @@ Copyright (c) .NET Foundation. All rights reserved. - - $(MSBuildThisFileDirectory)..\..\ - $(RazorSdkDirectoryRoot)tasks\ -- <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp5.0 -- <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46 -+ <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework) -+ <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472 - $(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll - - --- -2.7.4 - diff --git a/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch b/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch deleted file mode 100644 index 9eff0c904b..0000000000 --- a/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0ba59aca7eb538cacfc603ccf3f0e0c283603e32 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Wed, 13 Nov 2019 16:31:47 +0000 -Subject: [PATCH 3/4] Import PackageVersions.props - ---- - eng/Versions.props | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/eng/Versions.props b/eng/Versions.props -index dd53e83..7355673 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -141,4 +141,7 @@ - 0.10.0 - 2.4.1 - -+ -+ -+ - --- -2.7.4 - diff --git a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch index a4c1462638..fbe05dedf6 100644 --- a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch +++ b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch @@ -21,7 +21,7 @@ index 4f8ecce..5a433ed 100644 + + - + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj index 3ea0d8e..74fc451 100644 From e2657a19abe0eda243970075318df2ae1e1cd3b1 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Mon, 8 Jun 2020 17:00:25 -0400 Subject: [PATCH 12/57] Missed change in rebase --- repos/runtime.common.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/runtime.common.targets b/repos/runtime.common.targets index d1ffa04e48..b527b2e3b3 100644 --- a/repos/runtime.common.targets +++ b/repos/runtime.common.targets @@ -72,5 +72,5 @@ Condition="'@(BinariesToCopy)'!=''" /> - + From f8b62f04f8b2c8443d0a9e7330c9175e83d7de34 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 9 Jun 2020 08:43:25 -0400 Subject: [PATCH 13/57] Update SDK version --- global.json | 2 +- ...dd-reference-to-PlatformAbstractions.patch | 32 -- ...emove-RID-calculation-in-favor-of-Ru.patch | 418 ++++++++++++++++++ 3 files changed, 419 insertions(+), 33 deletions(-) delete mode 100644 patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch create mode 100644 patches/runtime/0014-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch diff --git a/global.json b/global.json index 3c387d8cca..129fc827a2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-preview.3.20216.6" + "dotnet": "5.0.100-preview.4.20258.7" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch b/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch deleted file mode 100644 index af1944d593..0000000000 --- a/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch +++ /dev/null @@ -1,32 +0,0 @@ -From db4c528bb2335f791f46f76f62f392597e298ef0 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 1 Apr 2020 16:32:18 +0000 -Subject: [PATCH] Add reference to PlatformAbstractions - -Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj doesn't have a reference -to PlatformAbstractions. It builds in the production build because it has a -reference to Microsoft.Extensions.DependencyModel, which also brought in -PlatformAbstractions. That dependency has been removed with -https://github.com/dotnet/core-setup/pull/5218. -The tarball build uses a newer version of Microsoft.Extensions.DependencyModel -with the dependency removed, so an explicit dependency needs to be added now until -Arcade removes their dependency on PlatormAbstractions. ---- - .../Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj -index 36c9b5f..d2e1526 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj -@@ -19,6 +19,7 @@ - - - -+ - - - --- -1.8.3.1 - diff --git a/patches/runtime/0014-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch b/patches/runtime/0014-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch new file mode 100644 index 0000000000..21ce8436a8 --- /dev/null +++ b/patches/runtime/0014-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch @@ -0,0 +1,418 @@ +From 522da14354efd91667f3a87cd47aedd6b564b3e6 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 4 May 2020 11:45:15 +0200 +Subject: [PATCH] Update SDK and remove RID calculation in favor of + RuntimeInformation (#35538) + +* Remove GetTargetMachineInfo from runtime + +* Update bootstrapped SDK + +* Remove unused prop + +* Rename RuntimeRID to HostRuntimeIdentifier + +* Remove yml tmp copying + +* Update SDK + +* Move RuntimeOS into libraries + +* Fix RuntimeOS move +--- + Build.proj | 1 - + Directory.Build.props | 1 - + eng/Configurations.props | 4 +- + eng/pipelines/installer/jobs/base-job.yml | 1 - + .../jobs/steps/build-linux-package.yml | 13 ---- + eng/pipelines/libraries/build-job.yml | 6 -- + eng/restore/runtimeprops.targets | 7 -- + global.json | 4 +- + src/installer/Directory.Build.props | 13 ++-- + src/installer/Directory.Build.targets | 4 +- + src/installer/pkg/Directory.Build.targets | 1 + + src/installer/test/Directory.Build.targets | 6 +- + src/libraries/Directory.Build.props | 4 +- + .../dev/master-build-deb-rpm-docker.sh | 10 +-- + .../installer.tasks/GetTargetMachineInfo.cs | 67 ------------------- + .../installer.tasks/installer.tasks.csproj | 28 +------- + 16 files changed, 18 insertions(+), 152 deletions(-) + delete mode 100644 eng/restore/runtimeprops.targets + delete mode 100644 tools-local/tasks/installer.tasks/GetTargetMachineInfo.cs + +diff --git a/Build.proj b/Build.proj +index 0ecff09e855..047ec19ac49 100644 +--- a/Build.proj ++++ b/Build.proj +@@ -29,7 +29,6 @@ + + + +- + + +@@ -37,6 +36,9 @@ + + + ++ $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) ++ win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant) ++ + OSX + FreeBSD + NetBSD +diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml +index 1925d1ae018..71e6b8d8d03 100644 +--- a/eng/pipelines/installer/jobs/base-job.yml ++++ b/eng/pipelines/installer/jobs/base-job.yml +@@ -448,7 +448,6 @@ jobs: + # independent installers on this leg, but we need to do it somewhere.) + - template: steps/build-linux-package.yml + parameters: +- buildTraversalBuildDependencies: true + distroRid: ${{ packageBuild.imageRid }} + image: ${{ packageBuild.image }} + packageStepDescription: Runtime Deps, Runtime, Framework Packs installers +diff --git a/eng/pipelines/installer/jobs/steps/build-linux-package.yml b/eng/pipelines/installer/jobs/steps/build-linux-package.yml +index e9e342b618c..c6ae12827dc 100644 +--- a/eng/pipelines/installer/jobs/steps/build-linux-package.yml ++++ b/eng/pipelines/installer/jobs/steps/build-linux-package.yml +@@ -1,5 +1,4 @@ + parameters: +- buildTraversalBuildDependencies: false + distroRid: null + image: null + outputRidArg: '' +@@ -8,18 +7,6 @@ parameters: + subsetArg: '' + + steps: +-- ${{ if eq(parameters.buildTraversalBuildDependencies, true) }}: +- - script: | +- set -x +- df -h +- $(DockerRunMSBuild) ${{ parameters.image }} $(MSBuildScript) \ +- --ci \ +- /root/runtime/tools-local/tasks/installer.tasks/installer.tasks.csproj \ +- /t:Restore /t:Build /t:CreateHostMachineInfoFile \ +- $(CommonMSBuildArgs) \ +- /bl:msbuild.${{ parameters.distroRid }}.traversaldependencies.binlog +- displayName: ====== Build traversal build dependencies - ${{ parameters.distroRid }} +- + - script: | + set -x + df -h +diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml +index c541e688803..eb835ac0a12 100644 +--- a/eng/pipelines/libraries/build-job.yml ++++ b/eng/pipelines/libraries/build-job.yml +@@ -145,12 +145,6 @@ jobs: + targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/packages + condition: and(succeeded(), eq(variables['_librariesBuildProducedPackages'], true)) + +- - task: CopyFiles@2 +- displayName: Prepare tmp assets to publish +- inputs: +- sourceFolder: $(Build.SourcesDirectory)/artifacts/tmp +- targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/tmp +- + - template: /eng/pipelines/common/upload-artifact-step.yml + parameters: + rootFolder: $(Build.ArtifactStagingDirectory)/artifacts +diff --git a/eng/restore/runtimeprops.targets b/eng/restore/runtimeprops.targets +deleted file mode 100644 +index 945d0830f8c..00000000000 +--- a/eng/restore/runtimeprops.targets ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +\ No newline at end of file +diff --git a/global.json b/global.json +index 1c7dd9061e2..400b6e77a94 100644 +--- a/global.json ++++ b/global.json +@@ -1,11 +1,11 @@ + { + "sdk": { +- "version": "5.0.100-preview.4.20202.8", ++ "version": "5.0.100-preview.5.20228.8", + "allowPrerelease": true, + "rollForward": "major" + }, + "tools": { +- "dotnet": "5.0.100-preview.4.20202.8" ++ "dotnet": "5.0.100-preview.5.20228.8" + }, + "native-tools": { + "cmake": "3.14.2", +diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props +index 364b1f92b99..0fac6da8048 100644 +--- a/src/installer/Directory.Build.props ++++ b/src/installer/Directory.Build.props +@@ -81,11 +81,8 @@ + .exe + + +- +- +- +- $(HostMachineRid.Remove($(HostMachineRid.LastIndexOf('-'))))-$(TargetArchitecture) ++ ++ $(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-'))))-$(TargetArchitecture) + + + +@@ -291,9 +288,9 @@ + + + true ++ $(HostRuntimeIdentifier.StartsWith('debian')) or ++ $(HostRuntimeIdentifier.StartsWith('ubuntu')) or ++ $(HostRuntimeIdentifier.StartsWith('linuxmint'))">true + + true + +diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets +index 20b134d708c..7a859d808b2 100644 +--- a/src/installer/Directory.Build.targets ++++ b/src/installer/Directory.Build.targets +@@ -12,10 +12,8 @@ + + + ++ + +- +- +- + + + +diff --git a/src/installer/pkg/Directory.Build.targets b/src/installer/pkg/Directory.Build.targets +index e19dd327b12..0dd8ca63aef 100644 +--- a/src/installer/pkg/Directory.Build.targets ++++ b/src/installer/pkg/Directory.Build.targets +@@ -112,6 +112,7 @@ + + + ++ + + + +diff --git a/src/installer/test/Directory.Build.targets b/src/installer/test/Directory.Build.targets +index da534ca0055..82a7c6d4e60 100644 +--- a/src/installer/test/Directory.Build.targets ++++ b/src/installer/test/Directory.Build.targets +@@ -121,12 +121,8 @@ + + + +- +- +- +- + +- $(_HostRid) ++ $(HostRuntimeIdentifier) + $(MSBuildProjectName) + + $(ArtifactsDir)tests/$(Configuration)/ +diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props +index 09ade10ad7e..ec3fe48b6f5 100644 +--- a/src/libraries/Directory.Build.props ++++ b/src/libraries/Directory.Build.props +@@ -26,7 +26,9 @@ + $(RepositoryEngineeringDir)LicenseHeader.txt + + +- ++ ++ $(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-')))) ++ + + + +diff --git a/tools-local/scripts/dev/master-build-deb-rpm-docker.sh b/tools-local/scripts/dev/master-build-deb-rpm-docker.sh +index e96460ece18..feb9747aa71 100755 +--- a/tools-local/scripts/dev/master-build-deb-rpm-docker.sh ++++ b/tools-local/scripts/dev/master-build-deb-rpm-docker.sh +@@ -62,18 +62,10 @@ package() { + shift + + containerized "$image" bash -c " +- eng/common/msbuild.sh \ +- tools-local/tasks/installer.tasks/installer.tasks.csproj \ +- /t:Restore /t:Build /t:CreateHostMachineInfoFile \ +- /p:Configuration=Release \ +- /p:TargetOS=Linux \ +- /p:PortableBuild=false \ +- /p:TargetArchitecture=x64 \ +- /bl:artifacts/msbuild.$name.traversaldependencies.binlog; + ./build.sh \ + --ci \ ++ --subset installer + /p:OfficialBuildId=20190101.1 \ +- /p:Subset=Installer \ + /p:UsePrebuiltPortableBinariesForInstallers=true \ + /p:SharedFrameworkPublishDir=/work/artifacts/obj/linux-x64.Release/sharedFrameworkPublish/ \ + /p:InstallerSourceOSPlatformConfig=linux-x64.Release \ +diff --git a/tools-local/tasks/installer.tasks/GetTargetMachineInfo.cs b/tools-local/tasks/installer.tasks/GetTargetMachineInfo.cs +deleted file mode 100644 +index 67aa53b36ec..00000000000 +--- a/tools-local/tasks/installer.tasks/GetTargetMachineInfo.cs ++++ /dev/null +@@ -1,67 +0,0 @@ +-// Licensed to the .NET Foundation under one or more agreements. +-// The .NET Foundation licenses this file to you under the MIT license. +-// See the LICENSE file in the project root for more information. +- +-using Microsoft.Build.Framework; +-using System.Runtime.InteropServices; +- +-namespace Microsoft.DotNet.Build.Tasks +-{ +- public class GetTargetMachineInfo : BuildTask +- { +- [Output] +- public string TargetOS { get; set; } +- +- [Output] +- public string TargetArch { get; set; } +- +- [Output] +- public string RuntimeIdentifier { get; set; } +- +- public override bool Execute() +- { +- switch (RuntimeInformation.OSArchitecture) +- { +- case Architecture.X64: +- TargetArch = "x64"; +- break; +- case Architecture.X86: +- TargetArch = "x86"; +- break; +- case Architecture.Arm: +- TargetArch = "arm"; +- break; +- case Architecture.Arm64: +- TargetArch = "arm64"; +- break; +- } +- +- if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) +- TargetOS = "Windows_NT"; +- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) +- TargetOS = "Linux"; +- else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) +- TargetOS = "OSX"; +- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"))) +- TargetOS = "FreeBSD"; +- else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD"))) +- TargetOS = "NetBSD"; +- +- RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); +- +- if (TargetArch == null) +- { +- Log.LogError("{0} is null", nameof(TargetArch)); +- return false; +- } +- +- if (TargetOS == null) +- { +- Log.LogError("{0} is null", nameof(TargetOS)); +- return false; +- } +- +- return true; +- } +- } +-} +diff --git a/tools-local/tasks/installer.tasks/installer.tasks.csproj b/tools-local/tasks/installer.tasks/installer.tasks.csproj +index 2ed742bb359..356f22ac74e 100644 +--- a/tools-local/tasks/installer.tasks/installer.tasks.csproj ++++ b/tools-local/tasks/installer.tasks/installer.tasks.csproj +@@ -1,5 +1,4 @@ +- +- ++ + + netstandard2.0 + $(TargetFrameworks);net46 +@@ -14,7 +13,6 @@ + + + +- + + + +@@ -44,28 +42,4 @@ + + + +- +- +- +- +- +- +- +- +- +-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +- <PropertyGroup> +- <HostMachineRid>$(HostMachineRid)</HostMachineRid> +- </PropertyGroup> +-</Project> +- +- +- +- +- +- + +-- +2.18.2 + From c808f0bb15c03c5ebb5b995507f0ba76c4863f75 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 9 Jun 2020 14:52:55 -0400 Subject: [PATCH 14/57] Build through aspnetcore-tooling --- ...dk.Razor-for-net472-instead-of-net46.patch | 63 +++++++++++++++++++ ...SBuild-version-to-reference-versions.patch | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch diff --git a/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch b/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch new file mode 100644 index 0000000000..fdbcb08f10 --- /dev/null +++ b/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch @@ -0,0 +1,63 @@ +From 6c171bdaeb7e57ea8ac28ea012f1957acb3783b5 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Tue, 9 Jun 2020 08:49:57 -0400 +Subject: [PATCH] Build MS.NET.Sdk.Razor for net472 instead of net46 + +--- + .../Microsoft.NET.Sdk.Razor.csproj | 10 +++++----- + .../netstandard2.0/Sdk.Razor.CurrentVersion.targets | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +index ba32df8e2..4f8eccee6 100644 +--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj ++++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +@@ -1,7 +1,7 @@ +  + + Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor. +- $(DefaultNetCoreTargetFramework);net46 ++ $(DefaultNetCoreTargetFramework);net472 + + Microsoft.NET.Sdk.Razor.Tasks + $(MSBuildProjectName).nuspec +@@ -19,7 +19,7 @@ + + + +- ++ + + + +@@ -58,11 +58,11 @@ + + + +- ++ + + +- +- ++ ++ + + + +diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets +index dfee69656..32ff9711b 100644 +--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets ++++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets +@@ -31,7 +31,7 @@ Copyright (c) .NET Foundation. All rights reserved. + $(MSBuildThisFileDirectory)..\..\ + $(RazorSdkDirectoryRoot)tasks\ + <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp5.0 +- <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46 ++ <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472 + $(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll + + +-- +2.18.2 + diff --git a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch index fbe05dedf6..a4c1462638 100644 --- a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch +++ b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch @@ -21,7 +21,7 @@ index 4f8ecce..5a433ed 100644 + + - + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj index 3ea0d8e..74fc451 100644 From a9b7556b667ab0f6c2ccf942aca566f6a94707ff Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 11 Jun 2020 14:07:35 -0400 Subject: [PATCH 15/57] Add netcoreapp5.0 assets to libraries packages --- ...rapp5.0-versions-in-libraries-nupkgs.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 patches/runtime/0015-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch diff --git a/patches/runtime/0015-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch b/patches/runtime/0015-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch new file mode 100644 index 0000000000..53f5cc6d9e --- /dev/null +++ b/patches/runtime/0015-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch @@ -0,0 +1,33 @@ +From 5125873ba73486869cfe9bc95f9f5296f785dff1 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 11 Jun 2020 12:15:06 -0400 +Subject: [PATCH] Include netcorapp5.0 versions in libraries nupkgs +Assets for netcoreapp3.0 are not built in source-build because we don't +have references for past netcoreapp versions. That leaves the packages +built by the libraries build with a placeholder for netcoreapp3.0, which +causes issues with consumption of these packages in dependent repos. +Packages for netcoreapp5.0 are built but not packaged by design. This +patch includes these assets in the packages built by the libraries +build, only for the source-build build. + +--- + src/libraries/Directory.Build.targets | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets +index 16af4c2e85b..e54dc3e8699 100644 +--- a/src/libraries/Directory.Build.targets ++++ b/src/libraries/Directory.Build.targets +@@ -228,7 +228,8 @@ + + + +- true ++ true + true + + +-- +2.18.2 + From 537a09780023a24b100773b2acdb49fb909d9ac2 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 11 Jun 2020 21:50:04 +0000 Subject: [PATCH 16/57] Don't remove Arcade from restored pkgs cache --- repos/Directory.Build.targets | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/repos/Directory.Build.targets b/repos/Directory.Build.targets index 32225a3fc0..d3df1bb293 100644 --- a/repos/Directory.Build.targets +++ b/repos/Directory.Build.targets @@ -300,7 +300,13 @@ Condition="'@(_BuiltPackages)'!=''" DependsOnTargets="GatherBuiltPackages"> - + + + + + + From a4729a8abe2002ae8f3d0774ffba2516548d7df0 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 12 Jun 2020 11:06:17 -0400 Subject: [PATCH 17/57] Pickup renamed ILLink.Tasks in runtime --- ...Microsoft.NET.ILLink.Tasks-package-3.patch | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 patches/runtime/0016-Pick-up-renamed-Microsoft.NET.ILLink.Tasks-package-3.patch diff --git a/patches/runtime/0016-Pick-up-renamed-Microsoft.NET.ILLink.Tasks-package-3.patch b/patches/runtime/0016-Pick-up-renamed-Microsoft.NET.ILLink.Tasks-package-3.patch new file mode 100644 index 0000000000..5d41179c7f --- /dev/null +++ b/patches/runtime/0016-Pick-up-renamed-Microsoft.NET.ILLink.Tasks-package-3.patch @@ -0,0 +1,81 @@ +From f12ba0c7e6d10e294c2e12ced6fde876e2d91d95 Mon Sep 17 00:00:00 2001 +From: Sven Boemer +Date: Fri, 24 Apr 2020 11:17:25 -0700 +Subject: [PATCH] Pick up renamed Microsoft.NET.ILLink.Tasks package (#35214) + +--- + eng/Version.Details.xml | 4 ++-- + eng/Versions.props | 2 +- + eng/illink.targets | 6 +++--- + .../CreateRuntimeRootILLinkDescriptorFile.targets | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 9429dea219b..d5e61095b96 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -170,9 +170,9 @@ + https://github.com/dotnet/runtime + 0375524a91a47ca4db3ee1be548f74bab7e26e76 + +- ++ + https://github.com/mono/linker +- 8caef57d1f3bc7a188e5dd26d43a2d34151223f9 ++ 7573e99c7665f565fe4a6ac4784d5c641213d5e1 + + + https://github.com/dotnet/xharness +diff --git a/eng/Versions.props b/eng/Versions.props +index eb866a69686..f5e397adda1 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -123,7 +123,7 @@ + + 3.1.0-preview-20200129.1 + +- 5.0.0-preview.3.20210.1 ++ 5.0.0-preview.3.20220.1 + + 6.0.1-alpha.1.20206.1 + 6.0.1-alpha.1.20206.1 +diff --git a/eng/illink.targets b/eng/illink.targets +index cecc5c2a5a3..ac7db3b9095 100644 +--- a/eng/illink.targets ++++ b/eng/illink.targets +@@ -8,8 +8,8 @@ + + + +- + +- $([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools')) ++ $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NET_ILLink_Tasks)', 'tools')) + $(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll + $(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll + $(IntermediateOutputPath)$(TargetName)$(TargetExt) +diff --git a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +index d06367c480c..a40473eb98a 100644 +--- a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets ++++ b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +@@ -11,7 +11,7 @@ + <_CortypeFilePath Condition=" '$(_CortypeFilePath)' == '' ">$(MSBuildThisFileDirectory)..\inc\cortypeinfo.h + <_RexcepFilePath Condition=" '$(_RexcepFilePath)' == '' ">$(MSBuildThisFileDirectory)..\vm\rexcep.h + <_ILLinkTrimXmlFilePath Condition=" '$(_ILLinkTrimXmlFilePath)' == '' ">$(MSBuildThisFileDirectory)ILLinkTrim.xml +- <_ILLinkTasksToolsDir>$(PkgILLink_Tasks)/tools ++ <_ILLinkTasksToolsDir>$(PkgMicrosoft_NET_ILLink_Tasks)/tools + <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/ + <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/ + +-- +2.18.2 + From 6f92df64481992adcc513464c57e3f7da9cd5661 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 12 Jun 2020 15:07:25 +0000 Subject: [PATCH 18/57] Re-add arcade patch for tarball build --- ...dd-reference-to-PlatformAbstractions.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch diff --git a/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch b/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch new file mode 100644 index 0000000000..8746b327bc --- /dev/null +++ b/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch @@ -0,0 +1,32 @@ +From db4c528bb2335f791f46f76f62f392597e298ef0 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 1 Apr 2020 16:32:18 +0000 +Subject: [PATCH] Add reference to PlatformAbstractions + +Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj doesn't have a reference +to PlatformAbstractions. It builds in the production build because it has a +reference to Microsoft.Extensions.DependencyModel, which also brought in +PlatformAbstractions. That dependency has been removed with +https://github.com/dotnet/core-setup/pull/5218. +The tarball build uses a newer version of Microsoft.Extensions.DependencyModel +with the dependency removed, so an explicit dependency needs to be added now until +Arcade removes their dependency on PlatormAbstractions. +--- + .../Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj +index 36c9b5f..d2e1526 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj ++++ b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj +@@ -19,6 +19,7 @@ + + + ++ + + + +-- +1.8.3.1 + From 099ce5f494ac8130c94f0aeb44be9521ffa9a3d1 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 12 Jun 2020 15:50:01 +0000 Subject: [PATCH 19/57] Re-enable building source-built-artifacts tarball --- repos/known-good.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/known-good.proj b/repos/known-good.proj index c92c202f03..e8ce03c0e1 100644 --- a/repos/known-good.proj +++ b/repos/known-good.proj @@ -75,7 +75,7 @@ - + From 805f7629d14f5314fd9b0e3e6486d039b1f3fa4d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 12 Jun 2020 15:50:27 +0000 Subject: [PATCH 20/57] Update online baseline --- tools-local/prebuilt-baseline-online.xml | 292 ++++++++++++++++------- 1 file changed, 202 insertions(+), 90 deletions(-) diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index f8fc9bbd85..2bb516ec1b 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -1,39 +1,39 @@ centos.7-x64 - bin/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ - bin/src/arcade.421b20fb860907c45673de791177e3fd61402197/ - bin/src/Extensions.a309c864ab86230b6f118843481673cdd89d6258/ - bin/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - bin/src/AspNetCore-Tooling.2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0/ - bin/src/AspNetCore.c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc/ - bin/src/cli.32fddd23b1e53272472f6feb27f5e12a445b7236/ - bin/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ - bin/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ - bin/src/core-sdk.9c30c9b429add311e047bfb87c4d4119673fa461/ - bin/src/fsharp.1e9d40c8897796e21850bd6dca40e15df69a1c97/ - bin/src/known-good-tests./ - bin/src/known-good./ - bin/src/linker.a9bfc450a9da6b050ba043ca43b9241beb6f3f60/ - bin/src/msbuild.13cfe7fc5a97772e4045671c71fa31a3c0856af0/ + artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ + artifacts/src/arcade.bce0a98620c1c5a110b2bba9912f3d5929069c6b/ + artifacts/src/Extensions.aadd7e9a6bf2bdaa48f7b1aae781a03704adc713/ + artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ + artifacts/src/AspNetCore-Tooling.56c0dbb97a3c542fa9865aad33fe442341786a09/ + artifacts/src/AspNetCore.cdfa43bbe0ecc13757cc6517c9a253de77c3ec56/ + artifacts/src/cli.32fddd23b1e53272472f6feb27f5e12a445b7236/ + artifacts/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ + artifacts/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ + artifacts/src/core-sdk.9c30c9b429add311e047bfb87c4d4119673fa461/ + artifacts/src/fsharp.1bcfb7bc27dc2d482341137150023fc1534506e6/ + artifacts/src/known-good-tests./ + artifacts/src/known-good./ + artifacts/src/linker.7573e99c7665f565fe4a6ac4784d5c641213d5e1/ + artifacts/src/msbuild.80e487bff4b7adced47cab46b3481f1a5f2b3178/ src/netcorecli-fsc/ - bin/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ - bin/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - bin/src/NuGet.Client.64f2febf7d1de8b0228eca5afed97a96c5a30bba/ + artifacts/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ + artifacts/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ + artifacts/src/NuGet.Client.1c2681b16a0bb9be9271abe043a1cbf892761ef8/ src/package-source-build/ - bin/src/roslyn.6f2112b58316c97c4f1b97e0f282aef4346947fc/ - bin/src/runtime.d12f79a4d1b908636b96005fe30f547e54cea3ee/ - bin/src/runtime.d12f79a4d1b908636b96005fe30f547e54cea3ee/ - bin/src/sdk.11d68c998c996a9e033760f4769132cf867de167/ - bin/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ - bin/src/templating.247f60e9e34a03ed99e855eb1ea0c20931a968db/ - bin/src/toolset.a46d93e5e100f9046cb589b5d4ba70bde41f3480/ - bin/src/vstest.55e7e45431c9c05656c999b902686e7402664573/ - bin/src/websdk.589ed451f2bcb51d7f47a37ebf4e3d501979174c/ - bin/src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ + artifacts/src/roslyn.3d85b48dd5e533c7d47e916e2cff417f46bdce10/ + artifacts/src/runtime.47ec733ba79b196e4e09d0c89bad245155002353/ + artifacts/src/runtime.47ec733ba79b196e4e09d0c89bad245155002353/ + artifacts/src/sdk.d06773deef64b4045a2f8256a383fd8dbef6050e/ + artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ + artifacts/src/templating.bb2aad9a623680ecefd731784c97fcbf9e908730/ + artifacts/src/toolset.a46d93e5e100f9046cb589b5d4ba70bde41f3480/ + artifacts/src/vstest.5fd8bb7eabc542fbda5ed8e436f68ca975de0655/ + artifacts/src/websdk.589ed451f2bcb51d7f47a37ebf4e3d501979174c/ + artifacts/src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ Tools/ tools-local/tasks/ - bin/obj/ + artifacts/obj/ @@ -41,85 +41,124 @@ + + - - - - + + + + - - - + + + - - + - + + + + + - - - - - + + + + + + + + - - - - + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - - + + - + - - - + - - - + - @@ -127,8 +166,10 @@ + - + + @@ -145,6 +186,10 @@ + + + + @@ -152,27 +197,39 @@ + + + + + + + + + + + + @@ -197,13 +254,11 @@ - - - - - - - + + + + + @@ -254,8 +309,8 @@ - - + + @@ -263,6 +318,7 @@ + @@ -275,31 +331,48 @@ - + + + + + + + + + + + + + + + + - + + + @@ -308,6 +381,10 @@ + + + + @@ -323,25 +400,32 @@ + + + + + + - + + @@ -350,6 +434,8 @@ + + @@ -358,6 +444,8 @@ + + @@ -368,24 +456,29 @@ + + + + + @@ -398,12 +491,14 @@ - + - + + + @@ -414,6 +509,7 @@ + @@ -421,17 +517,25 @@ + + + + + + + + @@ -442,19 +546,25 @@ + + - - - + + + + - + + + + @@ -467,17 +577,19 @@ - + + - + - + + + - - + From c847586626bf807b297bf1dfd3469f1221a5efdf Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 12 Jun 2020 16:56:23 +0000 Subject: [PATCH 21/57] Remove pacakge-source-build until sdk is building --- repos/known-good.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/known-good.proj b/repos/known-good.proj index e8ce03c0e1..121e090061 100644 --- a/repos/known-good.proj +++ b/repos/known-good.proj @@ -75,7 +75,7 @@ - + From 38277a57d9e74a4802aa6870f83e21c70efdce52 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 12 Jun 2020 19:44:06 +0000 Subject: [PATCH 22/57] Set PVP Env Variable for all repos --- repos/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/Directory.Build.props b/repos/Directory.Build.props index dfee203da7..9c643685f4 100644 --- a/repos/Directory.Build.props +++ b/repos/Directory.Build.props @@ -41,6 +41,7 @@ + From 55c0f23beb02ce5b3a77efd022ee21df01d9003f Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 16 Jun 2020 15:45:36 +0000 Subject: [PATCH 23/57] Set UseStableVersions to false --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 797338ce26..ee66580daf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ $(BuildArchitecture) x64 - true + false +- false ++ false + + +diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +index d97e994912..b85b7dc731 100644 +--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj ++++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +@@ -4,7 +4,7 @@ + + Library + Microsoft.CodeAnalysis.CSharp +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + partial + + +@@ -67,4 +67,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +index a941674490..baa50b5a97 100644 +--- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj ++++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +@@ -4,7 +4,7 @@ + + Library + Microsoft.CodeAnalysis +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + partial + true + +diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +index 828bd70a7b..649af84da7 100644 +--- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj ++++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +@@ -3,7 +3,7 @@ + + + Library +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + + partial + +diff --git a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj +index dcb5df09f2..7d105bb6b1 100644 +--- a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj ++++ b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj +@@ -1,7 +1,7 @@ +  + + +- netcoreapp3.1 ++ netcoreapp5.0 + + true + false +diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets +index 45590df74b..6200a49c3a 100644 +--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets ++++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets +@@ -3,36 +3,36 @@ + + + +- +- +- ++ ++ ++ + +- +- ++ ++ + +- +- ++ ++ + + + + +- +- +- ++ ++ ++ + +- +- +- ++ ++ ++ + +- +- +- ++ ++ ++ + + + +- +- ++ ++ + + + +diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj +index 2178f6f5ee..aa83c11ec6 100644 +--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj ++++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj +@@ -2,7 +2,7 @@ + + + $(RoslynPortableTargetFrameworks) +- netcoreapp3.1 ++ netcoreapp5.0 + + true + false +@@ -26,7 +26,7 @@ + $(NoWarn);NU5100;NU5128 + + <_DependsOn Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts +- <_DependsOn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">InitializeCoreClrCompilerArtifacts ++ <_DependsOn Condition="'$(TargetFramework)' == 'netcoreapp5.0'">InitializeCoreClrCompilerArtifacts + + + +@@ -39,18 +39,18 @@ + Targets="Publish" + ReferenceOutputAssembly="false" + SkipGetTargetFrameworkProperties="true" +- Condition="'$(TargetFramework)' == 'netcoreapp3.1'" +- SetTargetFramework="TargetFramework=netcoreapp3.1" /> ++ Condition="'$(TargetFramework)' == 'netcoreapp5.0'" ++ SetTargetFramework="TargetFramework=netcoreapp5.0" /> + + + + + <_File Include="@(DesktopCompilerArtifact)" TargetDir="tasks/net472"/> + <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tasks/net472"/> +- <_File Include="@(CoreClrCompilerBuildArtifact)" TargetDir="tasks/netcoreapp3.1"/> +- <_File Include="@(CoreClrCompilerToolsArtifact)" TargetDir="tasks/netcoreapp3.1"/> +- <_File Include="@(CoreClrCompilerBinArtifact)" TargetDir="tasks/netcoreapp3.1/bincore"/> +- <_File Include="@(CoreClrCompilerBinRuntimesArtifact)" TargetDir="tasks/netcoreapp3.1/bincore/runtimes"/> ++ <_File Include="@(CoreClrCompilerBuildArtifact)" TargetDir="tasks/netcoreapp5.0"/> ++ <_File Include="@(CoreClrCompilerToolsArtifact)" TargetDir="tasks/netcoreapp5.0"/> ++ <_File Include="@(CoreClrCompilerBinArtifact)" TargetDir="tasks/netcoreapp5.0/bincore"/> ++ <_File Include="@(CoreClrCompilerBinRuntimesArtifact)" TargetDir="tasks/netcoreapp5.0/bincore/runtimes"/> + + <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" Condition="'$(TargetFramework)' == 'net472' or '$(DotNetBuildFromSource)' == 'true'" TargetDir="build" /> + +@@ -59,5 +59,5 @@ + + + +- ++ + +diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/build/Microsoft.Net.Compilers.Toolset.props b/src/NuGet/Microsoft.Net.Compilers.Toolset/build/Microsoft.Net.Compilers.Toolset.props +index 157388e0be..8877fa44f5 100644 +--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/build/Microsoft.Net.Compilers.Toolset.props ++++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/build/Microsoft.Net.Compilers.Toolset.props +@@ -2,7 +2,7 @@ + + + +- <_RoslynTargetDirectoryName Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1 ++ <_RoslynTargetDirectoryName Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp5.0 + <_RoslynTargetDirectoryName Condition="'$(MSBuildRuntimeType)' != 'Core'">net472 + <_RoslynTasksDirectory>$(MSBuildThisFileDirectory)..\tasks\$(_RoslynTargetDirectoryName)\ + $(_RoslynTasksDirectory)Microsoft.Build.Tasks.CodeAnalysis.dll +diff --git a/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj b/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj +index 9aaeb05468..fda1e60688 100644 +--- a/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj ++++ b/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj +@@ -4,7 +4,7 @@ + + Library + Microsoft.CodeAnalysis.CSharp.Scripting +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + + + true +@@ -43,4 +43,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj b/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj +index 6ac1027c56..f04f1dbc06 100644 +--- a/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj ++++ b/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj +@@ -5,7 +5,7 @@ + Library + Microsoft.CodeAnalysis.Scripting + true +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + $(DefineConstants);SCRIPTING + + +diff --git a/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj b/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj +index 515b4aee8e..1e75ad3138 100644 +--- a/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj ++++ b/src/Scripting/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj +@@ -3,7 +3,7 @@ + + + Library +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + + + +@@ -32,4 +32,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj +index 7f3bfc19c0..27fe83c133 100644 +--- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj ++++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj +@@ -5,7 +5,7 @@ + Library + Microsoft.CodeAnalysis.CSharp + true +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + partial + + +@@ -57,4 +57,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +index 7fa438ee58..583b104381 100644 +--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj ++++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +@@ -5,7 +5,7 @@ + Library + Microsoft.CodeAnalysis + true +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + $(DefineConstants);WORKSPACE + true + +diff --git a/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj b/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj +index ce48b7b5c7..33d93f6f4b 100644 +--- a/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj ++++ b/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj +@@ -3,7 +3,7 @@ + + + Library +- netcoreapp3.1;netstandard2.0 ++ netcoreapp5.0;netstandard2.0 + + partial + +@@ -53,4 +53,4 @@ + + + +- +\ No newline at end of file ++ +-- +2.17.1 + From aaed4a46d6e1460dd29bfcf385d9e1b19b030e7b Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 25 Jun 2020 14:47:05 +0000 Subject: [PATCH 25/57] Update previously-source-built packages to a 3.1+5.0 bootstrap archive. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d0a224bb3e..1743ea3994 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,6 +8,6 @@ 1.0.0-beta.20261.1 - 0.1.0-5.0.100-preview.1.20229.1 + 0.1.0-5.0.100-bootstrap.1 From 0621aa06af715de385e3c0d71b2d129e7bcf5935 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 25 Jun 2020 23:04:37 +0000 Subject: [PATCH 26/57] Add patch to use MS.Private.CoreFX.NetCoreApp as netcoreapp3.1 in runtime since that's all previously-source-built supports. --- ...y-override-PackageVersion-properties.patch | 10 +++---- ...02-Exclude-optdata-from-source-build.patch | 8 +++--- ...h => 0003-do-not-fail-on-test-chmod.patch} | 8 +++--- ...-source-build-specific-build-script.patch} | 11 ++++---- ...railing-path-separator-to-repo_root.patch} | 8 +++--- ...-Update-empty-proj-to-netcoreapp2.1.patch} | 8 +++--- ...kage-build-to-pass-in-Configuration.patch} | 8 +++--- ...lt-nopgooptimize-in-build-scripts-u.patch} | 16 ++++++------ ...sionsProps-from-dependencies.props-.patch} | 12 ++++----- ...PackageVersionProps-from-eng-Vervsi.patch} | 12 ++++----- ...11-Fix-UpdatePackageIndex-UsingTask.patch} | 12 ++++----- ...move-RID-calculation-in-favor-of-Ru.patch} | 6 ++--- ...app5.0-versions-in-libraries-nupkgs.patch} | 12 ++++----- ...icrosoft.NET.ILLink.Tasks-package-3.patch} | 7 ++--- ...e-built-MS.Private.CoreFx.NetCoreApp.patch | 26 +++++++++++++++++++ 15 files changed, 95 insertions(+), 69 deletions(-) rename patches/runtime/{0004-do-not-fail-on-test-chmod.patch => 0003-do-not-fail-on-test-chmod.patch} (85%) rename patches/runtime/{0005-Add-source-build-specific-build-script.patch => 0004-Add-source-build-specific-build-script.patch} (93%) rename patches/runtime/{0006-Add-trailing-path-separator-to-repo_root.patch => 0005-Add-trailing-path-separator-to-repo_root.patch} (75%) rename patches/runtime/{0007-Update-empty-proj-to-netcoreapp2.1.patch => 0006-Update-empty-proj-to-netcoreapp2.1.patch} (72%) rename patches/runtime/{0008-Update-NuGet-package-build-to-pass-in-Configuration.patch => 0007-Update-NuGet-package-build-to-pass-in-Configuration.patch} (83%) rename patches/runtime/{0009-Temporarily-default-nopgooptimize-in-build-scripts-u.patch => 0008-Temporarily-default-nopgooptimize-in-build-scripts-u.patch} (78%) rename patches/runtime/{0011-Remove-PackageVersionsProps-from-dependencies.props-.patch => 0009-Remove-PackageVersionsProps-from-dependencies.props-.patch} (69%) rename patches/runtime/{0012-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch => 0010-Remove-import-of-PackageVersionProps-from-eng-Vervsi.patch} (74%) rename patches/runtime/{0013-Fix-UpdatePackageIndex-UsingTask.patch => 0011-Fix-UpdatePackageIndex-UsingTask.patch} (94%) rename patches/runtime/{0014-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch => 0012-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch} (99%) rename patches/runtime/{0015-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch => 0013-Include-netcorapp5.0-versions-in-libraries-nupkgs.patch} (88%) rename patches/runtime/{0016-Pick-up-renamed-Microsoft.NET.ILLink.Tasks-package-3.patch => 0014-Pick-up-renamed-Microsoft.NET.ILLink.Tasks-package-3.patch} (96%) create mode 100644 patches/runtime/0015-Update-for-source-built-MS.Private.CoreFx.NetCoreApp.patch diff --git a/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch b/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch index 8399ab5971..34212e8194 100644 --- a/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch +++ b/patches/runtime/0001-Conditionally-override-PackageVersion-properties.patch @@ -1,14 +1,14 @@ -From 61b086cdbdf7538f5582a13640a030a8cff454e9 Mon Sep 17 00:00:00 2001 +From c1c5c05c6fd96b4d270c446702b45466e487ef4a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 7 Jan 2020 20:35:28 +0000 -Subject: [PATCH] Conditionally override PackageVersion properties +Subject: [PATCH 01/15] Conditionally override PackageVersion properties --- - src/coreclr/dependencies.props | 8 ++++---- + src/coreclr/dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props -index 06a25f2..cf22341 100644 +index 31713f8f725..dcc5c07ccf5 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -7,11 +7,11 @@ @@ -29,5 +29,5 @@ index 06a25f2..cf22341 100644 - - - + + + - + - + + - - - From 40a4c3ede0edc0e5bfe0613d8345871d077b3411 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 23 Jun 2020 09:54:38 -0400 Subject: [PATCH 31/57] Update prebuilt baseline --- tools-local/prebuilt-baseline-online.xml | 36 ++++++++++++++++++------ 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 2bb516ec1b..8306aa69b0 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -1,5 +1,5 @@ - centos.7-x64 + centos.8-x64 artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ artifacts/src/arcade.bce0a98620c1c5a110b2bba9912f3d5929069c6b/ @@ -39,7 +39,7 @@ - + @@ -48,7 +48,6 @@ - @@ -82,6 +81,7 @@ + @@ -122,12 +122,11 @@ - - + @@ -138,13 +137,16 @@ + + + @@ -152,9 +154,11 @@ + + @@ -179,6 +183,8 @@ + + @@ -188,6 +194,7 @@ + @@ -227,6 +234,7 @@ + @@ -316,7 +324,7 @@ - + @@ -365,6 +373,7 @@ + @@ -376,9 +385,11 @@ + + @@ -391,6 +402,7 @@ + @@ -417,6 +429,7 @@ + @@ -430,10 +443,12 @@ - + + + @@ -488,7 +503,7 @@ - + @@ -503,6 +518,7 @@ + @@ -529,7 +545,9 @@ + + @@ -577,7 +595,9 @@ + + From d0caaeace71ba5da8b6f6f2a94f295f2d93d1aff Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 25 Jun 2020 13:21:18 -0400 Subject: [PATCH 32/57] Add and build cosolidated installer project from cli, toolset and core-sdk --- Directory.Build.props | 2 +- eng/Version.Details.xml | 15 +-- ...d-source-build-specific-build-script.patch | 3 +- repos/cli.proj | 115 ----------------- repos/core-sdk.proj | 96 --------------- repos/installer.proj | 116 ++++++++++++++++++ repos/known-good.proj | 8 +- repos/sdk.proj | 16 +++ repos/toolset.proj | 83 ------------- .../PublishCoreSetupBinaries.cs | 2 +- .../PublishToolsetBinaries.cs | 2 +- 11 files changed, 140 insertions(+), 318 deletions(-) delete mode 100644 repos/cli.proj delete mode 100644 repos/core-sdk.proj create mode 100644 repos/installer.proj delete mode 100644 repos/toolset.proj diff --git a/Directory.Build.props b/Directory.Build.props index ee66580daf..bc1ac79a8e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -121,7 +121,7 @@ $(ProjectDir)packages/source-built/ $(CustomPrebuiltSourceBuiltPackagesPath)/ $(OutputPath) - $(LocalBlobStorageRoot)Toolset/ + $(LocalBlobStorageRoot)Sdk/ $(LocalBlobStorageRoot)Runtime/ $(LocalBlobStorageRoot)aspnetcore/Runtime/ $(IntermediatePath)RestoreSources.props diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adc2948557..72c2d0312d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,11 +89,6 @@ cdfa43bbe0ecc13757cc6517c9a253de77c3ec56 aspnetcore - - https://github.com/dotnet/cli - 32fddd23b1e53272472f6feb27f5e12a445b7236 - cli - https://github.com/dotnet/fsharp 1bcfb7bc27dc2d482341137150023fc1534506e6 @@ -106,15 +101,9 @@ https://github.com/microsoft/vstest 5fd8bb7eabc542fbda5ed8e436f68ca975de0655 - - https://github.com/dotnet/toolset - a46d93e5e100f9046cb589b5d4ba70bde41f3480 - toolset - - https://github.com/dotnet/core-sdk - 9c30c9b429add311e047bfb87c4d4119673fa461 - core-sdk + https://github.com/dotnet/installer + b0d47ebe3474026fe5cbef83de2b336d292b6c26 diff --git a/patches/runtime/0004-Add-source-build-specific-build-script.patch b/patches/runtime/0004-Add-source-build-specific-build-script.patch index 445ae118a4..7f2fe5c3db 100644 --- a/patches/runtime/0004-Add-source-build-specific-build-script.patch +++ b/patches/runtime/0004-Add-source-build-specific-build-script.patch @@ -100,7 +100,8 @@ index 00000000000..93d42f9e0a6 +$scriptroot/build.sh $commonArgs -subset libs $librariesArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs +find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "librariesBuild.binlog" * {} \; +echo "Running command: $scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs" -+$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs ++$scriptroot/build.sh $commonArgs -subset corehost+installer.managed+installer.depprojs+installer.pkgprojs+installers+bundles $installerArgs /p:ILAsmToolPath=$ilasmPath $additionalArgs ++find $scriptroot/artifacts/ -type f -name Build.binlog -exec rename "Build.binlog" "installerBuild.binlog" * {} \; -- 2.17.1 diff --git a/repos/cli.proj b/repos/cli.proj deleted file mode 100644 index f5e9aa5dee..0000000000 --- a/repos/cli.proj +++ /dev/null @@ -1,115 +0,0 @@ - - - - - $(TargetRid) - osx-x64 - $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) - - --runtime-id $(OverrideTargetRid) - --runtime-id $(TargetRid) - - --restore --build --pack - $(BuildCommandArgs) --configuration $(Configuration) - $(BuildCommandArgs) $(RuntimeArg) - $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) - - - $(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9 - $(BuildCommandArgs) /p:IncludeMSBuildSdkResolver=false - $(BuildCommandArgs) /p:DefaultTargetLatestAspNetCoreRuntimePatch=true - $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) - $(BuildCommandArgs) /p:OSName=$(OSNameOverride) - - $(BuildCommandArgs) -bl - $(BuildCommandArgs) -ci - $(BuildCommandArgs) -v $(LogVerbosity) - true - - $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) - - $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ - false - true - true - - $(ProjectDirectory)global.json - $(ProjectDirectory)/NuGet.config - - $(SourceBuiltPackagesPath) - $(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) - $(EnvironmentRestoreSources)%3Bhttps://api.nuget.org/v3/index.json - $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/core-sdk.proj b/repos/core-sdk.proj deleted file mode 100644 index dbfa896596..0000000000 --- a/repos/core-sdk.proj +++ /dev/null @@ -1,96 +0,0 @@ - - - - - $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) - - $(BuildCommandArgs) /p:Rid=$(TargetRid) - $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) - $(BuildCommandArgs) /p:OSName=$(OSNameOverride) - - $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true - $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 - $(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid) - $(BuildCommandArgs) -c $(Configuration) - $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) - $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - - - $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) - - $(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) - - - $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) - - $(BuildCommandArgs) /p:SkipBuildingInstallers=true - $(BuildCommandArgs) /p:IncludeNuGetPackageArchive=false - $(BuildCommandArgs) /p:IncludeAdditionalSharedFrameworks=false - $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=$(PortableBuild) - $(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false - $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) - $(BuildCommandArgs) /p:VersionSuffix="$(PreReleaseVersionLabel)" - - true - $(BuildCommandArgs) -v $(LogVerbosity) - $(BuildCommandArgs) -bl - $(BuildCommandArgs) -ci - - $(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs) - - win-x64 - osx-x64 - freebsd-x64 - $(TargetRid) - $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/ - $(PackagesOutput) - false - true - true - - $(SourceBuiltPackagesPath) - $(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) - - - true - $(ProjectDirectory)/NuGet.config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/installer.proj b/repos/installer.proj new file mode 100644 index 0000000000..824d83423a --- /dev/null +++ b/repos/installer.proj @@ -0,0 +1,116 @@ + + + + + $(TargetRid) + osx-x64 + $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) + + --runtime-id $(OverrideTargetRid) + --runtime-id $(TargetRid) + + --restore --build --pack --ci --binaryLog + $(BuildCommandArgs) --configuration $(Configuration) + $(BuildCommandArgs) $(RuntimeArg) + + + $(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9 + $(BuildCommandArgs) /p:OSName=$(OSNameOverride) + $(BuildCommandArgs) /p:Rid=$(TargetRid) + $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) + + + $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) + + $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true + $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 + $(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid) + + + $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) + + + $(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) + + $(BuildCommandArgs) /p:SkipBuildingInstallers=true + $(BuildCommandArgs) /p:IncludeNuGetPackageArchive=false + $(BuildCommandArgs) /p:IncludeAdditionalSharedFrameworks=false + $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false + $(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false + $(BuildCommandArgs) /p:VersionSuffix="$(PreReleaseVersionLabel)" + + $(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs) + + win-x64 + osx-x64 + freebsd-x64 + $(TargetRid) + $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/ + $(PackagesOutput) + false + true + true + + $(SourceBuiltPackagesPath) + $(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) + + + true + $(ProjectDirectory)/NuGet.config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/known-good.proj b/repos/known-good.proj index dbef8f7892..7ad77b1d83 100644 --- a/repos/known-good.proj +++ b/repos/known-good.proj @@ -63,13 +63,7 @@ - - - - - - - + diff --git a/repos/sdk.proj b/repos/sdk.proj index 2b06e0636e..1cfa34c0ac 100644 --- a/repos/sdk.proj +++ b/repos/sdk.proj @@ -24,6 +24,7 @@ true false $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ + $(ProjectDirectory)artifacts/packages/Release/NonShipping/ $(SourceBuiltPackagesPath) $(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) @@ -50,5 +51,20 @@ + + + + + + + + + + + + + + diff --git a/repos/toolset.proj b/repos/toolset.proj deleted file mode 100644 index 8434f2f8e4..0000000000 --- a/repos/toolset.proj +++ /dev/null @@ -1,83 +0,0 @@ - - - - - --pack --ci - $(BuildCommandArgs) /p:Rid=$(TargetRid) - $(BuildCommandArgs) -c $(Configuration) - $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - - - $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) - - - $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) - - $(BuildCommandArgs) /p:IncludeNuGetPackageArchive=false - $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false - $(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false - $(BuildCommandArgs) /p:IncludeMSBuildSdkResolver=false - - true - $(BuildCommandArgs) -v $(LogVerbosity) - - $(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs) - - win-x64 - osx-x64 - freebsd-x64 - $(TargetRid) - $(ProjectDirectory)artifacts/packages/Release/NonShipping/ - - false - true - true - - $(SourceBuiltPackagesPath) - $(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) - - - true - $(ProjectDirectory)/NuGet.config - $(ProjectDirectory)global.json - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs index 1848ba49bb..9f2bc9260f 100644 --- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs +++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs @@ -28,7 +28,7 @@ public class PublishCoreSetupBinaries : Task // dotnet-runtime-rhel.7-x64.2.0.0-preview2-25401-9.tar.gz // dotnet-runtime-2.0.0-preview2-25401-9-rhel.7-x64.tar.gz // the "semver" capture would be 2.0.0-preview2-25401-9 in this case. - protected virtual string VersionMatchRegex => @"(\.|-)(?'semver'[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9]+(-|\.)[0-9]+(-|\.)[0-9]+)?)"; + protected virtual string VersionMatchRegex => @"(\.|-)(?'semver'[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9]+(-|\.)[0-9]+(-|\.)[0-9]+((-|\.)[0-9]+)?)?)"; public override bool Execute() { diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishToolsetBinaries.cs b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishToolsetBinaries.cs index 66796534a5..f10714c05e 100644 --- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishToolsetBinaries.cs +++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishToolsetBinaries.cs @@ -25,6 +25,6 @@ public class PublishToolsetBinaries : PublishCoreSetupBinaries // dotnet-toolset-internal-rhel.7-x64.2.0.0-preview2-25401.tar.gz // dotnet-toolset-langpack-2.0.0-rhel.7-x64.tar.gz // the "semver" capture would be 2.0.0-preview2-25401 in this case. - protected override string VersionMatchRegex => @"(\.|-)(?'semver'[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9]+(\.[0-9]+(\.[0-9]+)?)?)?)"; + protected override string VersionMatchRegex => @"(\.|-)(?'semver'[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9]+(\.[0-9]+(\.[0-9]+(\.[0-9]+)?)?)?)?)"; } } From 92ea279447eedde810ac08a9496da3f7b444d4e1 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 26 Jun 2020 15:52:58 +0000 Subject: [PATCH 33/57] Add patch to update roslyn build path to netcoreapp5.0 --- ...-build-path-to-include-netcoreapp5.0.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/sdk/0007-Update-roslyn-build-path-to-include-netcoreapp5.0.patch diff --git a/patches/sdk/0007-Update-roslyn-build-path-to-include-netcoreapp5.0.patch b/patches/sdk/0007-Update-roslyn-build-path-to-include-netcoreapp5.0.patch new file mode 100644 index 0000000000..903d37b4a5 --- /dev/null +++ b/patches/sdk/0007-Update-roslyn-build-path-to-include-netcoreapp5.0.patch @@ -0,0 +1,25 @@ +From 52ef0c42eed4277fc54eeb0c74f1e01300ea30eb Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 25 Jun 2020 19:56:39 +0000 +Subject: [PATCH] Update roslyn build path to include netcoreapp5.0 + +--- + src/Layout/redist/targets/GenerateLayout.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets +index eb72ffb..37a0db7 100644 +--- a/src/Layout/redist/targets/GenerateLayout.targets ++++ b/src/Layout/redist/targets/GenerateLayout.targets +@@ -20,7 +20,7 @@ + $(OutputPath)/Roslyn + + +- ++ + + + +-- +1.8.3.1 + From 657b9e4ffc8009faa6d1d313939c55bac93fc70b Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 26 Jun 2020 15:53:24 +0000 Subject: [PATCH 34/57] Update smoke-test for 5.0 --- smoke-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smoke-test.sh b/smoke-test.sh index 91a3ee4e6f..b4044f0bfa 100755 --- a/smoke-test.sh +++ b/smoke-test.sh @@ -3,10 +3,10 @@ set -euo pipefail SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" TARBALL_PREFIX=dotnet-sdk- -VERSION_PREFIX=3.1 +VERSION_PREFIX=5.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=3.0.0-preview8-28405-07 +DEV_CERTS_VERSION_DEFAULT=5.0.0-preview.3 __ROOT_REPO=$(cat "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive export DOTNET_CLI_TELEMETRY_OPTOUT=1 From 4e82db2a0fab9b8693e7ef382639230456967fc4 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 26 Jun 2020 15:00:33 +0000 Subject: [PATCH 35/57] Experimental patch for AspNetCore-Tooling. --- ...dk.Razor-for-net472-instead-of-net46.patch | 6 ++--- ...Build-version-to-reference-versions.patch} | 14 +++++------ ...ackage-directly-to-fix-downgrade-war.patch | 23 +++++++++++++++++++ 3 files changed, 33 insertions(+), 10 deletions(-) rename patches/aspnetcore-tooling/{0004-Pin-MSBuild-version-to-reference-versions.patch => 0002-Pin-MSBuild-version-to-reference-versions.patch} (87%) create mode 100644 patches/aspnetcore-tooling/0003-Reference-this-package-directly-to-fix-downgrade-war.patch diff --git a/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch b/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch index fdbcb08f10..4230dba54c 100644 --- a/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch +++ b/patches/aspnetcore-tooling/0001-Build-MS.NET.Sdk.Razor-for-net472-instead-of-net46.patch @@ -1,7 +1,7 @@ -From 6c171bdaeb7e57ea8ac28ea012f1957acb3783b5 Mon Sep 17 00:00:00 2001 +From f7b91be23605c4bb8393f93f043b32862bef5344 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 9 Jun 2020 08:49:57 -0400 -Subject: [PATCH] Build MS.NET.Sdk.Razor for net472 instead of net46 +Subject: [PATCH 1/3] Build MS.NET.Sdk.Razor for net472 instead of net46 --- .../Microsoft.NET.Sdk.Razor.csproj | 10 +++++----- @@ -59,5 +59,5 @@ index dfee69656..32ff9711b 100644 -- -2.18.2 +2.17.1 diff --git a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch b/patches/aspnetcore-tooling/0002-Pin-MSBuild-version-to-reference-versions.patch similarity index 87% rename from patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch rename to patches/aspnetcore-tooling/0002-Pin-MSBuild-version-to-reference-versions.patch index a4c1462638..8176860114 100644 --- a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch +++ b/patches/aspnetcore-tooling/0002-Pin-MSBuild-version-to-reference-versions.patch @@ -1,15 +1,15 @@ -From 266ab46a74e95417479013537d09594043772105 Mon Sep 17 00:00:00 2001 +From 22337d4eda98032c95ef627a9058b80d19fbbb2a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 15 May 2020 16:32:21 +0000 -Subject: [PATCH] Pin MSBuild version to reference versions +Subject: [PATCH 2/3] Pin MSBuild version to reference versions --- - src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 4 ++-- - .../Microsoft.VisualStudio.LanguageServices.Razor.csproj | 4 ++-- + .../Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 4 ++-- + .../Microsoft.VisualStudio.LanguageServices.Razor.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj -index 4f8ecce..5a433ed 100644 +index 4f8eccee6..5a433ed10 100644 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj @@ -16,8 +16,8 @@ @@ -24,7 +24,7 @@ index 4f8ecce..5a433ed 100644 diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj -index 3ea0d8e..74fc451 100644 +index 3ea0d8e13..74fc451c5 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj @@ -18,8 +18,8 @@ @@ -39,5 +39,5 @@ index 3ea0d8e..74fc451 100644 -- -1.8.3.1 +2.17.1 diff --git a/patches/aspnetcore-tooling/0003-Reference-this-package-directly-to-fix-downgrade-war.patch b/patches/aspnetcore-tooling/0003-Reference-this-package-directly-to-fix-downgrade-war.patch new file mode 100644 index 0000000000..7c5c924b8b --- /dev/null +++ b/patches/aspnetcore-tooling/0003-Reference-this-package-directly-to-fix-downgrade-war.patch @@ -0,0 +1,23 @@ +From fa817fa2f7acfadf7ce4626f7eb7e271d3523d52 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Fri, 26 Jun 2020 14:59:28 +0000 +Subject: [PATCH 3/3] Reference this package directly to fix downgrade warning. + +--- + .../Microsoft.CodeAnalysis.Razor.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj +index 5a294ccb6..725f48000 100644 +--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj ++++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor/Microsoft.CodeAnalysis.Razor.csproj +@@ -12,5 +12,6 @@ + + + ++ + + +-- +2.17.1 + From 757aef8a59340a78badd4b2f671aa82102d9939d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 27 Jun 2020 21:25:44 +0000 Subject: [PATCH 36/57] Upgrade ref packages and previously-source-built packages. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1743ea3994..9506e4e8b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 1.0.0-beta.20261.1 - 0.1.0-5.0.100-bootstrap.1 + 1.0.0-beta.20327.3 + 0.1.0-5.0.100-bootstrap.2 From 6b7439e0a0a7a71e6dedb7c10f64e526e67271ba Mon Sep 17 00:00:00 2001 From: dseefeld Date: Mon, 29 Jun 2020 11:23:09 -0400 Subject: [PATCH 37/57] Update SBRP version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9506e4e8b0..24fbc97829 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ - 1.0.0-beta.20327.3 + 1.0.0-beta.20329.1 0.1.0-5.0.100-bootstrap.2 From d7ee9ad273206b3cef5a6c872aa9608efcbc6095 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sun, 28 Jun 2020 21:58:28 +0000 Subject: [PATCH 38/57] Experimental - try live source-built versions for RepoTasks --- ...y-with-source-built-version-of-NuGet.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 patches/aspnetcore/0016-Try-with-source-built-version-of-NuGet.patch diff --git a/patches/aspnetcore/0016-Try-with-source-built-version-of-NuGet.patch b/patches/aspnetcore/0016-Try-with-source-built-version-of-NuGet.patch new file mode 100644 index 0000000000..027bfd065c --- /dev/null +++ b/patches/aspnetcore/0016-Try-with-source-built-version-of-NuGet.patch @@ -0,0 +1,35 @@ +From 8a40357e5527fd036e8e2bd6cff78ae9261944cd Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 28 Jun 2020 18:41:22 +0000 +Subject: [PATCH 12/12] Try with source-built version of NuGet. + +--- + eng/tools/RepoTasks/RepoTasks.csproj | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj +index 3cacb7d190..3f4b7a893f 100644 +--- a/eng/tools/RepoTasks/RepoTasks.csproj ++++ b/eng/tools/RepoTasks/RepoTasks.csproj +@@ -12,14 +12,14 @@ + + + +- ++ + + + + +- +- +- ++ ++ ++ + + + +-- +2.17.1 + From 914ff416aa059be9aab2ebdaf59a18f29fe0d60d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 29 Jun 2020 16:42:17 +0000 Subject: [PATCH 39/57] Add SDK patch to remove test projects from the solution. --- patches/sdk/0008-Remove-test-project.patch | 643 +++++++++++++++++++++ 1 file changed, 643 insertions(+) create mode 100644 patches/sdk/0008-Remove-test-project.patch diff --git a/patches/sdk/0008-Remove-test-project.patch b/patches/sdk/0008-Remove-test-project.patch new file mode 100644 index 0000000000..b1e07208bd --- /dev/null +++ b/patches/sdk/0008-Remove-test-project.patch @@ -0,0 +1,643 @@ +From 0b891b1219a65ad1b171e95a4ce6360f6de51d86 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 28 Jun 2020 21:59:35 +0000 +Subject: [PATCH 8/8] Remove test project. + +--- + sdk.sln | 175 ------------ + .../v1/dotnet-hello/dotnet-hello.csproj | 16 -- + .../BuildTestPackages.targets | 16 -- + toolset/Microsoft.DotNet.Cli.sln | 270 ------------------ + 4 files changed, 477 deletions(-) + delete mode 100644 src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj + +diff --git a/sdk.sln b/sdk.sln +index f9bf3ddc5..024fc3b6c 100644 +--- a/sdk.sln ++++ b/sdk.sln +@@ -45,8 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{1FEED16D + EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Extensions.Tasks", "src\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj", "{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}" + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Extensions.Tasks.UnitTests", "src\Tasks\Microsoft.NET.Build.Extensions.Tasks.UnitTests\Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj", "{6ADADB58-92D3-438C-8D97-F495B59A83C0}" +-EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Tasks", "src\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj", "{9CFC1EB5-8CF4-41D3-B91D-7D88B52F0B07}" + EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Tasks.UnitTests", "src\Tasks\Microsoft.NET.Build.Tasks.UnitTests\Microsoft.NET.Build.Tasks.UnitTests.csproj", "{2D749C5D-B033-4B7F-A00E-354A6229DB8D}" +@@ -58,27 +56,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{529365 + src\Tests\Common\Program.cs = src\Tests\Common\Program.cs + EndProjectSection + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Tests", "src\Tests\Microsoft.NET.Build.Tests\Microsoft.NET.Build.Tests.csproj", "{52CB4546-DD2D-4207-B6E1-494C9506D1C1}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Clean.Tests", "src\Tests\Microsoft.NET.Clean.Tests\Microsoft.NET.Clean.Tests.csproj", "{5CBFF0EE-71EA-49CC-8369-34A9A62C8116}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Pack.Tests", "src\Tests\Microsoft.NET.Pack.Tests\Microsoft.NET.Pack.Tests.csproj", "{8746DC05-3035-4F24-9F2C-BAAAB5B50FD3}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Publish.Tests", "src\Tests\Microsoft.NET.Publish.Tests\Microsoft.NET.Publish.Tests.csproj", "{5B3E6EC9-AD8D-4F68-A9F8-C60CF11F4753}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Rebuild.Tests", "src\Tests\Microsoft.NET.Rebuild.Tests\Microsoft.NET.Rebuild.Tests.csproj", "{8283544E-9704-40C5-BEC2-2781413AA3CF}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Restore.Tests", "src\Tests\Microsoft.NET.Restore.Tests\Microsoft.NET.Restore.Tests.csproj", "{112668D7-322D-4F83-A6CE-B814C25AD3BF}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.TestFramework", "src\Tests\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj", "{CAF71BDC-7B7D-4A43-AB8C-E440A1E4F108}" +-EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandLine", "CommandLine", "{7C6A88D0-DBCC-4933-A92D-A0AC133DD5FC}" + ProjectSection(SolutionItems) = preProject + src\Tests\Common\CommandLine\TestCommandLine.Default.cs = src\Tests\Common\CommandLine\TestCommandLine.Default.cs + EndProjectSection + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.ToolPack.Tests", "src\Tests\Microsoft.NET.ToolPack.Tests\Microsoft.NET.ToolPack.Tests.csproj", "{6F72FAA2-4E46-4382-940A-4F0290E070E2}" +-EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelemetryStdOutLogger", "src\Tests\TelemetryStdOutLogger\TelemetryStdOutLogger.csproj", "{E740A596-2CAE-476C-8062-49705C3A9CF0}" + EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cli", "Cli", "{9CEF03F6-1A61-431A-8ABD-9095974629AE}" +@@ -105,40 +87,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\Layout\redist + EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "toolset-tasks", "src\Layout\toolset-tasks\toolset-tasks.csproj", "{C687CA8D-9843-4045-BC20-917953F6C864}" + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msbuild.Tests.Utilities", "src\Tests\Msbuild.Tests.Utilities\Msbuild.Tests.Utilities.csproj", "{64294C35-9001-4FF9-975F-43D283EE5FA9}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet.Tests", "src\Tests\dotnet.Tests\dotnet.Tests.csproj", "{C5F191E5-BF2E-4A7A-AE1D-E2393AAA6F99}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.ComponentMocks", "src\Tests\Microsoft.DotNet.Tools.Tests.ComponentMocks\Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj", "{99334000-EBF8-44D9-90D0-BE998ED3FE60}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-msbuild.Tests", "src\Tests\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{8FB015CE-1900-41EE-8E68-C222CE1B8561}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sln.Tests", "src\Tests\dotnet-sln.Tests\dotnet-sln.Tests.csproj", "{5D421BE2-66A9-43FC-877C-620ACED021EB}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsReflector", "src\Tests\ArgumentsReflector\ArgumentsReflector.csproj", "{587A6639-FA2A-498C-8FA2-F77925DB732B}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwarding.Tests", "src\Tests\ArgumentForwarding.Tests\ArgumentForwarding.Tests.csproj", "{2D8AA9EA-3013-47DE-B2DD-E074F67467ED}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd.Tests", "src\Tests\EndToEnd.Tests\EndToEnd.Tests.csproj", "{A0EFB2CB-517F-4746-902E-D0EBEFFBD89B}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallationScript.Tests", "src\Tests\InstallationScript.Tests\InstallationScript.Tests.csproj", "{1552D0BB-6B8D-400E-A9B4-F58C0BA1C903}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "src\Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{82D910C3-A5E2-41F0-A142-F4F2D770CB59}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Utils.Tests", "src\Tests\Microsoft.DotNet.Cli.Utils.Tests\Microsoft.DotNet.Cli.Utils.Tests.csproj", "{C34FB893-2320-41A3-9D38-0061C22A6464}" +-EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSBuildSdkResolver", "src\Microsoft.DotNet.MSBuildSdkResolver\Microsoft.DotNet.MSBuildSdkResolver.csproj", "{FE88C711-9AFF-484F-B5E2-80D13FB82C2F}" + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSBuildSdkResolver.Tests", "src\Tests\Microsoft.DotNet.MSBuildSdkResolver.Tests\Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj", "{0AE2AB83-1F0D-4E04-9C8D-5C35CE97FDDC}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ToolPackage.Tests", "src\Tests\Microsoft.DotNet.ToolPackage.Tests\Microsoft.DotNet.ToolPackage.Tests.csproj", "{3D20D19D-74FB-4A43-B78C-B0AF90A696A0}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities.Tests", "src\Tests\Microsoft.DotNet.Tools.Tests.Utilities.Tests\Microsoft.DotNet.Tools.Tests.Utilities.Tests.csproj", "{BE6B9618-2262-4FF7-B762-FB97A7A1A0B8}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msbuild.Integration.Tests", "src\Tests\msbuild.Integration.Tests\msbuild.Integration.Tests.csproj", "{45281FB4-EAFA-4D62-84BA-47546C04D653}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelixTasks", "src\Tests\HelixTasks\HelixTasks.csproj", "{818165C4-6D22-4FA6-AAAF-DC66DA72450A}" +-EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU +@@ -149,10 +99,6 @@ Global + {61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}.Release|Any CPU.Build.0 = Release|Any CPU +- {6ADADB58-92D3-438C-8D97-F495B59A83C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {6ADADB58-92D3-438C-8D97-F495B59A83C0}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {6ADADB58-92D3-438C-8D97-F495B59A83C0}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {6ADADB58-92D3-438C-8D97-F495B59A83C0}.Release|Any CPU.Build.0 = Release|Any CPU + {9CFC1EB5-8CF4-41D3-B91D-7D88B52F0B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9CFC1EB5-8CF4-41D3-B91D-7D88B52F0B07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9CFC1EB5-8CF4-41D3-B91D-7D88B52F0B07}.Release|Any CPU.ActiveCfg = Release|Any CPU +@@ -161,38 +107,6 @@ Global + {2D749C5D-B033-4B7F-A00E-354A6229DB8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D749C5D-B033-4B7F-A00E-354A6229DB8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D749C5D-B033-4B7F-A00E-354A6229DB8D}.Release|Any CPU.Build.0 = Release|Any CPU +- {52CB4546-DD2D-4207-B6E1-494C9506D1C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {52CB4546-DD2D-4207-B6E1-494C9506D1C1}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {52CB4546-DD2D-4207-B6E1-494C9506D1C1}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {52CB4546-DD2D-4207-B6E1-494C9506D1C1}.Release|Any CPU.Build.0 = Release|Any CPU +- {5CBFF0EE-71EA-49CC-8369-34A9A62C8116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {5CBFF0EE-71EA-49CC-8369-34A9A62C8116}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {5CBFF0EE-71EA-49CC-8369-34A9A62C8116}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {5CBFF0EE-71EA-49CC-8369-34A9A62C8116}.Release|Any CPU.Build.0 = Release|Any CPU +- {8746DC05-3035-4F24-9F2C-BAAAB5B50FD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {8746DC05-3035-4F24-9F2C-BAAAB5B50FD3}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {8746DC05-3035-4F24-9F2C-BAAAB5B50FD3}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {8746DC05-3035-4F24-9F2C-BAAAB5B50FD3}.Release|Any CPU.Build.0 = Release|Any CPU +- {5B3E6EC9-AD8D-4F68-A9F8-C60CF11F4753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {5B3E6EC9-AD8D-4F68-A9F8-C60CF11F4753}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {5B3E6EC9-AD8D-4F68-A9F8-C60CF11F4753}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {5B3E6EC9-AD8D-4F68-A9F8-C60CF11F4753}.Release|Any CPU.Build.0 = Release|Any CPU +- {8283544E-9704-40C5-BEC2-2781413AA3CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {8283544E-9704-40C5-BEC2-2781413AA3CF}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {8283544E-9704-40C5-BEC2-2781413AA3CF}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {8283544E-9704-40C5-BEC2-2781413AA3CF}.Release|Any CPU.Build.0 = Release|Any CPU +- {112668D7-322D-4F83-A6CE-B814C25AD3BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {112668D7-322D-4F83-A6CE-B814C25AD3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {112668D7-322D-4F83-A6CE-B814C25AD3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {112668D7-322D-4F83-A6CE-B814C25AD3BF}.Release|Any CPU.Build.0 = Release|Any CPU +- {CAF71BDC-7B7D-4A43-AB8C-E440A1E4F108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {CAF71BDC-7B7D-4A43-AB8C-E440A1E4F108}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {CAF71BDC-7B7D-4A43-AB8C-E440A1E4F108}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {CAF71BDC-7B7D-4A43-AB8C-E440A1E4F108}.Release|Any CPU.Build.0 = Release|Any CPU +- {6F72FAA2-4E46-4382-940A-4F0290E070E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {6F72FAA2-4E46-4382-940A-4F0290E070E2}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {6F72FAA2-4E46-4382-940A-4F0290E070E2}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {6F72FAA2-4E46-4382-940A-4F0290E070E2}.Release|Any CPU.Build.0 = Release|Any CPU + {E740A596-2CAE-476C-8062-49705C3A9CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E740A596-2CAE-476C-8062-49705C3A9CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E740A596-2CAE-476C-8062-49705C3A9CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU +@@ -237,74 +151,10 @@ Global + {C687CA8D-9843-4045-BC20-917953F6C864}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C687CA8D-9843-4045-BC20-917953F6C864}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C687CA8D-9843-4045-BC20-917953F6C864}.Release|Any CPU.Build.0 = Release|Any CPU +- {64294C35-9001-4FF9-975F-43D283EE5FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {64294C35-9001-4FF9-975F-43D283EE5FA9}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {64294C35-9001-4FF9-975F-43D283EE5FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {64294C35-9001-4FF9-975F-43D283EE5FA9}.Release|Any CPU.Build.0 = Release|Any CPU +- {C5F191E5-BF2E-4A7A-AE1D-E2393AAA6F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {C5F191E5-BF2E-4A7A-AE1D-E2393AAA6F99}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {C5F191E5-BF2E-4A7A-AE1D-E2393AAA6F99}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {C5F191E5-BF2E-4A7A-AE1D-E2393AAA6F99}.Release|Any CPU.Build.0 = Release|Any CPU +- {99334000-EBF8-44D9-90D0-BE998ED3FE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {99334000-EBF8-44D9-90D0-BE998ED3FE60}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {99334000-EBF8-44D9-90D0-BE998ED3FE60}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {99334000-EBF8-44D9-90D0-BE998ED3FE60}.Release|Any CPU.Build.0 = Release|Any CPU +- {8FB015CE-1900-41EE-8E68-C222CE1B8561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {8FB015CE-1900-41EE-8E68-C222CE1B8561}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {8FB015CE-1900-41EE-8E68-C222CE1B8561}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {8FB015CE-1900-41EE-8E68-C222CE1B8561}.Release|Any CPU.Build.0 = Release|Any CPU +- {5D421BE2-66A9-43FC-877C-620ACED021EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {5D421BE2-66A9-43FC-877C-620ACED021EB}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {5D421BE2-66A9-43FC-877C-620ACED021EB}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {5D421BE2-66A9-43FC-877C-620ACED021EB}.Release|Any CPU.Build.0 = Release|Any CPU +- {587A6639-FA2A-498C-8FA2-F77925DB732B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {587A6639-FA2A-498C-8FA2-F77925DB732B}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {587A6639-FA2A-498C-8FA2-F77925DB732B}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {587A6639-FA2A-498C-8FA2-F77925DB732B}.Release|Any CPU.Build.0 = Release|Any CPU +- {2D8AA9EA-3013-47DE-B2DD-E074F67467ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {2D8AA9EA-3013-47DE-B2DD-E074F67467ED}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {2D8AA9EA-3013-47DE-B2DD-E074F67467ED}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {2D8AA9EA-3013-47DE-B2DD-E074F67467ED}.Release|Any CPU.Build.0 = Release|Any CPU +- {A0EFB2CB-517F-4746-902E-D0EBEFFBD89B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {A0EFB2CB-517F-4746-902E-D0EBEFFBD89B}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {A0EFB2CB-517F-4746-902E-D0EBEFFBD89B}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {A0EFB2CB-517F-4746-902E-D0EBEFFBD89B}.Release|Any CPU.Build.0 = Release|Any CPU +- {1552D0BB-6B8D-400E-A9B4-F58C0BA1C903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {1552D0BB-6B8D-400E-A9B4-F58C0BA1C903}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {1552D0BB-6B8D-400E-A9B4-F58C0BA1C903}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {1552D0BB-6B8D-400E-A9B4-F58C0BA1C903}.Release|Any CPU.Build.0 = Release|Any CPU +- {82D910C3-A5E2-41F0-A142-F4F2D770CB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {82D910C3-A5E2-41F0-A142-F4F2D770CB59}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {82D910C3-A5E2-41F0-A142-F4F2D770CB59}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {82D910C3-A5E2-41F0-A142-F4F2D770CB59}.Release|Any CPU.Build.0 = Release|Any CPU +- {C34FB893-2320-41A3-9D38-0061C22A6464}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {C34FB893-2320-41A3-9D38-0061C22A6464}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {C34FB893-2320-41A3-9D38-0061C22A6464}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {C34FB893-2320-41A3-9D38-0061C22A6464}.Release|Any CPU.Build.0 = Release|Any CPU + {FE88C711-9AFF-484F-B5E2-80D13FB82C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE88C711-9AFF-484F-B5E2-80D13FB82C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE88C711-9AFF-484F-B5E2-80D13FB82C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE88C711-9AFF-484F-B5E2-80D13FB82C2F}.Release|Any CPU.Build.0 = Release|Any CPU +- {0AE2AB83-1F0D-4E04-9C8D-5C35CE97FDDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {0AE2AB83-1F0D-4E04-9C8D-5C35CE97FDDC}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {0AE2AB83-1F0D-4E04-9C8D-5C35CE97FDDC}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {0AE2AB83-1F0D-4E04-9C8D-5C35CE97FDDC}.Release|Any CPU.Build.0 = Release|Any CPU +- {3D20D19D-74FB-4A43-B78C-B0AF90A696A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {3D20D19D-74FB-4A43-B78C-B0AF90A696A0}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {3D20D19D-74FB-4A43-B78C-B0AF90A696A0}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {3D20D19D-74FB-4A43-B78C-B0AF90A696A0}.Release|Any CPU.Build.0 = Release|Any CPU +- {BE6B9618-2262-4FF7-B762-FB97A7A1A0B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {BE6B9618-2262-4FF7-B762-FB97A7A1A0B8}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {BE6B9618-2262-4FF7-B762-FB97A7A1A0B8}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {BE6B9618-2262-4FF7-B762-FB97A7A1A0B8}.Release|Any CPU.Build.0 = Release|Any CPU +- {45281FB4-EAFA-4D62-84BA-47546C04D653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {45281FB4-EAFA-4D62-84BA-47546C04D653}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {45281FB4-EAFA-4D62-84BA-47546C04D653}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {45281FB4-EAFA-4D62-84BA-47546C04D653}.Release|Any CPU.Build.0 = Release|Any CPU +- {818165C4-6D22-4FA6-AAAF-DC66DA72450A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {818165C4-6D22-4FA6-AAAF-DC66DA72450A}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {818165C4-6D22-4FA6-AAAF-DC66DA72450A}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {818165C4-6D22-4FA6-AAAF-DC66DA72450A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE +@@ -312,20 +162,11 @@ Global + GlobalSection(NestedProjects) = preSolution + {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} + {61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} +- {6ADADB58-92D3-438C-8D97-F495B59A83C0} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} + {9CFC1EB5-8CF4-41D3-B91D-7D88B52F0B07} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} + {2D749C5D-B033-4B7F-A00E-354A6229DB8D} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} + {580D1AE7-AA8F-4912-8B76-105594E00B3B} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} + {5293658E-96D2-421F-A789-D0B6BA129570} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {52CB4546-DD2D-4207-B6E1-494C9506D1C1} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {5CBFF0EE-71EA-49CC-8369-34A9A62C8116} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {8746DC05-3035-4F24-9F2C-BAAAB5B50FD3} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {5B3E6EC9-AD8D-4F68-A9F8-C60CF11F4753} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {8283544E-9704-40C5-BEC2-2781413AA3CF} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {112668D7-322D-4F83-A6CE-B814C25AD3BF} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {CAF71BDC-7B7D-4A43-AB8C-E440A1E4F108} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + {7C6A88D0-DBCC-4933-A92D-A0AC133DD5FC} = {5293658E-96D2-421F-A789-D0B6BA129570} +- {6F72FAA2-4E46-4382-940A-4F0290E070E2} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + {E740A596-2CAE-476C-8062-49705C3A9CF0} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + {9CEF03F6-1A61-431A-8ABD-9095974629AE} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} + {CC25E192-70AD-4D91-B288-3AD40065DBAC} = {9CEF03F6-1A61-431A-8ABD-9095974629AE} +@@ -339,23 +180,7 @@ Global + {C2DF833D-2A83-408B-8122-3038ACDFDFD0} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA} + {AA273ACB-56FE-4F0C-8CC9-C2C45D31491D} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA} + {C687CA8D-9843-4045-BC20-917953F6C864} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA} +- {64294C35-9001-4FF9-975F-43D283EE5FA9} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {C5F191E5-BF2E-4A7A-AE1D-E2393AAA6F99} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {99334000-EBF8-44D9-90D0-BE998ED3FE60} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {8FB015CE-1900-41EE-8E68-C222CE1B8561} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {5D421BE2-66A9-43FC-877C-620ACED021EB} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {587A6639-FA2A-498C-8FA2-F77925DB732B} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {2D8AA9EA-3013-47DE-B2DD-E074F67467ED} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {A0EFB2CB-517F-4746-902E-D0EBEFFBD89B} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {1552D0BB-6B8D-400E-A9B4-F58C0BA1C903} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {82D910C3-A5E2-41F0-A142-F4F2D770CB59} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {C34FB893-2320-41A3-9D38-0061C22A6464} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + {FE88C711-9AFF-484F-B5E2-80D13FB82C2F} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} +- {0AE2AB83-1F0D-4E04-9C8D-5C35CE97FDDC} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {3D20D19D-74FB-4A43-B78C-B0AF90A696A0} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {BE6B9618-2262-4FF7-B762-FB97A7A1A0B8} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {45281FB4-EAFA-4D62-84BA-47546C04D653} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} +- {818165C4-6D22-4FA6-AAAF-DC66DA72450A} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6} +diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +deleted file mode 100644 +index 48a78a6e7..000000000 +--- a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj ++++ /dev/null +@@ -1,16 +0,0 @@ +- +- +- +- +- 1.0.0 +- +- +- +- netcoreapp2.2 +- dotnet-hello +- Exe +- win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64 +- true +- +- +- +diff --git a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets +index 34d58c2f1..611b838eb 100644 +--- a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets ++++ b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets +@@ -84,22 +84,6 @@ + $(Version) + True + +- +- dotnet-hello +- dotnet-hello.csproj +- True +- True +- 1.0.0 +- True +- +- +- dotnet-hello +- dotnet-hello.csproj +- True +- True +- 2.0.0 +- True +- + + dotnet-outputsframeworkversion-netcoreapp1.0 + dotnet-outputsframeworkversion-netcoreapp1.0.csproj +diff --git a/toolset/Microsoft.DotNet.Cli.sln b/toolset/Microsoft.DotNet.Cli.sln +index aa76fd9d1..b2341b0df 100644 +--- a/toolset/Microsoft.DotNet.Cli.sln ++++ b/toolset/Microsoft.DotNet.Cli.sln +@@ -15,12 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuge + EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0D71B6E2-1482-421B-8F2F-9833BC3EDF4F}" + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd.Tests", "test\EndToEnd.Tests\EndToEnd.Tests.csproj", "{1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramework", "test\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{29E6900D-8B16-447B-AB2D-62E609E4171F}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{9E0DC88C-A43C-4969-BAB7-7C10875B386B}" +-EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "toolset-tasks", "src\toolset-tasks\toolset-tasks.csproj", "{2851D499-2329-489A-A85B-1715651F45ED}" + EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Toolset.Internal", "src\Microsoft.Dotnet.Toolset.Internal\Microsoft.Dotnet.Toolset.Internal.csproj", "{F00DB32D-C21C-46E5-AB07-7C6383AB588F}" +@@ -37,38 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer + EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestPackages", "TestPackages", "{2241C6CE-0971-4AC7-9EDB-DAD8FCECF4F5}" + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{87700677-F1FE-49C2-B79C-01C5CDB7AA81}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{85D66176-8329-40C9-A1B7-8492C35E816C}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{2E53270C-CCCA-418E-9DBE-528758859208}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.ComponentMocks", "test\Microsoft.DotNet.Tools.Tests.ComponentMocks\Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj", "{0AB85449-DE04-40EB-AB19-E4751E04D5F4}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{FBD00271-41F0-47CB-8AF1-8175A2850B73}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msbuild.Tests.Utilities", "test\Msbuild.Tests.Utilities\Msbuild.Tests.Utilities.csproj", "{30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sln.Tests", "test\dotnet-sln.Tests\dotnet-sln.Tests.csproj", "{57E0A71C-E041-473D-AA59-03CF274F9F93}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallationScript.Tests", "test\InstallationScript.Tests\InstallationScript.Tests.csproj", "{0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{CEB89C95-2635-4D39-856C-99994321D10F}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Utils.Tests", "test\Microsoft.DotNet.Cli.Utils.Tests\Microsoft.DotNet.Cli.Utils.Tests.csproj", "{48284C30-9F97-4607-9A58-E15D4E2C8D44}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSBuildSdkResolver.Tests", "test\Microsoft.DotNet.MSBuildSdkResolver.Tests\Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj", "{9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}" +-EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSBuildSdkResolver", "src\Microsoft.DotNet.MSBuildSdkResolver\Microsoft.DotNet.MSBuildSdkResolver.csproj", "{7319709A-61EB-4973-AB54-C2CF4F17227B}" + EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ToolPackage.Tests", "test\Microsoft.DotNet.ToolPackage.Tests\Microsoft.DotNet.ToolPackage.Tests.csproj", "{40458A49-573B-4476-81AA-3EDE1693046B}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities.Tests", "test\Microsoft.DotNet.Tools.Tests.Utilities.Tests\Microsoft.DotNet.Tools.Tests.Utilities.Tests.csproj", "{94A6BA3F-7889-4F37-A56E-5FE43089FAB6}" +-EndProject +-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{B4F127D5-859B-44E4-880F-4876126FF866}" +-EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU +@@ -127,42 +91,6 @@ Global + {F6107EE7-E1DB-4C17-AC15-03B3E9925EB8}.Release|x64.Build.0 = Release|Any CPU + {F6107EE7-E1DB-4C17-AC15-03B3E9925EB8}.Release|x86.ActiveCfg = Release|Any CPU + {F6107EE7-E1DB-4C17-AC15-03B3E9925EB8}.Release|x86.Build.0 = Release|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Debug|x64.ActiveCfg = Debug|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Debug|x64.Build.0 = Debug|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Debug|x86.ActiveCfg = Debug|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Debug|x86.Build.0 = Debug|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Release|Any CPU.Build.0 = Release|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Release|x64.ActiveCfg = Release|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Release|x64.Build.0 = Release|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Release|x86.ActiveCfg = Release|Any CPU +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6}.Release|x86.Build.0 = Release|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Debug|x64.ActiveCfg = Debug|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Debug|x64.Build.0 = Debug|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Debug|x86.ActiveCfg = Debug|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Debug|x86.Build.0 = Debug|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Release|Any CPU.Build.0 = Release|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Release|x64.ActiveCfg = Release|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Release|x64.Build.0 = Release|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Release|x86.ActiveCfg = Release|Any CPU +- {29E6900D-8B16-447B-AB2D-62E609E4171F}.Release|x86.Build.0 = Release|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Debug|x64.ActiveCfg = Debug|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Debug|x64.Build.0 = Debug|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Debug|x86.ActiveCfg = Debug|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Debug|x86.Build.0 = Debug|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Release|Any CPU.Build.0 = Release|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Release|x64.ActiveCfg = Release|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Release|x64.Build.0 = Release|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Release|x86.ActiveCfg = Release|Any CPU +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B}.Release|x86.Build.0 = Release|Any CPU + {2851D499-2329-489A-A85B-1715651F45ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2851D499-2329-489A-A85B-1715651F45ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2851D499-2329-489A-A85B-1715651F45ED}.Debug|x64.ActiveCfg = Debug|Any CPU +@@ -247,150 +175,6 @@ Global + {2955828B-0658-4082-9A6B-03E27233676C}.Release|x64.Build.0 = Release|Any CPU + {2955828B-0658-4082-9A6B-03E27233676C}.Release|x86.ActiveCfg = Release|Any CPU + {2955828B-0658-4082-9A6B-03E27233676C}.Release|x86.Build.0 = Release|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Debug|x64.ActiveCfg = Debug|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Debug|x64.Build.0 = Debug|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Debug|x86.ActiveCfg = Debug|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Debug|x86.Build.0 = Debug|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Release|Any CPU.Build.0 = Release|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Release|x64.ActiveCfg = Release|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Release|x64.Build.0 = Release|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Release|x86.ActiveCfg = Release|Any CPU +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81}.Release|x86.Build.0 = Release|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Debug|x64.ActiveCfg = Debug|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Debug|x64.Build.0 = Debug|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Debug|x86.ActiveCfg = Debug|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Debug|x86.Build.0 = Debug|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Release|Any CPU.Build.0 = Release|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Release|x64.ActiveCfg = Release|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Release|x64.Build.0 = Release|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Release|x86.ActiveCfg = Release|Any CPU +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D}.Release|x86.Build.0 = Release|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Debug|x64.ActiveCfg = Debug|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Debug|x64.Build.0 = Debug|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Debug|x86.ActiveCfg = Debug|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Debug|x86.Build.0 = Debug|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Release|Any CPU.Build.0 = Release|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Release|x64.ActiveCfg = Release|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Release|x64.Build.0 = Release|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Release|x86.ActiveCfg = Release|Any CPU +- {85D66176-8329-40C9-A1B7-8492C35E816C}.Release|x86.Build.0 = Release|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Debug|x64.ActiveCfg = Debug|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Debug|x64.Build.0 = Debug|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Debug|x86.ActiveCfg = Debug|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Debug|x86.Build.0 = Debug|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Release|Any CPU.Build.0 = Release|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Release|x64.ActiveCfg = Release|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Release|x64.Build.0 = Release|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Release|x86.ActiveCfg = Release|Any CPU +- {2E53270C-CCCA-418E-9DBE-528758859208}.Release|x86.Build.0 = Release|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Debug|x64.ActiveCfg = Debug|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Debug|x64.Build.0 = Debug|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Debug|x86.ActiveCfg = Debug|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Debug|x86.Build.0 = Debug|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Release|Any CPU.Build.0 = Release|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Release|x64.ActiveCfg = Release|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Release|x64.Build.0 = Release|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Release|x86.ActiveCfg = Release|Any CPU +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4}.Release|x86.Build.0 = Release|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Debug|x64.ActiveCfg = Debug|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Debug|x64.Build.0 = Debug|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Debug|x86.ActiveCfg = Debug|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Debug|x86.Build.0 = Debug|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Release|Any CPU.Build.0 = Release|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Release|x64.ActiveCfg = Release|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Release|x64.Build.0 = Release|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Release|x86.ActiveCfg = Release|Any CPU +- {FBD00271-41F0-47CB-8AF1-8175A2850B73}.Release|x86.Build.0 = Release|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Debug|x64.ActiveCfg = Debug|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Debug|x64.Build.0 = Debug|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Debug|x86.ActiveCfg = Debug|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Debug|x86.Build.0 = Debug|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Release|Any CPU.Build.0 = Release|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Release|x64.ActiveCfg = Release|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Release|x64.Build.0 = Release|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Release|x86.ActiveCfg = Release|Any CPU +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3}.Release|x86.Build.0 = Release|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Debug|x64.ActiveCfg = Debug|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Debug|x64.Build.0 = Debug|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Debug|x86.ActiveCfg = Debug|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Debug|x86.Build.0 = Debug|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Release|Any CPU.Build.0 = Release|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Release|x64.ActiveCfg = Release|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Release|x64.Build.0 = Release|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Release|x86.ActiveCfg = Release|Any CPU +- {57E0A71C-E041-473D-AA59-03CF274F9F93}.Release|x86.Build.0 = Release|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Debug|x64.ActiveCfg = Debug|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Debug|x64.Build.0 = Debug|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Debug|x86.ActiveCfg = Debug|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Debug|x86.Build.0 = Debug|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Release|Any CPU.Build.0 = Release|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Release|x64.ActiveCfg = Release|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Release|x64.Build.0 = Release|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Release|x86.ActiveCfg = Release|Any CPU +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA}.Release|x86.Build.0 = Release|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Debug|x64.ActiveCfg = Debug|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Debug|x64.Build.0 = Debug|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Debug|x86.ActiveCfg = Debug|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Debug|x86.Build.0 = Debug|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Release|Any CPU.Build.0 = Release|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Release|x64.ActiveCfg = Release|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Release|x64.Build.0 = Release|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Release|x86.ActiveCfg = Release|Any CPU +- {CEB89C95-2635-4D39-856C-99994321D10F}.Release|x86.Build.0 = Release|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Debug|x64.ActiveCfg = Debug|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Debug|x64.Build.0 = Debug|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Debug|x86.ActiveCfg = Debug|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Debug|x86.Build.0 = Debug|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Release|Any CPU.Build.0 = Release|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Release|x64.ActiveCfg = Release|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Release|x64.Build.0 = Release|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Release|x86.ActiveCfg = Release|Any CPU +- {48284C30-9F97-4607-9A58-E15D4E2C8D44}.Release|x86.Build.0 = Release|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Debug|x64.ActiveCfg = Debug|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Debug|x64.Build.0 = Debug|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Debug|x86.ActiveCfg = Debug|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Debug|x86.Build.0 = Debug|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Release|Any CPU.Build.0 = Release|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Release|x64.ActiveCfg = Release|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Release|x64.Build.0 = Release|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Release|x86.ActiveCfg = Release|Any CPU +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B}.Release|x86.Build.0 = Release|Any CPU + {7319709A-61EB-4973-AB54-C2CF4F17227B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7319709A-61EB-4973-AB54-C2CF4F17227B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7319709A-61EB-4973-AB54-C2CF4F17227B}.Debug|x64.ActiveCfg = Debug|Any CPU +@@ -403,42 +187,6 @@ Global + {7319709A-61EB-4973-AB54-C2CF4F17227B}.Release|x64.Build.0 = Release|Any CPU + {7319709A-61EB-4973-AB54-C2CF4F17227B}.Release|x86.ActiveCfg = Release|Any CPU + {7319709A-61EB-4973-AB54-C2CF4F17227B}.Release|x86.Build.0 = Release|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Debug|x64.ActiveCfg = Debug|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Debug|x64.Build.0 = Debug|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Debug|x86.ActiveCfg = Debug|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Debug|x86.Build.0 = Debug|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Release|Any CPU.Build.0 = Release|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Release|x64.ActiveCfg = Release|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Release|x64.Build.0 = Release|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Release|x86.ActiveCfg = Release|Any CPU +- {40458A49-573B-4476-81AA-3EDE1693046B}.Release|x86.Build.0 = Release|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Debug|x64.ActiveCfg = Debug|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Debug|x64.Build.0 = Debug|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Debug|x86.ActiveCfg = Debug|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Debug|x86.Build.0 = Debug|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Release|Any CPU.Build.0 = Release|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Release|x64.ActiveCfg = Release|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Release|x64.Build.0 = Release|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Release|x86.ActiveCfg = Release|Any CPU +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6}.Release|x86.Build.0 = Release|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Debug|x64.ActiveCfg = Debug|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Debug|x64.Build.0 = Debug|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Debug|x86.ActiveCfg = Debug|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Debug|x86.Build.0 = Debug|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Release|Any CPU.Build.0 = Release|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Release|x64.ActiveCfg = Release|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Release|x64.Build.0 = Release|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Release|x86.ActiveCfg = Release|Any CPU +- {B4F127D5-859B-44E4-880F-4876126FF866}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE +@@ -448,9 +196,6 @@ Global + {72A60DFA-8B51-4557-A380-04D5C182F1BD} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} + {0E914340-0292-49D4-8799-59314E5E99B8} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} + {F6107EE7-E1DB-4C17-AC15-03B3E9925EB8} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} +- {1A6F75E2-B54C-4745-857B-0B2C0BF90EE6} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {29E6900D-8B16-447B-AB2D-62E609E4171F} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {9E0DC88C-A43C-4969-BAB7-7C10875B386B} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} + {2851D499-2329-489A-A85B-1715651F45ED} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} + {F00DB32D-C21C-46E5-AB07-7C6383AB588F} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} + {9CE0CE70-F171-4600-BCAA-412EF0C30C12} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} +@@ -458,22 +203,7 @@ Global + {94F4FFBA-6F2C-4D84-ADAA-868CA4AE2B06} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} + {B4BC9C66-03A9-4AA2-874A-C60248672E77} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} + {2955828B-0658-4082-9A6B-03E27233676C} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} +- {87700677-F1FE-49C2-B79C-01C5CDB7AA81} = {2241C6CE-0971-4AC7-9EDB-DAD8FCECF4F5} +- {5BC0EAD3-2B5F-4114-B15B-AB4875CADD1D} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {85D66176-8329-40C9-A1B7-8492C35E816C} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {2E53270C-CCCA-418E-9DBE-528758859208} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {0AB85449-DE04-40EB-AB19-E4751E04D5F4} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {FBD00271-41F0-47CB-8AF1-8175A2850B73} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {30A3CF4D-0279-4D9F-BBB4-581EDA7718A3} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {57E0A71C-E041-473D-AA59-03CF274F9F93} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {0DA08FDC-5DD1-40D6-B1E9-2B4A80627ADA} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {CEB89C95-2635-4D39-856C-99994321D10F} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {48284C30-9F97-4607-9A58-E15D4E2C8D44} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {9D50D0F8-7B5C-452E-B0DF-37F66A1FB88B} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} + {7319709A-61EB-4973-AB54-C2CF4F17227B} = {7D91E57F-5950-4BFE-AD23-C1BECF527599} +- {40458A49-573B-4476-81AA-3EDE1693046B} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {94A6BA3F-7889-4F37-A56E-5FE43089FAB6} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} +- {B4F127D5-859B-44E4-880F-4876126FF866} = {0D71B6E2-1482-421B-8F2F-9833BC3EDF4F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0D15E83A-5916-4E70-98AC-1846153AA5EA} +-- +2.17.1 + From ae8ad11b4f5a33801e5a10f1ba8b93697e5d8baf Mon Sep 17 00:00:00 2001 From: dseefeld Date: Mon, 29 Jun 2020 15:42:21 -0400 Subject: [PATCH 40/57] Add installer patch to exclude test projects from source-build --- ...xclude-test-folder-from-source-build.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 patches/installer/0001-Exclude-test-folder-from-source-build.patch diff --git a/patches/installer/0001-Exclude-test-folder-from-source-build.patch b/patches/installer/0001-Exclude-test-folder-from-source-build.patch new file mode 100644 index 0000000000..0c3c716e93 --- /dev/null +++ b/patches/installer/0001-Exclude-test-folder-from-source-build.patch @@ -0,0 +1,24 @@ +From a7dc3defb0be8df492d2cd127e70539fecf17744 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Mon, 29 Jun 2020 15:14:07 -0400 +Subject: [PATCH] Exclude test folder from source-build + +--- + test/Directory.Build.props | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/test/Directory.Build.props b/test/Directory.Build.props +index a953b97cc..26d486322 100644 +--- a/test/Directory.Build.props ++++ b/test/Directory.Build.props +@@ -1,4 +1,7 @@ + + + ++ ++ true ++ + +-- +2.18.2 + From 484467399cb74e077df1995bb00c34586169dc72 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 29 Jun 2020 19:59:23 +0000 Subject: [PATCH 41/57] Patch F# for source-built versions. --- ...03-Use-source-built-S.R.Emit-version.patch | 25 +++++++ ...4-Revert-some-F-changes-for-new-APIs.patch | 70 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch create mode 100644 patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch diff --git a/patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch b/patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch new file mode 100644 index 0000000000..61ca945605 --- /dev/null +++ b/patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch @@ -0,0 +1,25 @@ +From 7fa334b14bd8f4e3e388f0f297fef736db80feaa Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 29 Jun 2020 16:50:04 +0000 +Subject: [PATCH 3/3] Use source-built S.R.Emit version. + +--- + .../FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +index f138fba02..9b33f9488 100644 +--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj ++++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +@@ -753,7 +753,7 @@ + + + +- ++ + + + +-- +2.17.1 + diff --git a/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch b/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch new file mode 100644 index 0000000000..972da5c3fd --- /dev/null +++ b/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch @@ -0,0 +1,70 @@ +From 10a406e1b68e29aa97cdcaddd354c0916b6829df Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 29 Jun 2020 18:31:35 +0000 +Subject: [PATCH 4/4] Revert some F# changes for new APIs. + +--- + src/absil/ilreflect.fs | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs +index 7f048dd5b..d2010a9dc 100644 +--- a/src/absil/ilreflect.fs ++++ b/src/absil/ilreflect.fs +@@ -1568,7 +1568,7 @@ let rec buildMethodPass2 cenv tref (typB: TypeBuilder) emEnv (mdef: ILMethodDef) + // Method generic type parameters + buildGenParamsPass1 emEnv methB.DefineGenericParametersAndLog mdef.GenericParams + let genArgs = getGenericArgumentsOfMethod methB +- let emEnv = envPushTyvars emEnv (Array.append (getGenericArgumentsOfType (typB.AsType())) genArgs) ++ let emEnv = envPushTyvars emEnv (Array.append (getGenericArgumentsOfType (typB)) genArgs) + buildGenParamsPass1b cenv emEnv genArgs mdef.GenericParams + + // Set parameter and return types (may depend on generic args) +@@ -1615,7 +1615,7 @@ let rec buildMethodPass3 cenv tref modB (typB: TypeBuilder) emEnv (mdef: ILMetho + + let methB = envGetMethB emEnv mref + let emEnv = envPushTyvars emEnv (Array.append +- (getGenericArgumentsOfType (typB.AsType())) ++ (getGenericArgumentsOfType (typB)) + (getGenericArgumentsOfMethod methB)) + + if not (Array.isEmpty mdef.Return.CustomAttrs.AsArray) then +@@ -1718,7 +1718,7 @@ let buildEventPass3 cenv (typB: TypeBuilder) emEnv (eventDef: ILEventDef) = + //---------------------------------------------------------------------------- + + let buildMethodImplsPass3 cenv _tref (typB: TypeBuilder) emEnv (mimpl: IL.ILMethodImplDef) = +- let bodyMethInfo = convMethodRef cenv emEnv (typB.AsType()) mimpl.OverrideBy.MethodRef // doc: must be MethodBuilder ++ let bodyMethInfo = convMethodRef cenv emEnv (typB) mimpl.OverrideBy.MethodRef // doc: must be MethodBuilder + let (OverridesSpec (mref, dtyp)) = mimpl.Overrides + let declMethTI = convType cenv emEnv dtyp + let declMethInfo = convMethodRef cenv emEnv declMethTI mref +@@ -1822,7 +1822,7 @@ and buildTypeTypeDef cenv emEnv modB (typB: TypeBuilder) nesting tdef = + let rec buildTypeDefPass1b cenv nesting emEnv (tdef: ILTypeDef) = + let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef) + let typB = envGetTypB emEnv tref +- let genArgs = getGenericArgumentsOfType (typB.AsType()) ++ let genArgs = getGenericArgumentsOfType (typB) + let emEnv = envPushTyvars emEnv genArgs + // Parent may reference types being defined, so has to come after it's Pass1 creation + tdef.Extends |> Option.iter (fun ty -> typB.SetParentAndLog (convType cenv emEnv ty)) +@@ -1840,7 +1840,7 @@ let rec buildTypeDefPass1b cenv nesting emEnv (tdef: ILTypeDef) = + let rec buildTypeDefPass2 cenv nesting emEnv (tdef: ILTypeDef) = + let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef) + let typB = envGetTypB emEnv tref +- let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB.AsType())) ++ let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB)) + // add interface impls + tdef.Implements |> convTypes cenv emEnv |> List.iter (fun implT -> typB.AddInterfaceImplementationAndLog implT) + // add methods, properties +@@ -1860,7 +1860,7 @@ let rec buildTypeDefPass2 cenv nesting emEnv (tdef: ILTypeDef) = + let rec buildTypeDefPass3 cenv nesting modB emEnv (tdef: ILTypeDef) = + let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef) + let typB = envGetTypB emEnv tref +- let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB.AsType())) ++ let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB)) + // add method bodies, properties, events + tdef.Methods |> Seq.iter (buildMethodPass3 cenv tref modB typB emEnv) + tdef.Properties.AsList |> List.iter (buildPropertyPass3 cenv tref typB emEnv) +-- +2.17.1 + From 1a104876be6a59716c04380c988b3a87434fc0c1 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Mon, 29 Jun 2020 18:51:26 -0400 Subject: [PATCH 42/57] Add a couple of patches for the installer repo --- ...get-rid-to-AppHostRuntimeIdentifiers.patch | 39 +++++++++++++++++++ ...formAbstractions-and-NuGet.Versionin.patch | 28 +++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch create mode 100644 patches/installer/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch diff --git a/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch b/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch new file mode 100644 index 0000000000..d7bca57376 --- /dev/null +++ b/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch @@ -0,0 +1,39 @@ +From 7dcf1e61ed13e4092e23c5cf5c0405cc8da7080d Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Mon, 29 Jun 2020 18:07:47 -0400 +Subject: [PATCH] Add target rid to AppHostRuntimeIdentifiers +Updated from 3.1 patch at +https://github.com/dotnet/source-build/blob/2d5b506b13a06adf36f0feb4982ceebb7fa27123/patches/core-sdk/0008-Add-target-rid-to-AppHostRuntimeIdentifiers.patch + +--- + src/redist/targets/GenerateBundledVersions.targets | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets +index b5cd873fe..0ccb80731 100644 +--- a/src/redist/targets/GenerateBundledVersions.targets ++++ b/src/redist/targets/GenerateBundledVersions.targets +@@ -88,6 +88,11 @@ + + + ++ ++ + + + +Date: Mon, 29 Jun 2020 18:47:02 -0400 +Subject: [PATCH] Use PVP for PlatformAbstractions and NuGet.Versioning + +--- + src/core-sdk-tasks/core-sdk-tasks.csproj | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj +index d6c8968d4..28b6bde5d 100644 +--- a/src/core-sdk-tasks/core-sdk-tasks.csproj ++++ b/src/core-sdk-tasks/core-sdk-tasks.csproj +@@ -10,9 +10,9 @@ + + + +- ++ + +- ++ + + + +-- +2.18.2 + From 998c33db092b6d460953c635b66d73d0ee842594 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 30 Jun 2020 15:08:16 -0400 Subject: [PATCH 43/57] Remove supplied VersionSuffix and instead rely on repos to do this --- repos/installer.proj | 1 - repos/runtime.common.props | 2 -- 2 files changed, 3 deletions(-) diff --git a/repos/installer.proj b/repos/installer.proj index 824d83423a..9e2677dc2d 100644 --- a/repos/installer.proj +++ b/repos/installer.proj @@ -40,7 +40,6 @@ $(BuildCommandArgs) /p:IncludeAdditionalSharedFrameworks=false $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false $(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false - $(BuildCommandArgs) /p:VersionSuffix="$(PreReleaseVersionLabel)" $(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs) diff --git a/repos/runtime.common.props b/repos/runtime.common.props index b743734c1e..3a70de8621 100644 --- a/repos/runtime.common.props +++ b/repos/runtime.common.props @@ -32,7 +32,6 @@ $(CoreClrBuildArguments) /p:PackagesDir=$(PackagesDir) $(CoreClrBuildArguments) /p:ContinuousIntegrationBuild=true - $(CoreClrBuildArguments) /p:VersionSuffix="$(PreReleaseVersionLabel)" $(CoreClrBuildArguments) /p:PackageRid=$(OverrideTargetRid) $(CoreClrBuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) $(CoreClrBuildArguments) /p:RuntimeOS=$(OverrideTargetRid) @@ -51,7 +50,6 @@ $(LibrariesBuildArguments) /p:RuntimeOS=$(OverrideTargetRid) $(LibrariesBuildArguments) /p:PortableBuild=$(OverridePortableBuild) $(LibrariesBuildArguments) /p:BuildAllPackages=true - $(LibrariesBuildArguments) /p:VersionSuffix="$(PreReleaseVersionLabel)" $(LibrariesBuildArguments) /p:BuiltSdkPackageOverride="" $(LibrariesBuildArguments) /p:DotNetSourceBuildIntermediatePath=$(GeneratedSourcePathOnline) $(LibrariesBuildArguments) /p:DotNetSourceBuildIntermediatePath=$(GeneratedSourcePathOffline) From 7296f5f3b01e0cf232cf9548d27c2d369073330d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 30 Jun 2020 15:34:12 -0400 Subject: [PATCH 44/57] Update version of vstest. It wasn't auto updated. --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72c2d0312d..6443c881cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,7 +97,7 @@ https://github.com/aspnet/websdk 589ed451f2bcb51d7f47a37ebf4e3d501979174c - + https://github.com/microsoft/vstest 5fd8bb7eabc542fbda5ed8e436f68ca975de0655 From 09f6c85e4f9c29026513a62fed3dcb0c9815cb15 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 30 Jun 2020 21:44:28 +0000 Subject: [PATCH 45/57] Add more binlogs to VSTest. --- ...e-vstest-build-script-to-add-binlogs.patch | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch b/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch index f727d8158a..d7e54372d4 100644 --- a/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch +++ b/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch @@ -1,17 +1,17 @@ -From 6aff69e8ff0cf22c64bebfece469560f8d259e66 Mon Sep 17 00:00:00 2001 +From 66d45b5997ccbed745331454ca073510fca94509 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 13 Aug 2019 21:57:28 +0000 -Subject: [PATCH 1/3] Update vstest build script to add binlogs +Subject: [PATCH 1/7] Update vstest build script to add binlogs --- - scripts/build.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + scripts/build.sh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh -index 2a04c387..39a04ada 100755 +index fe93fa81..0224cd97 100755 --- a/scripts/build.sh +++ b/scripts/build.sh -@@ -222,7 +222,7 @@ function restore_package() +@@ -217,7 +217,7 @@ function restore_package() $dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version || failed=true else log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external_BuildFromSource.csproj" @@ -20,7 +20,7 @@ index 2a04c387..39a04ada 100755 fi if [ "$failed" = true ]; then -@@ -249,7 +249,7 @@ function invoke_build() +@@ -244,7 +244,7 @@ function invoke_build() if [[ $TP_USE_REPO_API = 0 ]]; then $dotnet build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild || failed=true else @@ -29,6 +29,33 @@ index 2a04c387..39a04ada 100755 fi else find . -name "$PROJECT_NAME_PATTERNS" | xargs -L 1 $dotnet build --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild +@@ -293,7 +293,7 @@ function publish_package() + for project in "${projects[@]}" ; + do + log ".. Package: Publish $project" +- $dotnet publish $project --configuration $TPB_Configuration --framework $framework --output $packageDir -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild ++ $dotnet publish $project /bl:publish_$project.binlog --configuration $TPB_Configuration --framework $framework --output $packageDir -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild + done + + # Copy TestHost for desktop targets +@@ -327,7 +327,7 @@ function publish_package() + log ".. Package: Publish testhost.csproj" + local projectToPackage=$TP_ROOT_DIR/src/testhost/testhost.csproj + local packageOutputPath=$TP_OUT_DIR/$TPB_Configuration/Microsoft.TestPlatform.TestHost/$TPB_TargetFrameworkCore +- $dotnet publish $projectToPackage --configuration $TPB_Configuration --framework $TPB_TargetFrameworkCore --output $packageOutputPath -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild ++ $dotnet publish $projectToPackage /bl:testhost-publish.binlog --configuration $TPB_Configuration --framework $TPB_TargetFrameworkCore --output $packageOutputPath -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild + + # For libraries that are externally published, copy the output into artifacts. These will be signed and packaged independently. + packageName="Microsoft.TestPlatform.Build" +@@ -390,7 +390,7 @@ function create_package() + for i in ${projectFiles[@]}; do + log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version" \ + && $dotnet restore $stagingDir/${i} \ +- && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version ++ && $dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version /bl:pack_$i.binlog + done + + log "Create-NugetPackages: Elapsed $(( SECONDS - start ))s." -- -2.18.0 +2.17.1 From d4ddc14cf2458a0523be15ca73861a9d940c0fb5 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 30 Jun 2020 21:44:43 +0000 Subject: [PATCH 46/57] Upgrade VSTest to netcoreapp5.0. --- ...0008-Upgrade-VSTest-to-netcoreapp5.0.patch | 929 ++++++++++++++++++ 1 file changed, 929 insertions(+) create mode 100644 patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch diff --git a/patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch b/patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch new file mode 100644 index 0000000000..bda4bdfaeb --- /dev/null +++ b/patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch @@ -0,0 +1,929 @@ +From 32d09f4cdb264b59adc30c0ab4c6e66c46c58ce1 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Tue, 30 Jun 2020 21:11:57 +0000 +Subject: [PATCH 8/8] Upgrade VSTest to netcoreapp5.0. + +--- + scripts/build.sh | 2 +- + ...t.TestPlatform.PlatformAbstractions.csproj | 4 +- + .../Hosting/DotnetTestHostManager.cs | 2 +- + src/datacollector/datacollector.csproj | 2 +- + .../nuspec/Microsoft.NET.Test.Sdk.nuspec | 6 +- + .../Microsoft.TestPlatform.Build.csproj | 2 +- + .../nuspec/Microsoft.TestPlatform.CLI.csproj | 2 +- + .../Microsoft.TestPlatform.Portable.nuspec | 572 +++++++++--------- + src/package/nuspec/TestPlatform.CLI.nuspec | 2 +- + .../nuspec/TestPlatform.TestHost.nuspec | 106 ++-- + src/package/package/package.csproj | 2 +- + src/testhost.x86/testhost.x86.csproj | 2 +- + src/testhost/testhost.csproj | 2 +- + src/vstest.console/vstest.console.csproj | 4 +- + 14 files changed, 355 insertions(+), 355 deletions(-) + +diff --git a/scripts/build.sh b/scripts/build.sh +index 0224cd97..64892d19 100755 +--- a/scripts/build.sh ++++ b/scripts/build.sh +@@ -120,7 +120,7 @@ DOTNET_CLI_VERSION="3.1.101" + TPB_Solution="TestPlatform.sln" + TPB_Build_From_Source_Solution="TestPlatform_BuildFromSource.sln" + TPB_TargetFramework="net451" +-TPB_TargetFrameworkCore="netcoreapp2.1" ++TPB_TargetFrameworkCore="netcoreapp5.0" + TPB_Configuration=$CONFIGURATION + TPB_TargetRuntime=$TARGET_RUNTIME + TPB_Version=$(test -z $VERSION_SUFFIX && echo $VERSION || echo $VERSION-$VERSION_SUFFIX) +diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +index e112259a..1ff1474e 100644 +--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj ++++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +@@ -7,7 +7,7 @@ + + Microsoft.TestPlatform.PlatformAbstractions + netcoreapp2.1;net451;uap10.0;netstandard2.0 +- netstandard2.0;netcoreapp2.1 ++ netstandard2.0;netcoreapp5.0 + false + true + NU1605 +@@ -35,7 +35,7 @@ + + + +- ++ + + + +diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs +index 324e40be..d0e4db4e 100644 +--- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs ++++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs +@@ -252,7 +252,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting + // testhost.(x86).exe is present in location {testHostNugetRoot}\build\netcoreapp2.1\{x86/x64}\{testhost.x86.exe/testhost.exe} + var folderName = this.architecture == Architecture.X86 ? "x86" : "x64"; + var testHostNugetRoot = new DirectoryInfo(testHostPath).Parent.Parent.Parent; +- var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp2.1", folderName, exeName); ++ var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp5.0", folderName, exeName); + + if (this.fileHelper.Exists(testHostExeNugetPath)) + { +diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj +index 2aa91a6f..f2d4d4a6 100644 +--- a/src/datacollector/datacollector.csproj ++++ b/src/datacollector/datacollector.csproj +@@ -10,7 +10,7 @@ + + datacollector + netcoreapp2.1;net451 +- netcoreapp2.1 ++ netcoreapp5.0 + true + AnyCPU + Exe +diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec +index 387e279f..a6aa7e30 100644 +--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec ++++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec +@@ -22,7 +22,7 @@ + + + +- ++ + + + +@@ -33,11 +33,11 @@ + + + +- ++ + + + +- ++ + + + +diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj +index e365fbd0..83d924cf 100644 +--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj ++++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj +@@ -1,7 +1,7 @@ + + + Exe +- netcoreapp2.1 ++ netcoreapp5.0 + TestPlatform.Build.nuspec + version=$(Version) + +diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +index 4b408cc6..5e643a30 100644 +--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj ++++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +@@ -1,7 +1,7 @@ + + + Exe +- netcoreapp2.1 ++ netcoreapp5.0 + TestPlatform.CLI.nuspec + version=$(Version) + +diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec +index 287b34f8..016eb3ab 100644 +--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec ++++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec +@@ -234,292 +234,292 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/src/package/nuspec/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec +index ca995ffc..bf24da33 100644 +--- a/src/package/nuspec/TestPlatform.CLI.nuspec ++++ b/src/package/nuspec/TestPlatform.CLI.nuspec +@@ -21,6 +21,6 @@ + + + +- ++ + + +diff --git a/src/package/nuspec/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec +index 58fc6fbb..1eac66f9 100644 +--- a/src/package/nuspec/TestPlatform.TestHost.nuspec ++++ b/src/package/nuspec/TestPlatform.TestHost.nuspec +@@ -14,7 +14,7 @@ + © Microsoft Corporation. All rights reserved. + vstest visual-studio unittest testplatform mstest microsoft test testing + +- ++ + + + +@@ -33,21 +33,21 @@ + + + +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- ++ ++ ++ ++ + +- ++ + + + +@@ -148,47 +148,47 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj +index 4b39d121..4953aa2a 100644 +--- a/src/package/package/package.csproj ++++ b/src/package/package/package.csproj +@@ -6,7 +6,7 @@ + + + net451;netcoreapp2.1 +- netcoreapp2.1 ++ netcoreapp5.0 + package + false + false +diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj +index 426f81ce..b37fa585 100644 +--- a/src/testhost.x86/testhost.x86.csproj ++++ b/src/testhost.x86/testhost.x86.csproj +@@ -7,7 +7,7 @@ + + testhost.x86 + netcoreapp2.1;net451 +- netcoreapp2.1 ++ netcoreapp5.0 + true + AnyCPU + true +diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj +index 3c9ec338..7c353147 100644 +--- a/src/testhost/testhost.csproj ++++ b/src/testhost/testhost.csproj +@@ -7,7 +7,7 @@ + + testhost + netcoreapp2.1;net451 +- netcoreapp2.1 ++ netcoreapp5.0 + Exe + app.manifest + +diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj +index 39e33dbd..610b2e24 100644 +--- a/src/vstest.console/vstest.console.csproj ++++ b/src/vstest.console/vstest.console.csproj +@@ -7,14 +7,14 @@ + + vstest.console + netcoreapp2.1;net451 +- netcoreapp2.1 ++ netcoreapp5.0 + true + Exe + AnyCPU + true + app.manifest + +- ++ + win7-x64 + + +-- +2.17.1 + From 0dcd5615b60c873bb8620911ba60b59889e1f52d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 1 Jul 2020 12:53:28 -0400 Subject: [PATCH 47/57] Update source-build-artifacts version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 24fbc97829..ef65d940ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,6 +8,6 @@ 1.0.0-beta.20329.1 - 0.1.0-5.0.100-bootstrap.2 + 0.1.0-5.0.100-bootstrap.3 From 1b4a1e16d0cb24df03e8750dab8ea95b3e6a8a70 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 1 Jul 2020 22:53:27 +0000 Subject: [PATCH 48/57] Revert vstest netcoreapp5.0 fix and instead exlude S.Text.Json in sdk --- ...ext.Json-when-calling-PublishTestCli.patch | 24 + ...0008-Upgrade-VSTest-to-netcoreapp5.0.patch | 929 ------------------ 2 files changed, 24 insertions(+), 929 deletions(-) create mode 100644 patches/sdk/0009-Exclude-System.Text.Json-when-calling-PublishTestCli.patch delete mode 100644 patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch diff --git a/patches/sdk/0009-Exclude-System.Text.Json-when-calling-PublishTestCli.patch b/patches/sdk/0009-Exclude-System.Text.Json-when-calling-PublishTestCli.patch new file mode 100644 index 0000000000..21c8a4bf20 --- /dev/null +++ b/patches/sdk/0009-Exclude-System.Text.Json-when-calling-PublishTestCli.patch @@ -0,0 +1,24 @@ +From c539b20a044d2156a815ae795dc03878b86e24e2 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 1 Jul 2020 21:40:38 +0000 +Subject: [PATCH] Exclude System.Text.Json when calling PublishTestCli + +--- + src/Layout/redist/targets/GenerateLayout.targets | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets +index 37a0db7..1259b22 100644 +--- a/src/Layout/redist/targets/GenerateLayout.targets ++++ b/src/Layout/redist/targets/GenerateLayout.targets +@@ -66,6 +66,7 @@ + + + ++ + + +-- +1.8.3.1 + diff --git a/patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch b/patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch deleted file mode 100644 index bda4bdfaeb..0000000000 --- a/patches/vstest/0008-Upgrade-VSTest-to-netcoreapp5.0.patch +++ /dev/null @@ -1,929 +0,0 @@ -From 32d09f4cdb264b59adc30c0ab4c6e66c46c58ce1 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 30 Jun 2020 21:11:57 +0000 -Subject: [PATCH 8/8] Upgrade VSTest to netcoreapp5.0. - ---- - scripts/build.sh | 2 +- - ...t.TestPlatform.PlatformAbstractions.csproj | 4 +- - .../Hosting/DotnetTestHostManager.cs | 2 +- - src/datacollector/datacollector.csproj | 2 +- - .../nuspec/Microsoft.NET.Test.Sdk.nuspec | 6 +- - .../Microsoft.TestPlatform.Build.csproj | 2 +- - .../nuspec/Microsoft.TestPlatform.CLI.csproj | 2 +- - .../Microsoft.TestPlatform.Portable.nuspec | 572 +++++++++--------- - src/package/nuspec/TestPlatform.CLI.nuspec | 2 +- - .../nuspec/TestPlatform.TestHost.nuspec | 106 ++-- - src/package/package/package.csproj | 2 +- - src/testhost.x86/testhost.x86.csproj | 2 +- - src/testhost/testhost.csproj | 2 +- - src/vstest.console/vstest.console.csproj | 4 +- - 14 files changed, 355 insertions(+), 355 deletions(-) - -diff --git a/scripts/build.sh b/scripts/build.sh -index 0224cd97..64892d19 100755 ---- a/scripts/build.sh -+++ b/scripts/build.sh -@@ -120,7 +120,7 @@ DOTNET_CLI_VERSION="3.1.101" - TPB_Solution="TestPlatform.sln" - TPB_Build_From_Source_Solution="TestPlatform_BuildFromSource.sln" - TPB_TargetFramework="net451" --TPB_TargetFrameworkCore="netcoreapp2.1" -+TPB_TargetFrameworkCore="netcoreapp5.0" - TPB_Configuration=$CONFIGURATION - TPB_TargetRuntime=$TARGET_RUNTIME - TPB_Version=$(test -z $VERSION_SUFFIX && echo $VERSION || echo $VERSION-$VERSION_SUFFIX) -diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj -index e112259a..1ff1474e 100644 ---- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj -+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj -@@ -7,7 +7,7 @@ - - Microsoft.TestPlatform.PlatformAbstractions - netcoreapp2.1;net451;uap10.0;netstandard2.0 -- netstandard2.0;netcoreapp2.1 -+ netstandard2.0;netcoreapp5.0 - false - true - NU1605 -@@ -35,7 +35,7 @@ - - - -- -+ - - - -diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs -index 324e40be..d0e4db4e 100644 ---- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs -+++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs -@@ -252,7 +252,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Hosting - // testhost.(x86).exe is present in location {testHostNugetRoot}\build\netcoreapp2.1\{x86/x64}\{testhost.x86.exe/testhost.exe} - var folderName = this.architecture == Architecture.X86 ? "x86" : "x64"; - var testHostNugetRoot = new DirectoryInfo(testHostPath).Parent.Parent.Parent; -- var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp2.1", folderName, exeName); -+ var testHostExeNugetPath = Path.Combine(testHostNugetRoot.FullName, "build", "netcoreapp5.0", folderName, exeName); - - if (this.fileHelper.Exists(testHostExeNugetPath)) - { -diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj -index 2aa91a6f..f2d4d4a6 100644 ---- a/src/datacollector/datacollector.csproj -+++ b/src/datacollector/datacollector.csproj -@@ -10,7 +10,7 @@ - - datacollector - netcoreapp2.1;net451 -- netcoreapp2.1 -+ netcoreapp5.0 - true - AnyCPU - Exe -diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec -index 387e279f..a6aa7e30 100644 ---- a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec -+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec -@@ -22,7 +22,7 @@ - - - -- -+ - - - -@@ -33,11 +33,11 @@ - - - -- -+ - - - -- -+ - - - -diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -index e365fbd0..83d924cf 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -@@ -1,7 +1,7 @@ - - - Exe -- netcoreapp2.1 -+ netcoreapp5.0 - TestPlatform.Build.nuspec - version=$(Version) - -diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -index 4b408cc6..5e643a30 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -@@ -1,7 +1,7 @@ - - - Exe -- netcoreapp2.1 -+ netcoreapp5.0 - TestPlatform.CLI.nuspec - version=$(Version) - -diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec -index 287b34f8..016eb3ab 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec -+++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec -@@ -234,292 +234,292 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff --git a/src/package/nuspec/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec -index ca995ffc..bf24da33 100644 ---- a/src/package/nuspec/TestPlatform.CLI.nuspec -+++ b/src/package/nuspec/TestPlatform.CLI.nuspec -@@ -21,6 +21,6 @@ - - - -- -+ - - -diff --git a/src/package/nuspec/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec -index 58fc6fbb..1eac66f9 100644 ---- a/src/package/nuspec/TestPlatform.TestHost.nuspec -+++ b/src/package/nuspec/TestPlatform.TestHost.nuspec -@@ -14,7 +14,7 @@ - © Microsoft Corporation. All rights reserved. - vstest visual-studio unittest testplatform mstest microsoft test testing - -- -+ - - - -@@ -33,21 +33,21 @@ - - - -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - -- -- -- -- -+ -+ -+ -+ - -- -+ - - - -@@ -148,47 +148,47 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj -index 4b39d121..4953aa2a 100644 ---- a/src/package/package/package.csproj -+++ b/src/package/package/package.csproj -@@ -6,7 +6,7 @@ - - - net451;netcoreapp2.1 -- netcoreapp2.1 -+ netcoreapp5.0 - package - false - false -diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj -index 426f81ce..b37fa585 100644 ---- a/src/testhost.x86/testhost.x86.csproj -+++ b/src/testhost.x86/testhost.x86.csproj -@@ -7,7 +7,7 @@ - - testhost.x86 - netcoreapp2.1;net451 -- netcoreapp2.1 -+ netcoreapp5.0 - true - AnyCPU - true -diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj -index 3c9ec338..7c353147 100644 ---- a/src/testhost/testhost.csproj -+++ b/src/testhost/testhost.csproj -@@ -7,7 +7,7 @@ - - testhost - netcoreapp2.1;net451 -- netcoreapp2.1 -+ netcoreapp5.0 - Exe - app.manifest - -diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj -index 39e33dbd..610b2e24 100644 ---- a/src/vstest.console/vstest.console.csproj -+++ b/src/vstest.console/vstest.console.csproj -@@ -7,14 +7,14 @@ - - vstest.console - netcoreapp2.1;net451 -- netcoreapp2.1 -+ netcoreapp5.0 - true - Exe - AnyCPU - true - app.manifest - -- -+ - win7-x64 - - --- -2.17.1 - From 9a4ba9c0d5b197376817a5fd31394bcf51481be0 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 1 Jul 2020 22:55:53 +0000 Subject: [PATCH 49/57] Correct ordering of projects to put vstest and fsharp before sdk --- repos/sdk.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repos/sdk.proj b/repos/sdk.proj index 1cfa34c0ac..a54e84f106 100644 --- a/repos/sdk.proj +++ b/repos/sdk.proj @@ -49,6 +49,8 @@ + + From 34a166dba9107745a98c40a7da326e4fccda0a95 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 1 Jul 2020 22:56:25 +0000 Subject: [PATCH 50/57] Update prebuilt-baselines --- tools-local/prebuilt-baseline-offline.xml | 254 ++++++++++++++++------ tools-local/prebuilt-baseline-online.xml | 76 ++++--- 2 files changed, 226 insertions(+), 104 deletions(-) diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index e0934bcc15..196aa4bc05 100644 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -2,58 +2,56 @@ centos.7-x64 src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ - src/arcade.421b20fb860907c45673de791177e3fd61402197/ - src/Extensions.a309c864ab86230b6f118843481673cdd89d6258/ + src/arcade.bce0a98620c1c5a110b2bba9912f3d5929069c6b/ + src/Extensions.aadd7e9a6bf2bdaa48f7b1aae781a03704adc713/ src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - src/AspNetCore-Tooling.2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0/ - src/AspNetCore.c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc/ - src/cli.32fddd23b1e53272472f6feb27f5e12a445b7236/ + src/AspNetCore-Tooling.56c0dbb97a3c542fa9865aad33fe442341786a09/ + src/AspNetCore.cdfa43bbe0ecc13757cc6517c9a253de77c3ec56/ src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ - src/core-sdk.9c30c9b429add311e047bfb87c4d4119673fa461/ - src/fsharp.1e9d40c8897796e21850bd6dca40e15df69a1c97/ + src/fsharp.1bcfb7bc27dc2d482341137150023fc1534506e6/ + src/installer.b0d47ebe3474026fe5cbef83de2b336d292b6c26/ src/known-good-tests./ src/known-good./ - src/linker.a9bfc450a9da6b050ba043ca43b9241beb6f3f60/ - src/msbuild.13cfe7fc5a97772e4045671c71fa31a3c0856af0/ + src/linker.7573e99c7665f565fe4a6ac4784d5c641213d5e1/ + src/msbuild.80e487bff4b7adced47cab46b3481f1a5f2b3178/ src/netcorecli-fsc/ src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - src/NuGet.Client.64f2febf7d1de8b0228eca5afed97a96c5a30bba/ + src/NuGet.Client.1c2681b16a0bb9be9271abe043a1cbf892761ef8/ src/package-source-build/ - src/roslyn.6f2112b58316c97c4f1b97e0f282aef4346947fc/ - src/runtime.d12f79a4d1b908636b96005fe30f547e54cea3ee/ - src/runtime.d12f79a4d1b908636b96005fe30f547e54cea3ee/ - src/sdk.11d68c998c996a9e033760f4769132cf867de167/ + src/roslyn.3d85b48dd5e533c7d47e916e2cff417f46bdce10/ + src/runtime.47ec733ba79b196e4e09d0c89bad245155002353/ + src/runtime.47ec733ba79b196e4e09d0c89bad245155002353/ + src/sdk.d06773deef64b4045a2f8256a383fd8dbef6050e/ src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ - src/templating.247f60e9e34a03ed99e855eb1ea0c20931a968db/ - src/toolset.a46d93e5e100f9046cb589b5d4ba70bde41f3480/ - src/vstest.55e7e45431c9c05656c999b902686e7402664573/ + src/templating.bb2aad9a623680ecefd731784c97fcbf9e908730/ + src/vstest.5fd8bb7eabc542fbda5ed8e436f68ca975de0655/ src/websdk.589ed451f2bcb51d7f47a37ebf4e3d501979174c/ src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ Tools/ tools-local/tasks/ - bin/obj/ + artifacts/obj/ - - - - - - - - - + + + + + + + + + + + - - @@ -71,30 +69,109 @@ - - - + + + + + + + + - - - + + + + + + - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -104,12 +181,10 @@ - - + - - + @@ -118,7 +193,6 @@ - @@ -128,10 +202,12 @@ - + + + + - @@ -153,6 +229,10 @@ + + + + @@ -173,11 +253,9 @@ - - @@ -206,39 +284,79 @@ - - + + + - + + + + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + - - + + + + - + + + + + + - + + - + - + + + + + - + \ No newline at end of file diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 8306aa69b0..da9dabe7c4 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -1,5 +1,5 @@ - centos.8-x64 + centos.7-x64 artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ artifacts/src/arcade.bce0a98620c1c5a110b2bba9912f3d5929069c6b/ @@ -7,11 +7,10 @@ artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ artifacts/src/AspNetCore-Tooling.56c0dbb97a3c542fa9865aad33fe442341786a09/ artifacts/src/AspNetCore.cdfa43bbe0ecc13757cc6517c9a253de77c3ec56/ - artifacts/src/cli.32fddd23b1e53272472f6feb27f5e12a445b7236/ artifacts/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ artifacts/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ - artifacts/src/core-sdk.9c30c9b429add311e047bfb87c4d4119673fa461/ artifacts/src/fsharp.1bcfb7bc27dc2d482341137150023fc1534506e6/ + artifacts/src/installer.b0d47ebe3474026fe5cbef83de2b336d292b6c26/ artifacts/src/known-good-tests./ artifacts/src/known-good./ artifacts/src/linker.7573e99c7665f565fe4a6ac4784d5c641213d5e1/ @@ -27,7 +26,6 @@ artifacts/src/sdk.d06773deef64b4045a2f8256a383fd8dbef6050e/ artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ artifacts/src/templating.bb2aad9a623680ecefd731784c97fcbf9e908730/ - artifacts/src/toolset.a46d93e5e100f9046cb589b5d4ba70bde41f3480/ artifacts/src/vstest.5fd8bb7eabc542fbda5ed8e436f68ca975de0655/ artifacts/src/websdk.589ed451f2bcb51d7f47a37ebf4e3d501979174c/ artifacts/src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ @@ -37,16 +35,14 @@ - - - - + + @@ -76,14 +72,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,7 +147,6 @@ - @@ -137,16 +157,13 @@ - - - @@ -154,11 +171,9 @@ - - @@ -172,7 +187,6 @@ - @@ -183,8 +197,6 @@ - - @@ -204,41 +216,34 @@ - - + - - - - - - - - - - + + + + @@ -266,7 +271,6 @@ - @@ -547,7 +551,7 @@ - + @@ -571,7 +575,7 @@ - + @@ -598,9 +602,9 @@ - + - + @@ -612,4 +616,4 @@ - + \ No newline at end of file From 1a557e5ac3727b5b0f3e5e974b191f0bb4134074 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 1 Jul 2020 22:56:39 +0000 Subject: [PATCH 51/57] Re-enable smoke-tests --- .vsts.pipelines/jobs/ci-linux.yml | 58 ++++++++++++------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/.vsts.pipelines/jobs/ci-linux.yml b/.vsts.pipelines/jobs/ci-linux.yml index 629b0e6ee3..974b1e67a3 100644 --- a/.vsts.pipelines/jobs/ci-linux.yml +++ b/.vsts.pipelines/jobs/ci-linux.yml @@ -88,17 +88,15 @@ jobs: continueOnError: true # Run smoke tests. This is needed even in tarball legs to create the smoke-test-prereqs archive. -# Temporarily disable smoke-tests until entire product builds. -# See https://github.com/dotnet/source-build/issues/1552 -# - script: | -# set -ex -# df -h -# $(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) ./build.sh \ -# --run-smoke-test \ -# /p:Configuration=$(sb.configuration) \ -# /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) -# du -h $(rootDirectory) | sort -h | tail -n 50 -# displayName: Run smoke-test + - script: | + set -ex + df -h + $(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) ./build.sh \ + --run-smoke-test \ + /p:Configuration=$(sb.configuration) \ + /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) + du -h $(rootDirectory) | sort -h | tail -n 50 + displayName: Run smoke-test # Run unit tests that we support. - script: | @@ -179,25 +177,17 @@ jobs: df -h $(docker.run) $(docker.tb.map) $(docker.drop.map) $(docker.tb.work) $(imageName) /bin/bash -c ' mkdir -p /drop/tarball/ - # Temporarily disable smoke-tests until entire product builds. - # See https://github.com/dotnet/source-build/issues/1552 - ##smokeTestPackages="$(tarballName)/packages/smoke-test-packages" + smokeTestPackages="$(tarballName)/packages/smoke-test-packages" # smokeTestPackages is a package cache, with redundant data and unnecessary structure. E.g. # $smokeTestPackages/name/version/name.version.nupkg <- We want this. # $smokeTestPackages/name/version/lib/net46/name.dll <- This is already in the nupkg. # This find moves the nupkg files into $smokeTestPackages: - # Temporarily disable smoke-tests until entire product builds. - # See https://github.com/dotnet/source-build/issues/1552 - ##find "$smokeTestPackages" -iname "*.nupkg" -exec mv {} "$smokeTestPackages" \; + find "$smokeTestPackages" -iname "*.nupkg" -exec mv {} "$smokeTestPackages" \; # This find removes all non-nupkg files, which are not wanted: - # Temporarily disable smoke-tests until entire product builds. - # See https://github.com/dotnet/source-build/issues/1552 - ##find "$smokeTestPackages" -not -iname "*.nupkg" -delete + find "$smokeTestPackages" -not -iname "*.nupkg" -delete # Make one .tar.gz for build, another for extras necessary to smoke test: tar --numeric-owner "--exclude=$smokeTestPackages" -zcf "/drop/tarball/$(tarballName).tar.gz" "$(tarballName)" - # Temporarily disable smoke-tests until entire product builds. - # See https://github.com/dotnet/source-build/issues/1552 - ##tar --numeric-owner -zcf "/drop/tarball/$(tarballName)-smoke-test-prereqs.tar.gz" "$smokeTestPackages"' + tar --numeric-owner -zcf "/drop/tarball/$(tarballName)-smoke-test-prereqs.tar.gz" "$smokeTestPackages"' du -h $(rootDirectory) | sort -h | tail -n 50 displayName: Copy tarball to output condition: and(succeeded(), eq(variables['sb.tarball'], true)) @@ -227,18 +217,16 @@ jobs: condition: and(succeeded(), eq(variables['sb.tarball'], true)) # Run smoke tests. -# Temporarily disable smoke-tests until entire product builds. -# See https://github.com/dotnet/source-build/issues/1552 -# - script: | -# set -ex -# df -h -# $(docker.run) $(docker.tb.map) $(docker.tb.work) $(imageName) "$(tarballName)/smoke-test.sh" \ -# --minimal \ -# --projectOutput \ -# --configuration $(sb.configuration) -# du -h $(rootDirectory) | sort -h | tail -n 50 -# displayName: Run smoke-test in tarball -# condition: and(succeeded(), eq(variables['sb.tarball'], true)) + - script: | + set -ex + df -h + $(docker.run) $(docker.tb.map) $(docker.tb.work) $(imageName) "$(tarballName)/smoke-test.sh" \ + --minimal \ + --projectOutput \ + --configuration $(sb.configuration) + du -h $(rootDirectory) | sort -h | tail -n 50 + displayName: Run smoke-test in tarball + condition: and(succeeded(), eq(variables['sb.tarball'], true)) - script: df -h displayName: Check space (df -h) From ed3f7a672abd901841124a34d16b2d37ee655a62 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 2 Jul 2020 09:19:20 -0400 Subject: [PATCH 52/57] Re-enable poison report --- .vsts.pipelines/builds/matrix.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.vsts.pipelines/builds/matrix.yml b/.vsts.pipelines/builds/matrix.yml index 2741bbea6a..809b9f9b00 100644 --- a/.vsts.pipelines/builds/matrix.yml +++ b/.vsts.pipelines/builds/matrix.yml @@ -14,9 +14,7 @@ jobs: parameters: job: centos71 imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-359e48e-20200313130914 -# Temporarily disable reporting on prebuilt leaks until entire product builds. -# See https://github.com/dotnet/source-build/issues/1548 - reportPrebuiltLeaks: false + reportPrebuiltLeaks: true matrix: # Temporarily disable unit tests until entire product builds. # See https://github.com/dotnet/source-build/issues/1549 From dec2b51589afcf7b9a0795026a6f7a05e0e2563f Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 2 Jul 2020 17:59:52 +0000 Subject: [PATCH 53/57] Fix LeakDetection task build --- eng/SourceBuild.Tarball.targets | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuild.Tarball.targets b/eng/SourceBuild.Tarball.targets index 1399253d25..fec9ffc387 100644 --- a/eng/SourceBuild.Tarball.targets +++ b/eng/SourceBuild.Tarball.targets @@ -297,7 +297,8 @@ + Condition="'$(IncludeLeakDetection)' == 'true'" + DependsOnTargets="CopyTarballFiles"> $(ProjectDir)tools-local\tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -305,12 +306,12 @@ + Properties="RestoreSources=$(SourceBuiltPackagesPath)%3B$(TarballRootDir)packages/prebuilt%3bhttps://api.nuget.org/v3/index.json"/> + Properties="OutputPath=$(TarballRootDir)tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/"/> From b11625d5a6700cda0fc3be0ed7ec3da5b620ab86 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 2 Jul 2020 18:15:58 +0000 Subject: [PATCH 54/57] Fix osx build issue --- repos/installer.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/installer.proj b/repos/installer.proj index 9e2677dc2d..82b2dee07e 100644 --- a/repos/installer.proj +++ b/repos/installer.proj @@ -4,7 +4,7 @@ $(TargetRid) osx-x64 - $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) + $(TargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) --runtime-id $(OverrideTargetRid) --runtime-id $(TargetRid) From 226f7ef95e3537ff3d0a0cc33fef602d72bef304 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 2 Jul 2020 18:40:41 +0000 Subject: [PATCH 55/57] One more update to fix OSX --- repos/installer.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/installer.proj b/repos/installer.proj index 82b2dee07e..814ed201dd 100644 --- a/repos/installer.proj +++ b/repos/installer.proj @@ -4,7 +4,7 @@ $(TargetRid) osx-x64 - $(TargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) + $(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) --runtime-id $(OverrideTargetRid) --runtime-id $(TargetRid) From 4da28f330ac29daaee1e2a69be5938ce2c645ec2 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 2 Jul 2020 22:22:34 +0000 Subject: [PATCH 56/57] Update to previously source-built --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ef65d940ed..f9bfb2ce72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,6 +8,6 @@ 1.0.0-beta.20329.1 - 0.1.0-5.0.100-bootstrap.3 + 0.1.0-5.0.100-bootstrap.4 From b7c440bbd9a4ebb0e71cf78defb5a721c919b2e2 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 2 Jul 2020 23:22:31 +0000 Subject: [PATCH 57/57] Updates from PR review --- ...dd-reference-to-PlatformAbstractions.patch | 22 +++++++++---------- ...emove-RID-calculation-in-favor-of-Ru.patch | 2 ++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch b/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch index 8746b327bc..af1944d593 100644 --- a/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch +++ b/patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch @@ -1,15 +1,15 @@ -From db4c528bb2335f791f46f76f62f392597e298ef0 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 1 Apr 2020 16:32:18 +0000 -Subject: [PATCH] Add reference to PlatformAbstractions +From db4c528bb2335f791f46f76f62f392597e298ef0 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 1 Apr 2020 16:32:18 +0000 +Subject: [PATCH] Add reference to PlatformAbstractions -Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj doesn't have a reference -to PlatformAbstractions. It builds in the production build because it has a -reference to Microsoft.Extensions.DependencyModel, which also brought in -PlatformAbstractions. That dependency has been removed with -https://github.com/dotnet/core-setup/pull/5218. -The tarball build uses a newer version of Microsoft.Extensions.DependencyModel -with the dependency removed, so an explicit dependency needs to be added now until +Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj doesn't have a reference +to PlatformAbstractions. It builds in the production build because it has a +reference to Microsoft.Extensions.DependencyModel, which also brought in +PlatformAbstractions. That dependency has been removed with +https://github.com/dotnet/core-setup/pull/5218. +The tarball build uses a newer version of Microsoft.Extensions.DependencyModel +with the dependency removed, so an explicit dependency needs to be added now until Arcade removes their dependency on PlatormAbstractions. --- .../Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj | 1 + diff --git a/patches/runtime/0012-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch b/patches/runtime/0012-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch index 87a8c9c534..6bbe239eff 100644 --- a/patches/runtime/0012-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch +++ b/patches/runtime/0012-Update-SDK-and-remove-RID-calculation-in-favor-of-Ru.patch @@ -4,6 +4,8 @@ Date: Mon, 4 May 2020 11:45:15 +0200 Subject: [PATCH 12/15] Update SDK and remove RID calculation in favor of RuntimeInformation (#35538) + Patch cherry picked from https://github.com/dotnet/runtime/pull/35538. + * Remove GetTargetMachineInfo from runtime * Update bootstrapped SDK