From 6c834579bf8307859a10bd64ad94173543b86401 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 22 Aug 2024 14:32:45 +0200
Subject: [PATCH 1/2] Try to fix xlifftasks problem in CI

---
 src/Compiler/FSharp.Compiler.Service.fsproj | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 98a0bc2b5eb..0e22485e9bf 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -14,14 +14,11 @@
     <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.
-
-     On CI, OSX 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>
+    <!-- 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. -->
+    <TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(Configuration)' != 'Proto'">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
     <DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>
     <OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
     <!-- 1182: Unused variables -->

From 3ba3f0f70b7a16225f58192f109ebe3ca650d2e8 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 22 Aug 2024 14:34:11 +0200
Subject: [PATCH 2/2] Update azure-pipelines-PR.yml

---
 azure-pipelines-PR.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
index 243fcf8eab7..f182f8b9e10 100644
--- a/azure-pipelines-PR.yml
+++ b/azure-pipelines-PR.yml
@@ -553,8 +553,6 @@ stages:
           - checkout: self
             clean: true
           - script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
-            env:
-              SKIP_NETCURRENT_FSC_BUILD: true
             displayName: Build / Test
           - task: PublishTestResults@2
             displayName: Publish Test Results
@@ -597,7 +595,6 @@ stages:
           - script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
             env:
               COMPlus_DefaultStackSize: 1000000
-              SKIP_NETCURRENT_FSC_BUILD: true
             displayName: Build / Test
           - task: PublishTestResults@2
             displayName: Publish Test Results