From cfa552637def4ebd9b714a491786752c07f32cb8 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 20 Oct 2021 15:20:30 -0500 Subject: [PATCH 01/14] wip: just enable themissing NuGet and MSBuild TFMs --- ...-all-TFMs-for-source-build-to-suppor.patch | 32 +++++++++++++++++++ .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 4 +-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch new file mode 100644 index 000000000..046864705 --- /dev/null +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch @@ -0,0 +1,32 @@ +From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 20 Oct 2021 15:19:29 -0500 +Subject: [PATCH] Restore building all TFMs for source-build to support NuGet + to support templating. + +--- + src/Directory.Build.props | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/Directory.Build.props b/src/Directory.Build.props +index b0e233194..7e0c7d8c8 100644 +--- a/src/Directory.Build.props ++++ b/src/Directory.Build.props +@@ -27,13 +27,12 @@ + + + $(FullFrameworkTFM);netstandard2.0 +- netstandard2.0 + $(FullFrameworkTFM) + AnyCPU + + + net6.0 +- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) ++ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) + $(FullFrameworkTFM) + + +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 6be953ae4..217b2cb43 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -17,11 +17,11 @@ index 80433ed60..8acc4e0bb 100644 v4.7.2 net472 - netcoreapp2.1 -+ net6.0 ++ netcoreapp2.1;net6.0 netcoreapp5.0 $(DotNetBuildFromSource) - netstandard2.0 -+ net6.0 ++ netstandard2.0;net6.0 $(NETFXTargetFramework);$(NETCoreTargetFramework) $(NETCoreTargetFramework) - $(TargetFrameworksExe);netcoreapp5.0 From 34ee4c4fffdb5a995a89c903fce27054c18163c2 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 10:22:27 -0500 Subject: [PATCH 02/14] Delete templating patch and just use netstandard2.0 in NuGet. --- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 2 +- .../templating/0001-pin-nuget-versions.patch | 30 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 217b2cb43..dd1c4b260 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -17,7 +17,7 @@ index 80433ed60..8acc4e0bb 100644 v4.7.2 net472 - netcoreapp2.1 -+ netcoreapp2.1;net6.0 ++ net6.0 netcoreapp5.0 $(DotNetBuildFromSource) - netstandard2.0 diff --git a/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch b/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch deleted file mode 100644 index a78c3d97f..000000000 --- a/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c0ec49b887cae58bb860a18982115c5910f29821 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 14 Sep 2021 22:54:01 +0000 -Subject: [PATCH] pin nuget versions - -Temporary fix for https://github.com/dotnet/source-build/issues/2455 to unblock source-build ---- - Directory.Build.targets | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 0dc99916..7c45fda3 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -12,9 +12,9 @@ - - - -- -- -- -+ -+ -+ - - - --- -2.29.2 - From aab9a8b3a66edf0d35ff4dedcd086f1260641a89 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 12:10:14 -0500 Subject: [PATCH 03/14] A few projects didn't use the project-wide variables for determining TFMs. --- ...se-PublicApiAnalyzer-on-source-build.patch | 9 ++- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 68 ++++++++++++++++--- ...-Microsoft.Web.Xdt-System.ComponentM.patch | 8 +-- ...anges-to-support-ArPow-from-tarball.patch} | 10 +-- ...patch => 0005-Upgrade-to-.NET-6-SDK.patch} | 10 +-- ...works-for-netstandard-as-well-for-V.patch} | 11 +-- ...ild.Tasks.Pack-source-build-support.patch} | 12 ++-- ...Extensions.CommandLineUtils-referen.patch} | 11 +-- 8 files changed, 97 insertions(+), 42 deletions(-) rename src/SourceBuild/tarball/patches/nuget-client/{0005-Build-script-changes-to-support-ArPow-from-tarball.patch => 0004-Build-script-changes-to-support-ArPow-from-tarball.patch} (94%) rename src/SourceBuild/tarball/patches/nuget-client/{0006-Upgrade-to-.NET-6-SDK.patch => 0005-Upgrade-to-.NET-6-SDK.patch} (96%) rename src/SourceBuild/tarball/patches/nuget-client/{0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch => 0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch} (72%) rename src/SourceBuild/tarball/patches/nuget-client/{0008-NuGet.Build.Tasks.Pack-source-build-support.patch => 0007-NuGet.Build.Tasks.Pack-source-build-support.patch} (83%) rename src/SourceBuild/tarball/patches/nuget-client/{0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch => 0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch} (92%) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch index 1cb91f3d3..8ab3267b2 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch @@ -1,17 +1,16 @@ -From 335f32e48fd5604cdb1340ec04d6503a3e43d783 Mon Sep 17 00:00:00 2001 +From 198d70708016e5406e0d525567ca58962e222399 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:09:35 +0000 -Subject: [PATCH] Don't use PublicApiAnalyzer on source-build +Subject: [PATCH 1/8] Don't use PublicApiAnalyzer on source-build CSC : warning AD0001: Analyzer 'Microsoft.CodeAnalysis.PublicApiAnalyzers.DeclarePublicApiAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. CSC : error CS2001: Source file '/repos/installer2/artifacts/tarball/src/nuget-client.7363366401b43f4ea250394db8dad3707e9a9636/src/NuGet.Core/NuGet.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt' could not be found. - --- build/common.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/common.targets b/build/common.targets -index 2c387f576..cf5a70c62 100644 +index 7a353ebf8..6fd5bd260 100644 --- a/build/common.targets +++ b/build/common.targets @@ -65,6 +65,11 @@ @@ -27,5 +26,5 @@ index 2c387f576..cf5a70c62 100644 true -- -2.29.2 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index dd1c4b260..c63ce0ccb 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,15 +1,19 @@ -From e0e1d72dfa8881244a76c3dbcc63aa73c05546f4 Mon Sep 17 00:00:00 2001 +From 98fd2091519fa4c6d9ab850eaea92700b00803dc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 -Subject: [PATCH] Update netcoreapp TFMs to 6.0 +Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 --- - build/common.project.props | 10 +++++----- - build/common.targets | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) + build/common.project.props | 10 +++++----- + build/common.targets | 2 +- + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - + .../NuGet.Configuration/NuGet.Configuration.csproj | 1 - + .../NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - + .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - + 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build/common.project.props b/build/common.project.props -index 80433ed60..8acc4e0bb 100644 +index e2e3c0c11..000702f58 100644 --- a/build/common.project.props +++ b/build/common.project.props @@ -13,17 +13,17 @@ @@ -36,7 +40,7 @@ index 80433ed60..8acc4e0bb 100644 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ $(RepositoryRootDirectory)build\ diff --git a/build/common.targets b/build/common.targets -index cf5a70c62..8827686a7 100644 +index 6fd5bd260..3de830b25 100644 --- a/build/common.targets +++ b/build/common.targets @@ -6,7 +6,7 @@ @@ -48,6 +52,54 @@ index cf5a70c62..8827686a7 100644 $(DefineConstants);IS_CORECLR true +diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +index e30a079eb..c2b8fe241 100644 +--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj ++++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +@@ -5,7 +5,6 @@ + + Common utilities and interfaces for all NuGet libraries. + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + $(NoWarn);CS1591;CS1574 + true +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +index bbc5ba480..fc4d42502 100644 +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +@@ -6,7 +6,6 @@ + NuGet's configuration settings implementation. + $(NoWarn);CS1591 + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + true + true +diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +index 65f261dc1..f29551741 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +@@ -5,7 +5,6 @@ + + NuGet's understanding of target frameworks. + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net40 + + $(NoWarn);CS1591;CS1574;CS1573 + true +diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +index 180293944..8498664b9 100644 +--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj ++++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj +@@ -4,7 +4,6 @@ + + + $(TargetFrameworksLibrary) +- $(TargetFrameworks);net45 + + NuGet's implementation of Semantic Versioning. + semver;semantic versioning -- -2.29.2 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch index 714b0ea00..6fdfe9478 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch @@ -1,7 +1,7 @@ -From fecc40e502197e65804177b2aec49a7a5422ed6e Mon Sep 17 00:00:00 2001 +From abf05bf4b06ab5d47372d166b7bb6c2c6bb4e6a2 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & +Subject: [PATCH 3/8] Use source-built Microsoft.Web.Xdt & System.ComponentModel.Composition --- @@ -9,7 +9,7 @@ Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index 6f72ac3fd..8317f3903 100644 +index 614a0ca68..ab0064b66 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -15,6 +15,12 @@ @@ -39,5 +39,5 @@ index 6f72ac3fd..8317f3903 100644 The Microsoft.VisualStudio.SDK metapackage brings in System.Threading.Tasks.Dataflow 4.11.1 (assembly version 4.9.5.0). However, our MSBuild integration tests use Microsoft.Build 16.8.0, which requires System.Threading.Tasks.Dataflow 4.9.0 (assembly version 4.9.3.0). -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch b/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch similarity index 94% rename from src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch rename to src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch index df670d2df..6ae95d42f 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch @@ -1,7 +1,7 @@ -From 9e35a4d319f3288a50bdaf5b32661764761aa0e9 Mon Sep 17 00:00:00 2001 +From c77a8c754381600ec891c5601b2c5cd9c8945d26 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 10:59:36 -0500 -Subject: [PATCH 4/5] Build script changes to support ArPow from tarball. +Subject: [PATCH 4/8] Build script changes to support ArPow from tarball. --- eng/source-build/build.sh | 27 +++++++++++++++++++++++++-- @@ -9,7 +9,7 @@ Subject: [PATCH 4/5] Build script changes to support ArPow from tarball. 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 3bb69b2b0..aaff8ef0f 100755 +index 3bb69b2b0..ee1221d56 100755 --- a/eng/source-build/build.sh +++ b/eng/source-build/build.sh @@ -13,6 +13,25 @@ while [[ -h $source ]]; do @@ -54,7 +54,7 @@ index 3bb69b2b0..aaff8ef0f 100755 -"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" +"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args diff --git a/eng/source-build/source-build.proj b/eng/source-build/source-build.proj -index 6f90f9793..91ea2d032 100644 +index 72058ac88..cbdd6d819 100644 --- a/eng/source-build/source-build.proj +++ b/eng/source-build/source-build.proj @@ -4,6 +4,8 @@ @@ -84,5 +84,5 @@ index 6f90f9793..91ea2d032 100644 /> -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch b/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch similarity index 96% rename from src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch rename to src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch index 43697b0f5..a55fd9878 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch @@ -1,7 +1,7 @@ -From d3c633ad00408b2b6122b70d9a152d1ab79c8378 Mon Sep 17 00:00:00 2001 +From 2df1980c2c657c364bf86f35830396f9d1b6e5c9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 11:01:04 -0500 -Subject: [PATCH 2/2] Upgrade to .NET 6 SDK. +Subject: [PATCH 5/8] Upgrade to .NET 6 SDK. --- .../NuGet.Commands/SignCommand/CertificateProvider.cs | 4 ++-- @@ -94,10 +94,10 @@ index 7c9595268..1ca751850 100644 #else object result; diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -index 67a1726b6..0534e936e 100644 +index c7bcb54bb..30d86fcc9 100644 --- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -@@ -81,7 +81,7 @@ public class HttpRetryHandler : IHttpRetryHandler +@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) headerStopwatch = new Stopwatch(); stopwatches.Add(headerStopwatch); } @@ -120,5 +120,5 @@ index b9ab58ce7..ebf738e52 100644 new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), out stopwatches)) -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch similarity index 72% rename from src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch rename to src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch index b193f1b24..cbc7fc79e 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch @@ -1,14 +1,15 @@ -From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 +From 5f983c2b8c038e86096be2d518ce49208a5fd430 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 20 Aug 2021 15:30:52 -0500 -Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. +Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for + VSTest. --- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 65f261dc1..ed81ecf24 100644 +index f29551741..a89b516c6 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -17,9 +18,9 @@ index 65f261dc1..ed81ecf24 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + $(TargetFrameworksLibrary);netstandard2.0 - $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 + true -- -2.18.0 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch similarity index 83% rename from src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch rename to src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch index fb84712c1..06cb112cf 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch @@ -1,14 +1,14 @@ -From d0596ee04233142bbaa9b3587f2c8b3a0bd82f8f Mon Sep 17 00:00:00 2001 +From f5d3b8b8c189df9bf1644a9e26b3c6b57e353e84 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 27 Aug 2021 01:52:56 +0000 -Subject: [PATCH] NuGet.Build.Tasks.Pack source-build support +Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support --- - .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..c7425dbe8 100644 +index f11dd752b..1be4f8952 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -180,13 +180,16 @@ @@ -31,5 +31,5 @@ index f11dd752b..c7425dbe8 100644 -- -2.29.2 +2.31.1 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch b/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch similarity index 92% rename from src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch rename to src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch index 99ab03f60..464c0bf2f 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 4af707e198a2531f45ae56566cb49fd796070c59 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 21 Jul 2021 17:33:03 -0500 -Subject: [PATCH] Update Microsoft.Extensions.CommandLineUtils reference +Subject: [PATCH 8/8] Update Microsoft.Extensions.CommandLineUtils reference Microsoft.Extensions.CommandLineUtils is obsolete and no longer being built. Because of this it can't be source-built. Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. @@ -11,7 +11,7 @@ Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index 614a0ca68..f6be9619e 100644 +index ab0064b66..534f26ae3 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -8,6 +8,7 @@ @@ -22,7 +22,7 @@ index 614a0ca68..f6be9619e 100644 -@@ -31,7 +32,7 @@ +@@ -37,7 +38,7 @@ @@ -44,3 +44,6 @@ index 21015c00a..e306cdee4 100644 +-- +2.31.1 + From 2823ea21fb3dbc210d793258fdefb2defae2feda Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 14:48:13 -0500 Subject: [PATCH 04/14] Introduce temporary dependency from templating on NuGet to ensure it picks up the new fixed packages. --- .../tarball/content/repos/templating.proj | 2 ++ ...-all-TFMs-for-source-build-to-suppor.patch | 32 ------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repos/templating.proj index be7f3414d..5c6eb4014 100644 --- a/src/SourceBuild/tarball/content/repos/templating.proj +++ b/src/SourceBuild/tarball/content/repos/templating.proj @@ -16,6 +16,8 @@ + + diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch deleted file mode 100644 index 046864705..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 20 Oct 2021 15:19:29 -0500 -Subject: [PATCH] Restore building all TFMs for source-build to support NuGet - to support templating. - ---- - src/Directory.Build.props | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index b0e233194..7e0c7d8c8 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -27,13 +27,12 @@ - - - $(FullFrameworkTFM);netstandard2.0 -- netstandard2.0 - $(FullFrameworkTFM) - AnyCPU - - - net6.0 -- $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) -+ $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) - $(FullFrameworkTFM) - - --- -2.31.1 - From cb5ef3f9e2e52855c356e56b62343ce5f50e8253 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 16:30:37 -0500 Subject: [PATCH 05/14] NuGet also depends on XDT - add netstandard2.0 there. --- ...-for-netstandard2.0-to-support-NuGet.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch diff --git a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch new file mode 100644 index 000000000..de9bbee75 --- /dev/null +++ b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch @@ -0,0 +1,25 @@ +From e5fa6b10f5e4bcb14e3930e4eeae7181765529ee Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 21 Oct 2021 16:29:32 -0500 +Subject: [PATCH] Also build for netstandard2.0 to support NuGet. + +--- + .../Microsoft.Web.XmlTransform.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj +index 7cb81d1..f272d7f 100644 +--- a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj ++++ b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj +@@ -3,7 +3,7 @@ + + + +- netstandard2.1 ++ netstandard2.0;netstandard2.1 + AnyCPU + true + false +-- +2.31.1 + From dde04b27b17e87c60b726760148f58fe437818ae Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 19:36:07 -0500 Subject: [PATCH 06/14] Have to fix some conditionals for multiple netstandards. --- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index c63ce0ccb..f0c80212a 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,4 +1,4 @@ -From 98fd2091519fa4c6d9ab850eaea92700b00803dc Mon Sep 17 00:00:00 2001 +From bb17144917b0e242214a10467507db5f987e3af8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 @@ -6,11 +6,13 @@ Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 --- build/common.project.props | 10 +++++----- build/common.targets | 2 +- + .../NuGet.Build.Tasks.Pack.csproj | 2 +- src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - - .../NuGet.Configuration/NuGet.Configuration.csproj | 1 - + .../NuGet.Configuration/NuGet.Configuration.csproj | 3 +-- .../NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - + .../NuGet.PackageManagement.csproj | 2 +- .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - - 6 files changed, 6 insertions(+), 10 deletions(-) + 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build/common.project.props b/build/common.project.props index e2e3c0c11..000702f58 100644 @@ -52,6 +54,19 @@ index 6fd5bd260..3de830b25 100644 $(DefineConstants);IS_CORECLR true +diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +index f11dd752b..babf5bbef 100644 +--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj ++++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +@@ -177,7 +177,7 @@ + + ilmerge\ + Desktop/ +- CoreCLR/ ++ CoreCLR/ + + + diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj index e30a079eb..c2b8fe241 100644 --- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj @@ -65,7 +80,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..fc4d42502 100644 +index bbc5ba480..b1d16aa51 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -76,6 +91,15 @@ index bbc5ba480..fc4d42502 100644 true true +@@ -29,7 +28,7 @@ + + + +- ++ + + + diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj index 65f261dc1..f29551741 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -88,6 +112,19 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true +diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +index dfbfcaa8d..7de38de78 100644 +--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj ++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +@@ -35,7 +35,7 @@ + + + +- ++ + + + diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj index 180293944..8498664b9 100644 --- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj From de12f87965b794e3738b09730032735e791d0824 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 19:36:39 -0500 Subject: [PATCH 07/14] Patch resolution --- .../0007-NuGet.Build.Tasks.Pack-source-build-support.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch index 06cb112cf..ebefdb611 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch @@ -1,4 +1,4 @@ -From f5d3b8b8c189df9bf1644a9e26b3c6b57e353e84 Mon Sep 17 00:00:00 2001 +From e4fcd14ceca14d4b1995b4244e33923eef7b9f55 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 27 Aug 2021 01:52:56 +0000 Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support @@ -8,11 +8,11 @@ Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..1be4f8952 100644 +index babf5bbef..769406b67 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -180,13 +180,16 @@ - CoreCLR/ + CoreCLR/ - From 77b70c9c64d184047170491a562baae3bcb1cf2d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 21 Oct 2021 21:58:56 -0500 Subject: [PATCH 08/14] Actually only do this for netstandard. --- .../0002-Update-netcoreapp-TFMs-to-6.0.patch | 14 +++++++------- ...Get.Build.Tasks.Pack-source-build-support.patch | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index f0c80212a..7d4ddd34b 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,4 +1,4 @@ -From bb17144917b0e242214a10467507db5f987e3af8 Mon Sep 17 00:00:00 2001 +From aed379060eb37815d1eebd1cb5232d5a0cc931bc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 @@ -55,7 +55,7 @@ index 6fd5bd260..3de830b25 100644 true diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index f11dd752b..babf5bbef 100644 +index f11dd752b..d4f11aad5 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -177,7 +177,7 @@ @@ -63,7 +63,7 @@ index f11dd752b..babf5bbef 100644 ilmerge\ Desktop/ - CoreCLR/ -+ CoreCLR/ ++ CoreCLR/ @@ -80,7 +80,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..b1d16aa51 100644 +index bbc5ba480..be230f29b 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -96,7 +96,7 @@ index bbc5ba480..b1d16aa51 100644 - -+ ++ @@ -113,7 +113,7 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..7de38de78 100644 +index dfbfcaa8d..bfca46bec 100644 --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj @@ -35,7 +35,7 @@ @@ -121,7 +121,7 @@ index dfbfcaa8d..7de38de78 100644 - -+ ++ diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch index ebefdb611..76cb439b4 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch @@ -1,4 +1,4 @@ -From e4fcd14ceca14d4b1995b4244e33923eef7b9f55 Mon Sep 17 00:00:00 2001 +From 36e519a13431f36cd30e44a91d3b4f81c6753528 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 27 Aug 2021 01:52:56 +0000 Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support @@ -8,11 +8,11 @@ Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj -index babf5bbef..769406b67 100644 +index d4f11aad5..f4d083e52 100644 --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj @@ -180,13 +180,16 @@ - CoreCLR/ + CoreCLR/ - From c29087f7a2a8bc73b755ed419c666a9af88b25c0 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 02:11:37 -0500 Subject: [PATCH 09/14] These also apply for net6.0. --- .../nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 7d4ddd34b..202bda09a 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -96,7 +96,7 @@ index bbc5ba480..be230f29b 100644 - -+ ++ @@ -121,7 +121,7 @@ index dfbfcaa8d..bfca46bec 100644 - -+ ++ From 298effbfccb4f53c52379df79b87d83269ea8d19 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 09:54:00 -0500 Subject: [PATCH 10/14] Workaround for F# smoke-tests. --- src/SourceBuild/tarball/content/smoke-test.sh | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 5adebbe2f..e6b6e5ae6 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -247,21 +247,39 @@ function doCommand() { wait $! echo " terminated with exit code $?" | tee -a "$logFile" elif [ "$1" == "multi-rid-publish" ]; then - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - } + if [ "$lang" == "F#" ]; then + # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 + runPublishScenarios() { + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true + } + else + runPublishScenarios() { + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + } + fi if [ "$projectOutput" == "true" ]; then runPublishScenarios | tee -a "$logFile" else runPublishScenarios >> "$logFile" 2>&1 fi else - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" + if [ "$lang" == "F#" ]; then + # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 + if [ "$projectOutput" == "true" ]; then + "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile" + else + "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1 + fi else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 + if [ "$projectOutput" == "true" ]; then + "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" + else + "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 + fi fi fi if [ $? -eq 0 ]; then @@ -305,7 +323,8 @@ function runAllTests() { doCommand VB xunit new restore test doCommand VB mstest new restore test - doCommand F# console new restore build run multi-rid-publish + # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 + doCommand F# console new restore build multi-rid-publish doCommand F# classlib new restore build multi-rid-publish doCommand F# xunit new restore test doCommand F# mstest new restore test @@ -334,10 +353,12 @@ function runWebTests() { # doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish - doCommand F# web "$@" new restore build run multi-rid-publish + # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 + doCommand F# web "$@" new restore build multi-rid-publish # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 # doCommand F# mvc "$@" new restore build run multi-rid-publish - doCommand F# webapi "$@" new restore build run multi-rid-publish + # "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554 + doCommand F# webapi "$@" new restore build multi-rid-publish } function runXmlDocTests() { From 4fcb26a608e7f0ef0bbaf92482e0dce3f4578169 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 09:58:19 -0500 Subject: [PATCH 11/14] Fix sloppy patching. --- ...-Don-t-use-PublicApiAnalyzer-on-source-build.patch | 9 +++++---- ...ce-built-Microsoft.Web.Xdt-System.ComponentM.patch | 8 ++++---- ...cript-changes-to-support-ArPow-from-tarball.patch} | 10 +++++----- ...T-6-SDK.patch => 0006-Upgrade-to-.NET-6-SDK.patch} | 10 +++++----- ...et.Frameworks-for-netstandard-as-well-for-V.patch} | 11 +++++------ ...NuGet.Build.Tasks.Pack-source-build-support.patch} | 0 ...osoft.Extensions.CommandLineUtils-reference.patch} | 11 ++++------- 7 files changed, 28 insertions(+), 31 deletions(-) rename src/SourceBuild/tarball/patches/nuget-client/{0004-Build-script-changes-to-support-ArPow-from-tarball.patch => 0005-Build-script-changes-to-support-ArPow-from-tarball.patch} (94%) rename src/SourceBuild/tarball/patches/nuget-client/{0005-Upgrade-to-.NET-6-SDK.patch => 0006-Upgrade-to-.NET-6-SDK.patch} (96%) rename src/SourceBuild/tarball/patches/nuget-client/{0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch => 0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch} (72%) rename src/SourceBuild/tarball/patches/nuget-client/{0007-NuGet.Build.Tasks.Pack-source-build-support.patch => 0008-NuGet.Build.Tasks.Pack-source-build-support.patch} (100%) rename src/SourceBuild/tarball/patches/nuget-client/{0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch => 0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch} (92%) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch index 8ab3267b2..1cb91f3d3 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch @@ -1,16 +1,17 @@ -From 198d70708016e5406e0d525567ca58962e222399 Mon Sep 17 00:00:00 2001 +From 335f32e48fd5604cdb1340ec04d6503a3e43d783 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:09:35 +0000 -Subject: [PATCH 1/8] Don't use PublicApiAnalyzer on source-build +Subject: [PATCH] Don't use PublicApiAnalyzer on source-build CSC : warning AD0001: Analyzer 'Microsoft.CodeAnalysis.PublicApiAnalyzers.DeclarePublicApiAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. CSC : error CS2001: Source file '/repos/installer2/artifacts/tarball/src/nuget-client.7363366401b43f4ea250394db8dad3707e9a9636/src/NuGet.Core/NuGet.Common/PublicAPI/net6.0/PublicAPI.Shipped.txt' could not be found. + --- build/common.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/common.targets b/build/common.targets -index 7a353ebf8..6fd5bd260 100644 +index 2c387f576..cf5a70c62 100644 --- a/build/common.targets +++ b/build/common.targets @@ -65,6 +65,11 @@ @@ -26,5 +27,5 @@ index 7a353ebf8..6fd5bd260 100644 true -- -2.31.1 +2.29.2 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch index 6fdfe9478..714b0ea00 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch @@ -1,7 +1,7 @@ -From abf05bf4b06ab5d47372d166b7bb6c2c6bb4e6a2 Mon Sep 17 00:00:00 2001 +From fecc40e502197e65804177b2aec49a7a5422ed6e Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH 3/8] Use source-built Microsoft.Web.Xdt & +Subject: [PATCH 3/5] Use source-built Microsoft.Web.Xdt & System.ComponentModel.Composition --- @@ -9,7 +9,7 @@ Subject: [PATCH 3/8] Use source-built Microsoft.Web.Xdt & 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index 614a0ca68..ab0064b66 100644 +index 6f72ac3fd..8317f3903 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -15,6 +15,12 @@ @@ -39,5 +39,5 @@ index 614a0ca68..ab0064b66 100644 The Microsoft.VisualStudio.SDK metapackage brings in System.Threading.Tasks.Dataflow 4.11.1 (assembly version 4.9.5.0). However, our MSBuild integration tests use Microsoft.Build 16.8.0, which requires System.Threading.Tasks.Dataflow 4.9.0 (assembly version 4.9.3.0). -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch b/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch similarity index 94% rename from src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch rename to src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch index 6ae95d42f..df670d2df 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0004-Build-script-changes-to-support-ArPow-from-tarball.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch @@ -1,7 +1,7 @@ -From c77a8c754381600ec891c5601b2c5cd9c8945d26 Mon Sep 17 00:00:00 2001 +From 9e35a4d319f3288a50bdaf5b32661764761aa0e9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 10:59:36 -0500 -Subject: [PATCH 4/8] Build script changes to support ArPow from tarball. +Subject: [PATCH 4/5] Build script changes to support ArPow from tarball. --- eng/source-build/build.sh | 27 +++++++++++++++++++++++++-- @@ -9,7 +9,7 @@ Subject: [PATCH 4/8] Build script changes to support ArPow from tarball. 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 3bb69b2b0..ee1221d56 100755 +index 3bb69b2b0..aaff8ef0f 100755 --- a/eng/source-build/build.sh +++ b/eng/source-build/build.sh @@ -13,6 +13,25 @@ while [[ -h $source ]]; do @@ -54,7 +54,7 @@ index 3bb69b2b0..ee1221d56 100755 -"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" +"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args diff --git a/eng/source-build/source-build.proj b/eng/source-build/source-build.proj -index 72058ac88..cbdd6d819 100644 +index 6f90f9793..91ea2d032 100644 --- a/eng/source-build/source-build.proj +++ b/eng/source-build/source-build.proj @@ -4,6 +4,8 @@ @@ -84,5 +84,5 @@ index 72058ac88..cbdd6d819 100644 /> -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch b/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch similarity index 96% rename from src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch rename to src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch index a55fd9878..43697b0f5 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0005-Upgrade-to-.NET-6-SDK.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch @@ -1,7 +1,7 @@ -From 2df1980c2c657c364bf86f35830396f9d1b6e5c9 Mon Sep 17 00:00:00 2001 +From d3c633ad00408b2b6122b70d9a152d1ab79c8378 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Aug 2021 11:01:04 -0500 -Subject: [PATCH 5/8] Upgrade to .NET 6 SDK. +Subject: [PATCH 2/2] Upgrade to .NET 6 SDK. --- .../NuGet.Commands/SignCommand/CertificateProvider.cs | 4 ++-- @@ -94,10 +94,10 @@ index 7c9595268..1ca751850 100644 #else object result; diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -index c7bcb54bb..30d86fcc9 100644 +index 67a1726b6..0534e936e 100644 --- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs +++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs -@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader) +@@ -81,7 +81,7 @@ public class HttpRetryHandler : IHttpRetryHandler headerStopwatch = new Stopwatch(); stopwatches.Add(headerStopwatch); } @@ -120,5 +120,5 @@ index b9ab58ce7..ebf738e52 100644 new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), out stopwatches)) -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch similarity index 72% rename from src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch rename to src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch index cbc7fc79e..b193f1b24 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0006-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch @@ -1,15 +1,14 @@ -From 5f983c2b8c038e86096be2d518ce49208a5fd430 Mon Sep 17 00:00:00 2001 +From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 20 Aug 2021 15:30:52 -0500 -Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for - VSTest. +Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. --- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index f29551741..a89b516c6 100644 +index 65f261dc1..ed81ecf24 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -18,9 +17,9 @@ index f29551741..a89b516c6 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + $(TargetFrameworksLibrary);netstandard2.0 + $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 - true -- -2.31.1 +2.18.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch similarity index 100% rename from src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch rename to src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch diff --git a/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch b/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch similarity index 92% rename from src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch rename to src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch index 464c0bf2f..99ab03f60 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0008-Update-Microsoft.Extensions.CommandLineUtils-referen.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0009-Update-Microsoft.Extensions.CommandLineUtils-reference.patch @@ -1,7 +1,7 @@ -From 4af707e198a2531f45ae56566cb49fd796070c59 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 21 Jul 2021 17:33:03 -0500 -Subject: [PATCH 8/8] Update Microsoft.Extensions.CommandLineUtils reference +Subject: [PATCH] Update Microsoft.Extensions.CommandLineUtils reference Microsoft.Extensions.CommandLineUtils is obsolete and no longer being built. Because of this it can't be source-built. Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. @@ -11,7 +11,7 @@ Microsoft.Extensions.CommandLineUtils.Sources is handled as a text-only SBRP. 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/packages.targets b/build/packages.targets -index ab0064b66..534f26ae3 100644 +index 614a0ca68..f6be9619e 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -8,6 +8,7 @@ @@ -22,7 +22,7 @@ index ab0064b66..534f26ae3 100644 -@@ -37,7 +38,7 @@ +@@ -31,7 +32,7 @@ @@ -44,6 +44,3 @@ index 21015c00a..e306cdee4 100644 --- -2.31.1 - From f951587509d9010101aa3d9c63abbc00c8acac5c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 09:58:54 -0500 Subject: [PATCH 12/14] This really does rely on NuGet. --- src/SourceBuild/tarball/content/repos/templating.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/templating.proj b/src/SourceBuild/tarball/content/repos/templating.proj index 5c6eb4014..7cc53299c 100644 --- a/src/SourceBuild/tarball/content/repos/templating.proj +++ b/src/SourceBuild/tarball/content/repos/templating.proj @@ -15,9 +15,8 @@ - - + From ed6eb2db8e74085166f4732738d16d67063e27aa Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 10:19:59 -0500 Subject: [PATCH 13/14] Fix patch conflict. --- ...Get.Frameworks-for-netstandard-as-well-for-V.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch index b193f1b24..f2845572c 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch @@ -1,14 +1,15 @@ -From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 +From be9f7f1415250433578ed6aa36da13a4442aff8f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 20 Aug 2021 15:30:52 -0500 -Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. +Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for + VSTest. --- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 65f261dc1..ed81ecf24 100644 +index f29551741..a89b516c6 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -17,9 +18,9 @@ index 65f261dc1..ed81ecf24 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + $(TargetFrameworksLibrary);netstandard2.0 - $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 + true -- -2.18.0 +2.31.1 From 7f468fe5e66b37f1a35d989fa263a79e2b0212c5 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 10:21:51 -0500 Subject: [PATCH 14/14] Add patch issues to the patches. --- .../0003-Restore-building-all-TFMs-for-source-build.patch | 1 + .../nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch | 8 +++++--- ...1-Also-build-for-netstandard2.0-to-support-NuGet.patch | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch index ddb0688ae..04c684a0d 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Restore building all TFMs for source-build Required for omnisharp, nuget-client, templating Background Issue: https://github.com/dotnet/source-build/issues/2542 +Patch removal issue: https://github.com/dotnet/source-build/issues/2556 --- src/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 202bda09a..2400ef3e6 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,8 +1,10 @@ -From aed379060eb37815d1eebd1cb5232d5a0cc931bc Mon Sep 17 00:00:00 2001 +From de74c87d3f9364be1f3bdba43844c8de92704757 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2555. + --- build/common.project.props | 10 +++++----- build/common.targets | 2 +- @@ -80,7 +82,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..be230f29b 100644 +index bbc5ba480..18b597c74 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -113,7 +115,7 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..bfca46bec 100644 +index dfbfcaa8d..a6bb51d6b 100644 --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj @@ -35,7 +35,7 @@ diff --git a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch index de9bbee75..1194e09a5 100644 --- a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch +++ b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch @@ -3,6 +3,8 @@ From: Chris Rummel Date: Thu, 21 Oct 2021 16:29:32 -0500 Subject: [PATCH] Also build for netstandard2.0 to support NuGet. +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2557. + --- .../Microsoft.Web.XmlTransform.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)