diff --git a/src/SourceBuild/tarball/content/patches/aspnetcore/0005-Add-installer-artifacts-to-source-build-intermediate.patch b/src/SourceBuild/tarball/content/patches/aspnetcore/0005-Add-installer-artifacts-to-source-build-intermediate.patch deleted file mode 100644 index 4eaef1357..000000000 --- a/src/SourceBuild/tarball/content/patches/aspnetcore/0005-Add-installer-artifacts-to-source-build-intermediate.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a5620750c0d6c6fd8652daf7064fbc3622b6d320 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Mon, 16 Aug 2021 16:49:27 +0000 -Subject: [PATCH] Add installer artifacts to source build intermediate - ---- - eng/SourceBuild.props | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 5c714e42c4..e7024a7707 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -60,4 +60,19 @@ - - - -+ -+ -+ $(CurrentRepoSourceBuildArtifactsDir)\installers\$(Configuration)\ -+ -+ -+ -+ -+ -+ -+ -+ -+ - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/runtime/0001-Conditionally-build-allconfigurations.patch b/src/SourceBuild/tarball/content/patches/runtime/0001-Conditionally-build-allconfigurations.patch deleted file mode 100644 index e9efdd2fd..000000000 --- a/src/SourceBuild/tarball/content/patches/runtime/0001-Conditionally-build-allconfigurations.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c1eaa569a1ebe3aa688ca251fcbcb42ee086cf27 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 18 Aug 2021 12:20:24 +0000 -Subject: [PATCH] Conditionally build allconfigurations - -When building portable, only a subset of runtime needs to be -built. allconfigurations is only needed in a non-portable build. ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 7dfc80d41fd..1e3bd504931 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -37,7 +37,7 @@ - $(InnerBuildArgs) --arch $(TargetRidPlatform) - $(InnerBuildArgs) --configuration $(Configuration) - $(InnerBuildArgs) --ci -- $(InnerBuildArgs) --allconfigurations -+ $(InnerBuildArgs) --allconfigurations - $(InnerBuildArgs) --verbosity $(LogVerbosity) - $(InnerBuildArgs) --nodereuse false - $(InnerBuildArgs) --warnAsError false --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/patches/sdk/0004-Add-toolset-zip-as-source-build-intermediate.patch b/src/SourceBuild/tarball/content/patches/sdk/0004-Add-toolset-zip-as-source-build-intermediate.patch deleted file mode 100644 index 48e74d240..000000000 --- a/src/SourceBuild/tarball/content/patches/sdk/0004-Add-toolset-zip-as-source-build-intermediate.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3c008b2c3f04f2d0bd04ae0c1f7d56a64141842c Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Mon, 16 Aug 2021 16:33:33 +0000 -Subject: [PATCH] Add toolset zip as source build intermediate - ---- - eng/SourceBuild.props | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 8bc7785fb..539a1490a 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -11,4 +11,14 @@ - - - -+ -+ -+ -+ -+ -+ -+ - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/sdk/0004-Disable-CA1416-for-ProcessExtensions.patch b/src/SourceBuild/tarball/content/patches/sdk/0004-Disable-CA1416-for-ProcessExtensions.patch deleted file mode 100644 index e2e847cbe..000000000 --- a/src/SourceBuild/tarball/content/patches/sdk/0004-Disable-CA1416-for-ProcessExtensions.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3e0c6887921670b5d9e312b121791307516a4ce2 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 18 Aug 2021 11:41:59 +0000 -Subject: [PATCH] Disable CA1416 for ProcessExtensions - -Since source-build loads an updated version of code analysis, this -warning is showing up here. Disable warning, since code is meant -to be windows only. - -Eliminates errors like: - /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,20): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.ManagementObjectEnumerator.MoveNext()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj] - /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(35,55): error CA1416: This call site is reachable on all platforms. 'ManagementObjectSearcher.Get()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj] - /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(36,80): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.GetEnumerator()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj] - /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,60): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.ManagementObjectEnumerator.Current' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj] - /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(34,49): error CA1416: This call site is reachable on all platforms. 'ManagementObjectSearcher' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj] - /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,60): error CA1416: This call site is reachable on all platforms. 'ManagementBaseObject.GetPropertyValue(string)' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj] ---- - .../Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs -index a9e9880c7..82519dc63 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs -@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Cli.Utils - /// - public static class ProcessExtensions - { -+#pragma warning disable CA1416 - /// - /// Returns the parent process of this process by querying the Win32_Process class. - /// -@@ -37,5 +38,6 @@ public static int GetParentProcessId(this Process process) - - return enumerator.MoveNext() ? Convert.ToInt32(enumerator.Current.GetPropertyValue("ParentProcessId")) : -1; - } -+#pragma warning restore CA1416 - } - } --- -2.31.1 -