From e15e12056b6ae469d9e31f4a01c6b3f9d7db64a4 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 3 Jan 2023 22:48:19 +0000 Subject: [PATCH] Updates to account for source-build directory changes --- ...-Exclude-Analyzers-from-source-build.patch | 0 .../pipelines/security-partners-dotnet.yml | 18 ---------- ...solvePackageFileConflicts-workaround.patch | 23 ------------ .../aspnetcore/0002-IDE0060-workaround.patch | 22 ------------ .../0003-Address-obsolete-errors.patch | 24 ------------- ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 ------------------- 6 files changed, 123 deletions(-) rename src/SourceBuild/{tarball => }/patches/razor/0001-Exclude-Analyzers-from-source-build.patch (100%) delete mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch diff --git a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/patches/razor/0001-Exclude-Analyzers-from-source-build.patch similarity index 100% rename from src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch rename to src/SourceBuild/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml deleted file mode 100644 index 69bef21e9..000000000 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ /dev/null @@ -1,18 +0,0 @@ -trigger: none - -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu2004-Offline: - _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 - pool: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch deleted file mode 100644 index 62a4f8d31..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 12 Aug 2022 23:02:54 +0000 -Subject: [PATCH] IDE0060 workaround - -Backport: https://github.com/dotnet/roslyn-analyzers/issues/6228 ---- - src/Http/Routing/src/Matching/Ascii.cs | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/Http/Routing/src/Matching/Ascii.cs b/src/Http/Routing/src/Matching/Ascii.cs -index 081af0bb07..393a9eb65f 100644 ---- a/src/Http/Routing/src/Matching/Ascii.cs -+++ b/src/Http/Routing/src/Matching/Ascii.cs -@@ -12,7 +12,6 @@ internal static class Ascii - // and we know that the spans are the same length. - // - // Similar to https://github.com/dotnet/coreclr/blob/master/src/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs#L549 -- [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool AsciiIgnoreCaseEquals(ReadOnlySpan a, ReadOnlySpan b, int length) - { - // The caller should have checked the length. We enforce that here by THROWING if the diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch deleted file mode 100644 index b98759d70..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 27 Oct 2022 02:47:08 +0000 -Subject: [PATCH] Address obsolete errors - -Backport: https://github.com/dotnet/aspnetcore/pull/44734 ---- - src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -index f31880e891..fc6322dd41 100644 ---- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -+++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -@@ -252,9 +252,6 @@ public class KestrelServerOptions - writer.WritePropertyName(nameof(AllowResponseHeaderCompression)); - writer.WriteBooleanValue(AllowResponseHeaderCompression); - -- writer.WritePropertyName(nameof(EnableAltSvc)); -- writer.WriteBooleanValue(EnableAltSvc); -- - writer.WritePropertyName(nameof(IsDevCertLoaded)); - writer.WriteBooleanValue(IsDevCertLoaded); - diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch deleted file mode 100644 index e8b8f38fd..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 15 Nov 2022 17:34:00 +0000 -Subject: [PATCH] Address Microsoft.Build.Locator prebuilt - -Backport: https://github.com/dotnet/format/issues/1759 ---- - Directory.Packages.props | 2 +- - eng/Versions.props | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c4bf3cf..f7e85b2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -10,7 +10,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index fcd583b..2933963 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -14,6 +14,7 @@ - - - 17.3.0-preview-22302-02 -+ 1.5.5 - 3.3.3 - 7.0.0-rc.1.22426.10 -