[release/7.0.1xx] Remove unnecessary patches (#14570)
* Remove Aspnetcore patch for IL2070 * Use different argument for skipping nodejs projects in aspnetcore * Update linker patch backport link * Remove unnecessary msbuild patch
This commit is contained in:
parent
e607eccbb4
commit
9d07ef497e
6 changed files with 2 additions and 77 deletions
|
@ -7,7 +7,7 @@
|
|||
<!-- The arch flag (defaults to x64) overrides any value of TargetArchitecture that we might set -->
|
||||
<BuildCommandArgs>$(BuildCommandArgs) --arch $(Platform)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) --no-build-nodejs</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
|
||||
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
||||
included by Arcade -->
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
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 @@
|
||||
<!-- Ensure API docs are available. -->
|
||||
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
|
||||
<NoWarn Condition=" '$(BuildingInsideVisualStudio)' == 'true' ">$(NoWarn);0105</NoWarn>
|
||||
+ <NoWarn>$(NoWarn);IL2070</NoWarn>
|
||||
|
||||
<!-- For local builds, don't make missing XML docs a fatal build error, but still surface so we have visibility into undocumented APIs. -->
|
||||
<WarningsNotAsErrors Condition=" '$(ContinuousIntegrationBuild)' != 'true' ">$(WarningsNotAsErrors);CS1591</WarningsNotAsErrors>
|
|
@ -1,22 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
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"
|
||||
|
|
@ -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(-)
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
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
|
||||
/// </summary>
|
||||
private int _charIndex;
|
||||
|
||||
- internal Enumerator(ref InternableString str)
|
||||
+ internal Enumerator(InternableString str)
|
||||
{
|
||||
_string = str;
|
||||
_spanIndex = -1;
|
||||
@@ -170,7 +170,7 @@ namespace Microsoft.NET.StringTools
|
||||
/// <returns>The enumerator.</returns>
|
||||
public Enumerator GetEnumerator()
|
||||
{
|
||||
- return new Enumerator(ref this);
|
||||
+ return new Enumerator(this);
|
||||
}
|
||||
|
||||
/// <summary>
|
Loading…
Reference in a new issue