From bd58fb0d492960d07af15d866f3e647dccd56ad7 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <kevinr@microsoft.com>
Date: Fri, 8 Nov 2024 12:57:28 -0800
Subject: [PATCH] build

---
 eng/Build.ps1                               |  2 +-
 eng/build.sh                                |  2 +-
 src/Compiler/FSharp.Compiler.Service.fsproj | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/eng/Build.ps1 b/eng/Build.ps1
index 483b60b10df..a36412189f3 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -71,7 +71,7 @@ param (
     [switch]$sourceBuild,
     [switch]$skipBuild,
     [switch]$compressAllMetadata,
-    [switch]$buildnorealsig = $true,
+    [switch]$buildnorealsig = $false,
     [switch]$verifypackageshipstatus = $false,
     [parameter(ValueFromRemainingArguments = $true)][string[]]$properties)
 
diff --git a/eng/build.sh b/eng/build.sh
index c4abb23f6f1..da10ebfc4f0 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -71,7 +71,7 @@ skip_analyzers=false
 skip_build=false
 prepare_machine=false
 source_build=false
-buildnorealsig=true
+buildnorealsig=false
 properties=""
 
 docker=false
diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 419746af6c0..d8a41bda0d4 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -16,16 +16,18 @@
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
     <CheckNulls>true</CheckNulls>
-	<!-- Nullness checking against ns20 base class libraries is very weak, the APIs were not updated with annotations. 
-	     Therefore we want to use the latest BCL APIs from NetCurrent.
-		 We are still not building the actual product in NetCurrent, so for official builds we remain as ns2.0.
-		 For 'BUILDING_USING_DOTNET' builds, we still want latest BCL annotations, so that contributors can get related warnings locally.
 
-     OSX and Linux has problems with Xliff targets for net9, skipping via SKIP_NETCURRENT_FSC_BUILD until resolved ( The target "UpdateXlf" does not exist in the project.)
-	-->
+    <!--
+        Nullness checking against ns20 base class libraries is very weak, the APIs were not updated with annotations. 
+        Therefore we want to use the latest BCL APIs from NetCurrent.
+        We are still not building the actual product in NetCurrent, so for official builds we remain as ns2.0.
+        For 'BUILDING_USING_DOTNET' builds, we still want latest BCL annotations, so that contributors can get related warnings locally.
+
+        OSX and Linux has problems with Xliff targets for net9, skipping via SKIP_NETCURRENT_FSC_BUILD until resolved ( The target "UpdateXlf" does not exist in the project.)
+    -->
     <TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(FSharpNetCoreProductDefaultTargetFramework)' != '' AND '$(Configuration)' != 'Proto' AND '$(SKIP_NETCURRENT_FSC_BUILD)' != 'true' ">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
     <DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>
-    <OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
+    <OtherFlags>$(OtherFlags) --extraoptimizationloops:1 --realsig-</OtherFlags>
 
     <!-- TODO: This needs to be re-enabled once we merge/release the new SDK with noward and line fixes. -->
     <!-- 1182: Unused variables -->
@@ -35,9 +37,9 @@
     <OtherFlags>$(OtherFlags) --warnon:3218</OtherFlags>
     <!-- 3390: xmlDocBadlyFormed -->
     <OtherFlags>$(OtherFlags) --warnon:3390</OtherFlags>
-	<!-- generate IL filter blocks in order to prevent StackOverFlowException in TcExpr guarded with |RecoverableException| active pattern-->
+    <!-- generate IL filter blocks in order to prevent StackOverFlowException in TcExpr guarded with |RecoverableException| active pattern-->
     <OtherFlags>$(OtherFlags) --generate-filter-blocks</OtherFlags>
-	<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
+    <Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
     <FsYaccOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsYaccOutputFolder>
     <FsLexOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsLexOutputFolder>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>