Skip to content

Commit 2f29080

Browse files
T-GroT-Gro
authored
Merge branch 'release/dev17.13' into merges/main-to-release/dev17.13
2 parents 3159664 + 6a0829b commit 2f29080

16 files changed

+129
-138
lines changed

‎buildtools/fslex/fslex.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
8+
<NoWarn>$(NoWarn);64;1182;1204</NoWarn> <!--Temporary fix for sourcebuild -->
89
</PropertyGroup>
910

1011
<PropertyGroup>

‎buildtools/fsyacc/fsyacc.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
8+
<NoWarn>$(NoWarn);64;1182;1204</NoWarn> <!--Temporary fix for sourcebuild -->
89
</PropertyGroup>
910

1011
<PropertyGroup>

‎src/Compiler/FSharp.Compiler.Service.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<NoWarn>$(NoWarn);75</NoWarn> <!-- InternalCommandLineOption -->
1111
<NoWarn>$(NoWarn);1204</NoWarn> <!-- This construct is for use in the FSharp.Core library and should not be used directly -->
1212
<NoWarn>$(NoWarn);NU5125</NoWarn>
13+
<NoWarn>$(NoWarn);64;1182;1204</NoWarn> <!--Temporary fix for sourcebuild -->
14+
<OtherFlags>$(OtherFlags) --warnaserror-:1182</OtherFlags> <!--Temporary fix for sourcebuild -->
1315
<AssemblyName>FSharp.Compiler.Service</AssemblyName>
1416
<AllowCrossTargeting>true</AllowCrossTargeting>
1517
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf‎

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf‎

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf‎

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf‎

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf‎

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf‎

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf‎

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)