From e85bd12475019d4e1ea7c828f23c5c7d47b71bf7 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 6 Mar 2024 14:02:34 +0100
Subject: [PATCH 1/3] Enable FSharp for non-source-build

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 44cc7af061b5..4b825881dbc3 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -739,7 +739,6 @@
       <TransitiveRepositoryReference Remove="msbuild" />
       <TransitiveRepositoryReference Remove="aspnetcore" />
       <TransitiveRepositoryReference Remove="nuget-client" />
-      <TransitiveRepositoryReference Remove="fsharp" />
       <TransitiveRepositoryReference Remove="vstest" />
     </ItemGroup>
   </Target>

From 8cdbe02ccf33eb7ee3b3fc43c6686b643e1e6f5f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 6 Mar 2024 14:47:47 +0100
Subject: [PATCH 2/3] Update fsharp.proj

---
 src/SourceBuild/content/repo-projects/fsharp.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index acf42da97d1a..a5e2c3ed3221 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -15,7 +15,7 @@
       differently from the ArcadeBuildFromSource MSBuild arg. Including both args is fine, but the
       custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice.
     -->
-    <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs>
+    <BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs>
   </PropertyGroup>
 
   <ItemGroup>

From b2744b377c7a89a2a3c09021c5535342d6742850 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 26 Mar 2024 15:49:56 -0700
Subject: [PATCH 3/3] Update fsharp.proj

---
 src/SourceBuild/content/repo-projects/fsharp.proj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index a5e2c3ed3221..c84b39a8ea5b 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -10,6 +10,8 @@
     <BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
 
     <BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
+    <BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
+
     <!--
       dotnet/fsharp has a custom eng/build.sh script that handles its own sourcebuild arg
       differently from the ArcadeBuildFromSource MSBuild arg. Including both args is fine, but the