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 deleted file mode 100644 index 1cb91f3d3..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 335f32e48fd5604cdb1340ec04d6503a3e43d783 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 - -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 ---- a/build/common.targets -+++ b/build/common.targets -@@ -65,6 +65,11 @@ - - - -+ -+ -+ false -+ -+ - - - true --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch new file mode 100644 index 000000000..34d37ba0b --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -0,0 +1,296 @@ +From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001 +From: Matt Mitchell +Date: Sat, 23 Oct 2021 16:41:24 -0700 +Subject: [PATCH] Remove uneeded source build patches and re-patch + +--- + build/common.project.props | 16 ++++++---------- + build/packages.targets | 3 ++- + .../NuGet.Build.Tasks.Pack.csproj | 4 ++-- + .../NuGet.CommandLine.XPlat.csproj | 2 +- + .../SignCommand/CertificateProvider.cs | 4 ++-- + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - + .../NuGet.Configuration.csproj | 3 +-- + .../NuGet.Frameworks/NuGet.Frameworks.csproj | 3 +-- + .../NuGet.PackageManagement.csproj | 2 +- + .../Signing/Authoring/SignPackageRequest.cs | 2 ++ + .../NuGet.Packaging/Signing/Cms/NativeUtility.cs | 2 ++ + .../HttpSource/HttpRequestMessageExtensions.cs | 6 +++--- + .../HttpSource/HttpRetryHandler.cs | 2 +- + .../HttpSourceAuthenticationHandler.cs | 2 +- + .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - + 15 files changed, 25 insertions(+), 28 deletions(-) + +diff --git a/build/common.project.props b/build/common.project.props +index 79a935391..65e482b83 100644 +--- a/build/common.project.props ++++ b/build/common.project.props +@@ -10,24 +10,20 @@ + + + +- $(DotNetBuildFromSource) + PackageReference + v4.7.2 + net472 +- netcoreapp2.1 +- net6.0 ++ net6.0 + netcoreapp5.0 +- netstandard2.0 +- net6.0 ++ $(DotNetBuildFromSource) ++ netstandard2.0;net6.0 + $(NETFXTargetFramework);$(NETCoreTargetFramework) + $(NETCoreTargetFramework) +- $(TargetFrameworksExe);netcoreapp5.0 +- $(NETCoreTargetFramework);netcoreapp5.0 +- $(TargetFrameworksExe);net6.0 ++ $(TargetFrameworksExe);net6.0 ++ $(NETCoreTargetFramework);net6.0 + $(NETFXTargetFramework);$(NetStandardVersion) + $(NetStandardVersion) +- $(TargetFrameworksLibrary);netcoreapp5.0 +- $(TargetFrameworksLibrary);net6.0 ++ $(TargetFrameworksLibrary);net6.0 + $(NETFXTargetFramework);netcoreapp5.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ + $(RepositoryRootDirectory)build\ +diff --git a/build/packages.targets b/build/packages.targets +index c11557248..0e7dd7861 100644 +--- a/build/packages.targets ++++ b/build/packages.targets +@@ -10,6 +10,7 @@ + 5.0.0 + 2.14.0-rtm-832 + 17.0.0-beta1-10402-05 ++ 5.0.1-rtm.21063.7 + + + +@@ -33,7 +34,7 @@ + + + +- ++ + + + +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 c94acffd8..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 +@@ -177,7 +177,7 @@ + + ilmerge\ + Desktop/ +- CoreCLR/ ++ CoreCLR/ + + + +@@ -189,7 +189,7 @@ + + $(PackagePathDir) + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +index 21015c00a..e306cdee4 100644 +--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj ++++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj +@@ -18,7 +18,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs +index c6ea71243..beac41889 100644 +--- a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs ++++ b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs +@@ -115,7 +115,7 @@ public static async Task GetCertificatesAsync(Certif + + return resultCollection; + } +- ++#pragma warning disable CS1998 + private static async Task LoadCertificateFromFileAsync(CertificateSourceOptions options) + { + X509Certificate2 cert; +@@ -154,7 +154,7 @@ private static async Task LoadCertificateFromFileAsync(Certifi + + return cert; + } +- ++#pragma warning restore CS1998 + private static X509Certificate2Collection LoadCertificateFromStore(CertificateSourceOptions options) + { + X509Certificate2Collection resultCollection = null; +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..18b597c74 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 +@@ -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 b78b1f2ea..a89b516c6 100644 +--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj ++++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +@@ -4,8 +4,7 @@ + + + NuGet's understanding of target frameworks. +- $(TargetFrameworksLibrary);netstandard2.0 +- $(TargetFrameworksLibrary);net40 ++ $(TargetFrameworksLibrary);netstandard2.0 + + $(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..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/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs +index e0cfae99f..ce19f2d6e 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs +@@ -98,7 +98,9 @@ protected virtual void Dispose(bool disposing) + Chain?.Dispose(); + + #if IS_SIGNING_SUPPORTED ++#pragma warning disable CA1416 + PrivateKey?.Dispose(); ++#pragma warning restore CA1416 + #endif + } + +diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs +index 565ac60b7..d57e38a65 100644 +--- a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs ++++ b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs +@@ -120,7 +120,9 @@ internal static SignedCms NativeSign(CmsSigner cmsSigner, byte[] data, CngKey pr + + signerInfo.cbSize = (uint)Marshal.SizeOf(signerInfo); + signerInfo.pCertInfo = MarshalUtility.PtrToStructure(cmsSigner.Certificate.Handle).pCertInfo; ++#pragma warning disable CA1416 + signerInfo.hCryptProvOrhNCryptKey = privateKey.Handle.DangerousGetHandle(); ++#pragma warning restore CA1416 + signerInfo.HashAlgorithm.pszObjId = cmsSigner.DigestAlgorithm.Value; + + if (cmsSigner.SignerIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier) +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs +index 7c9595268..1ca751850 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs +@@ -34,7 +34,7 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage request) + clone.Headers.TryAddWithoutValidation(header.Key, header.Value); + } + +-#if NET5_0 ++#if NET5_0 || NET6_0 + var clonedOptions = (IDictionary)clone.Options; + foreach (var option in request.Options) + { +@@ -118,7 +118,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest + throw new ArgumentNullException(nameof(configuration)); + } + +-#if NET5_0 ++#if NET5_0 || NET6_0 + request.Options.Set(new HttpRequestOptionsKey(NuGetConfigurationKey), configuration); + #else + request.Properties[NuGetConfigurationKey] = configuration; +@@ -128,7 +128,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest + private static T GetProperty(this HttpRequestMessage request, string key) + { + +-#if NET5_0 ++#if NET5_0 || NET6_0 + if (request.Options.TryGetValue(new HttpRequestOptionsKey(key), out T result)) + #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 +--- 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) + headerStopwatch = new Stopwatch(); + stopwatches.Add(headerStopwatch); + } +-#if NET5_0 ++#if NET5_0 || NET6_0 + requestMessage.Options.Set(new HttpRequestOptionsKey>(StopwatchPropertyName), stopwatches); + #else + requestMessage.Properties[StopwatchPropertyName] = stopwatches; +diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs +index b9ab58ce7..ebf738e52 100644 +--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs ++++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs +@@ -98,7 +98,7 @@ protected override async Task SendAsync(HttpRequestMessage + { + List stopwatches = null; + +-#if NET5_0 ++#if NET5_0 || NET6_0 + if (request.Options.TryGetValue( + new HttpRequestOptionsKey>(HttpRetryHandler.StopwatchPropertyName), + out stopwatches)) +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.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 deleted file mode 100644 index 2400ef3e6..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ /dev/null @@ -1,144 +0,0 @@ -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 +- - .../NuGet.Build.Tasks.Pack.csproj | 2 +- - src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 - - .../NuGet.Configuration/NuGet.Configuration.csproj | 3 +-- - .../NuGet.Frameworks/NuGet.Frameworks.csproj | 1 - - .../NuGet.PackageManagement.csproj | 2 +- - .../NuGet.Versioning/NuGet.Versioning.csproj | 1 - - 8 files changed, 9 insertions(+), 13 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index e2e3c0c11..000702f58 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -13,17 +13,17 @@ - PackageReference - v4.7.2 - net472 -- netcoreapp2.1 -+ net6.0 - netcoreapp5.0 - $(DotNetBuildFromSource) -- netstandard2.0 -+ netstandard2.0;net6.0 - $(NETFXTargetFramework);$(NETCoreTargetFramework) - $(NETCoreTargetFramework) -- $(TargetFrameworksExe);netcoreapp5.0 -- $(NETCoreTargetFramework);netcoreapp5.0 -+ $(TargetFrameworksExe);net6.0 -+ $(NETCoreTargetFramework);net6.0 - $(NETFXTargetFramework);$(NetStandardVersion) - $(NetStandardVersion) -- $(TargetFrameworksLibrary);netcoreapp5.0 -+ $(TargetFrameworksLibrary);net6.0 - $(NETFXTargetFramework);netcoreapp5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ - $(RepositoryRootDirectory)build\ -diff --git a/build/common.targets b/build/common.targets -index 6fd5bd260..3de830b25 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -6,7 +6,7 @@ - true - - -- -+ - $(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..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 @@ - - 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 -+++ 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..18b597c74 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 -@@ -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 -+++ 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.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -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/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.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 deleted file mode 100644 index 714b0ea00..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fecc40e502197e65804177b2aec49a7a5422ed6e 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 & - System.ComponentModel.Composition - ---- - build/packages.targets | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/build/packages.targets b/build/packages.targets -index 6f72ac3fd..8317f3903 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -15,6 +15,12 @@ - 2.4.1 - - -+ -+ -+ 3.0.0 -+ 4.5.0 -+ -+ - - - -@@ -42,10 +48,10 @@ - - - -- -+ - - -- -+ - -@@ -31,7 +32,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -index 21015c00a..e306cdee4 100644 ---- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj -@@ -18,7 +18,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index 3a783fa63..5da9b5bae 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d1fd2aa5e216e49f9da38b0000d006184c540ff2 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 13:40:38 -0700 Subject: [PATCH] Add Features projects to SourceBuild @@ -10,22 +10,20 @@ Subject: [PATCH] Add Features projects to SourceBuild .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - ...icrosoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ - .../Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- - .../LanguageServer/Directory.Build.props | 6 ++++++ - src/Features/Lsif/Directory.Build.props | 6 ++++++ - ...oft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ - src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + .../Microsoft.CodeAnalysis.Features.csproj | 2 +- + .../{ => LanguageServer}/Directory.Build.props | 0 + src/Features/{ => Lsif}/Directory.Build.props | 0 + .../VisualStudio}/Directory.Build.props | 0 src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 7 ++++--- .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 17 files changed, 68 insertions(+), 29 deletions(-) - rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - create mode 100644 src/Features/LanguageServer/Directory.Build.props - create mode 100644 src/Features/Lsif/Directory.Build.props - create mode 100644 src/NuGet/VisualStudio/Directory.Build.props + 15 files changed, 34 insertions(+), 28 deletions(-) + copy src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) + copy src/Features/{ => LanguageServer}/Directory.Build.props (100%) + copy src/Features/{ => Lsif}/Directory.Build.props (100%) + rename src/{Features => NuGet/VisualStudio}/Directory.Build.props (100%) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 182f8a9cdb1..92e316a4744 100644 @@ -41,7 +39,7 @@ index 182f8a9cdb1..92e316a4744 100644 diff --git a/eng/Versions.props b/eng/Versions.props -index e835ef04d52..34cab5c4755 100644 +index 679e77c5e19..96b3981a12c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ @@ -78,8 +76,8 @@ index e835ef04d52..34cab5c4755 100644 true -@@ -129,7 +129,13 @@ - - - -- -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/LanguageServer/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/Lsif/Directory.Build.props b/src/Features/Lsif/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/Lsif/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj -index ac8c80c68fb..d17a5d84802 100644 ---- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj -+++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj -@@ -55,6 +55,10 @@ - InternalUtilities\LambdaUtilities.vb - - -+ -+ -+ -+ - - - -diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/NuGet/VisualStudio/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ +diff --git a/src/Features/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props +similarity index 100% +copy from src/Features/Directory.Build.props +copy to src/Features/LanguageServer/Directory.Build.props +diff --git a/src/Features/Directory.Build.props b/src/Features/Lsif/Directory.Build.props +similarity index 100% +copy from src/Features/Directory.Build.props +copy to src/Features/Lsif/Directory.Build.props +diff --git a/src/Features/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props +similarity index 100% +rename from src/Features/Directory.Build.props +rename to src/NuGet/VisualStudio/Directory.Build.props diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj index 6e1cbe46285..8ca3cbb28f0 100644 --- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj @@ -332,3 +260,6 @@ index 3d0c6e993c0..06773c65e8d 100644 +-- +2.31.1 +