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 -