diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 4eed64123..a779e9213 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -7,7 +7,7 @@ $(BuildCommandArgs) --arch $(Platform) $(BuildCommandArgs) --no-build-repo-tasks - $(BuildCommandArgs) /p:BuildNodeJs=false + $(BuildCommandArgs) --no-build-nodejs $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-Disable-warning-CS0618.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch similarity index 100% rename from src/SourceBuild/tarball/patches/aspnetcore/0002-Disable-warning-CS0618.patch rename to src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.patch deleted file mode 100644 index aa344aefa..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.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] NoWarn IL2070 - -Backport: https://github.com/dotnet/aspnetcore/issues/43253 ---- - Directory.Build.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 166dbd6487..d5b1c9a1a8 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -113,6 +113,7 @@ - - $(NoWarn.Replace('1591', '')) - $(NoWarn);0105 -+ $(NoWarn);IL2070 - - - $(WarningsNotAsErrors);CS1591 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch b/src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch deleted file mode 100644 index e006dc156..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 15 Aug 2022 16:21:57 -0700 -Subject: [PATCH] Don't override BuildNodeJS in build.sh - -Backport: https://github.com/dotnet/aspnetcore/issues/43310 ---- - eng/build.sh | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/eng/build.sh b/eng/build.sh -index a6b6ba99be..0e4daad48c 100755 ---- a/eng/build.sh -+++ b/eng/build.sh -@@ -271,7 +271,6 @@ fi - # Only set these MSBuild properties if they were explicitly set by build parameters. - [ ! -z "$build_java" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildJava=$build_java" - [ ! -z "$build_native" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNative=$build_native" --[ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJS=$build_nodejs" - [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed" - [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers" - diff --git a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch b/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch index b35252048..d9bae526a 100644 --- a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch +++ b/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch @@ -4,7 +4,7 @@ Date: Fri, 12 Aug 2022 20:58:39 +0000 Subject: [PATCH] Update ILLink.RoslynAnalyzer Microsoft.CodeAnalysis.CSharp reference for source-build -backport: https://github.com/dotnet/source-build/issues/2973 +backport: https://github.com/dotnet/linker/pull/3045 --- src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch deleted file mode 100644 index 7a7d5bf8f..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Wed, 3 Aug 2022 10:37:03 -0700 -Subject: [PATCH] Don't use ref struct in Enumerator constructor - ---- - src/StringTools/InternableString.cs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/StringTools/InternableString.cs b/src/StringTools/InternableString.cs -index f04d2a9e9..dc788767a 100644 ---- a/src/StringTools/InternableString.cs -+++ b/src/StringTools/InternableString.cs -@@ -33,7 +33,7 @@ namespace Microsoft.NET.StringTools - /// - private int _charIndex; - -- internal Enumerator(ref InternableString str) -+ internal Enumerator(InternableString str) - { - _string = str; - _spanIndex = -1; -@@ -170,7 +170,7 @@ namespace Microsoft.NET.StringTools - /// The enumerator. - public Enumerator GetEnumerator() - { -- return new Enumerator(ref this); -+ return new Enumerator(this); - } - - ///