Skip to content

Commit 8c37131

Browse files
committed
Don't warn on 3218 for buildtools in fsharp
1 parent c1c6e4d commit 8c37131

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ See https://github.com/dotnet/source-build/issues/1905
88
eng/build.sh | 11 +++---
99
proto.proj | 6 ++--
1010
.../AssemblyCheck/AssemblyCheck.fsproj | 2 +-
11-
src/buildtools/fslex/fslex.fsproj | 2 +-
12-
src/buildtools/fsyacc/fsyacc.fsproj | 2 +-
11+
src/buildtools/fslex/fslex.fsproj | 3 ++-
12+
src/buildtools/fsyacc/fsyacc.fsproj | 3 ++-
1313
src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +-
1414
.../Microsoft.FSharp.Compiler.csproj | 8 ++---
1515
.../Microsoft.FSharp.Compiler.nuspec | 34 +++++++++----------
1616
src/fsharp/fsc/fsc.fsproj | 1 +
1717
src/fsharp/fsi/fsi.fsproj | 3 +-
1818
.../VisualFSharpFull/VisualFSharpFull.csproj | 2 +-
19-
11 files changed, 38 insertions(+), 36 deletions(-)
19+
11 files changed, 40 insertions(+), 36 deletions(-)
2020

2121
diff --git a/eng/build.sh b/eng/build.sh
2222
index e741ff854..165ba0b7f 100755
@@ -87,25 +87,27 @@ diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fspr
8787
index da7c52ba1..1959ce59c 100644
8888
--- a/src/buildtools/fslex/fslex.fsproj
8989
+++ b/src/buildtools/fslex/fslex.fsproj
90-
@@ -2,7 +2,7 @@
90+
@@ -2,7 +2,8 @@
9191

9292
<PropertyGroup>
9393
<OutputType>Exe</OutputType>
9494
- <TargetFramework>netcoreapp3.1</TargetFramework>
9595
+ <TargetFramework>net5.0</TargetFramework>
96+
+ <OtherFlags>$(OtherFlags) --nowarn:3218</OtherFlags>
9697
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
9798
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
9899
</PropertyGroup>
99100
diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj
100101
index a2b8cb384..5d1b7141f 100644
101102
--- a/src/buildtools/fsyacc/fsyacc.fsproj
102103
+++ b/src/buildtools/fsyacc/fsyacc.fsproj
103-
@@ -2,7 +2,7 @@
104+
@@ -2,7 +2,8 @@
104105

105106
<PropertyGroup>
106107
<OutputType>Exe</OutputType>
107108
- <TargetFramework>netcoreapp3.1</TargetFramework>
108109
+ <TargetFramework>net5.0</TargetFramework>
110+
+ <OtherFlags>$(OtherFlags) --nowarn:3218</OtherFlags>
109111
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
110112
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
111113
</PropertyGroup>

0 commit comments

Comments
 (0)