From 04f9127db95bb5410c4900ef46a1b7b4c7ec6c92 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 09:13:05 +0200
Subject: [PATCH 1/7] Fix fsharp stage 2 source-build

Fixes https://github.com/dotnet/source-build/issues/4410
---
 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 049ce263c406..0c9f1598e714 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -12,6 +12,8 @@
     <BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
 
+    <BuildArgs>$(BuildArgs) /p:TargetRid=$(TargetRid)</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

From a39fdc955e5d44ec9c571d763ad59ee5def1a6d0 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 09:33:23 +0200
Subject: [PATCH 2/7] Create 0001-fix-fsharp-r2r-rid.patch

---
 .../fsharp/0001-fix-fsharp-r2r-rid.patch      | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch

diff --git a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
new file mode 100644
index 000000000000..df71f7431fd5
--- /dev/null
+++ b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
@@ -0,0 +1,180 @@
+From 8ab02969f39c167a0b766e580698aff40169f1de Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Tue, 28 May 2024 07:24:18 +0000
+Subject: [PATCH] Fix full source-build product build when running R2R
+
+See https://github.com/dotnet/source-build/issues/4410
+When building from source, we must set the
+RuntimeIdentifier property explicitly as otherwise
+the SDK defaults to the portable RID.
+
+Also make the SDK aware of the R2R build by updating
+the Known* items in Directory.Build.targets and
+remove the AspNetCore framework references.
+
+Backport: https://github.com/dotnet/fsharp/pull/17259
+
+---
+ Directory.Build.targets                       | 26 +++++++++++++++++++
+ azure-pipelines-PR.yml                        |  4 +++
+ azure-pipelines.yml                           |  4 +++
+ buildtools/AssemblyCheck/AssemblyCheck.fsproj |  2 +-
+ buildtools/fslex/fslex.fsproj                 |  2 +-
+ buildtools/fsyacc/fsyacc.fsproj               |  2 +-
+ eng/SourceBuild.props                         |  4 +--
+ src/fsc/fscProject/fsc.fsproj                 |  2 +-
+ src/fsi/fsiProject/fsi.fsproj                 |  2 +-
+ 9 files changed, 41 insertions(+), 7 deletions(-)
+
+diff --git a/Directory.Build.targets b/Directory.Build.targets
+index cd863377199..91ccc4be1fa 100644
+--- a/Directory.Build.targets
++++ b/Directory.Build.targets
+@@ -21,4 +21,30 @@
+     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
+     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
+   </ItemGroup>
++
++  <!--
++    When .NET gets built from source, make the SDK aware there are bootstrap packages
++    for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
++  -->
++  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
++    <KnownFrameworkReference Update="Microsoft.NETCore.App">
++      <RuntimePackRuntimeIdentifiers
++        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
++    </KnownFrameworkReference>
++    <KnownRuntimePack Update="Microsoft.NETCore.App">
++      <RuntimePackRuntimeIdentifiers
++        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
++    </KnownRuntimePack>
++    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
++      <Crossgen2RuntimeIdentifiers
++        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(Crossgen2RuntimeIdentifiers);$(TargetRid)</Crossgen2RuntimeIdentifiers>
++    </KnownCrossgen2Pack>
++    <KnownAppHostPack Update="Microsoft.NETCore.App">
++      <AppHostRuntimeIdentifiers
++        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(AppHostRuntimeIdentifiers);$(TargetRid)</AppHostRuntimeIdentifiers>
++    </KnownAppHostPack>
++    <!-- Avoid references to Microsoft.AspNetCore.App.Runtime.<rid> -->
++    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
++  </ItemGroup>
++
+ </Project>
+diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
+index be8dc94eca5..ad2f2ce3462 100644
+--- a/azure-pipelines-PR.yml
++++ b/azure-pipelines-PR.yml
+@@ -209,6 +209,10 @@ stages:
+         enablePublishBuildAssets: true
+         enablePublishUsingPipelines: $(_PublishUsingPipelines)
+         enableSourceBuild: true
++        sourceBuildParameters:
++          platforms:
++          - name: Linux_x64
++            targetRid: linux-x64
+         enableTelemetry: true
+         helixRepo: dotnet/fsharp
+         jobs:
+diff --git a/azure-pipelines.yml b/azure-pipelines.yml
+index e0c4349b26b..c1fdd7cfd4d 100644
+--- a/azure-pipelines.yml
++++ b/azure-pipelines.yml
+@@ -100,6 +100,10 @@ extends:
+           enablePublishBuildAssets: true
+           enablePublishUsingPipelines: $(_PublishUsingPipelines)
+           enableSourceBuild: true
++          sourceBuildParameters:
++            platforms:
++            - name: Linux_x64
++              targetRid: linux-x64
+           enableTelemetry: true
+           helixRepo: dotnet/fsharp
+           jobs:
+diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
+index 6cfd3b1103f..c09912a3ee8 100644
+--- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj
++++ b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
+@@ -8,7 +8,7 @@
+ 
+   <PropertyGroup>
+     <PublishReadyToRun>true</PublishReadyToRun>
+-    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
++    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
+index 03ed6a77a60..15dd4b61002 100644
+--- a/buildtools/fslex/fslex.fsproj
++++ b/buildtools/fslex/fslex.fsproj
+@@ -9,7 +9,7 @@
+ 
+   <PropertyGroup>
+     <PublishReadyToRun>true</PublishReadyToRun>
+-    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
++    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
+index 621a2f3c7ca..e2a5f578cf6 100644
+--- a/buildtools/fsyacc/fsyacc.fsproj
++++ b/buildtools/fsyacc/fsyacc.fsproj
+@@ -9,7 +9,7 @@
+ 
+   <PropertyGroup>
+     <PublishReadyToRun>true</PublishReadyToRun>
+-    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
++    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 3bfd9f80fc4..83037bae417 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -27,7 +27,7 @@
+           DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
+           BeforeTargets="RunInnerSourceBuildCommand"
+           Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
+-          
++
+     <PropertyGroup>
+       <SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
+     </PropertyGroup>
+@@ -42,7 +42,7 @@
+     <Exec
+       Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg)"
+       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
+-      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
++      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true;TargetRid=$(TargetRid)" />
+   </Target>
+ 
+ </Project>
+diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj
+index 5f30ad30579..e487cf19d96 100644
+--- a/src/fsc/fscProject/fsc.fsproj
++++ b/src/fsc/fscProject/fsc.fsproj
+@@ -11,7 +11,7 @@
+   <PropertyGroup Condition="'$(Configuration)' == 'Proto'">
+     <TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
+     <PublishReadyToRun>true</PublishReadyToRun>
+-    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
++    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
+   </PropertyGroup>
+ 
+   <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj
+index 639ab45af17..cc2183e0bf1 100644
+--- a/src/fsi/fsiProject/fsi.fsproj
++++ b/src/fsi/fsiProject/fsi.fsproj
+@@ -11,7 +11,7 @@
+   <PropertyGroup Condition="'$(Configuration)' == 'Proto'">
+     <TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
+     <PublishReadyToRun>true</PublishReadyToRun>
+-    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
++    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
+   </PropertyGroup>
+ 
+   <ItemGroup Condition="'$(Configuration)' == 'Proto'">

From 8c61a2cb7badfc55e051fa2e11fb16982e7a51a7 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 11:21:45 +0200
Subject: [PATCH 3/7] Update 0001-fix-fsharp-r2r-rid.patch

---
 .../fsharp/0001-fix-fsharp-r2r-rid.patch      | 150 +++++++++++++++---
 1 file changed, 132 insertions(+), 18 deletions(-)

diff --git a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
index df71f7431fd5..a73429b5e9db 100644
--- a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
+++ b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
@@ -1,7 +1,7 @@
-From 8ab02969f39c167a0b766e580698aff40169f1de Mon Sep 17 00:00:00 2001
+From 04f2dbdbb3c93d72e42ed44af8648d08c05e9f68 Mon Sep 17 00:00:00 2001
 From: Viktor Hofer <viktor.hofer@microsoft.com>
 Date: Tue, 28 May 2024 07:24:18 +0000
-Subject: [PATCH] Fix full source-build product build when running R2R
+Subject: [PATCH 1/2] Fix full source-build product build when running R2R
 
 See https://github.com/dotnet/source-build/issues/4410
 When building from source, we must set the
@@ -16,7 +16,7 @@ Backport: https://github.com/dotnet/fsharp/pull/17259
 
 ---
  Directory.Build.targets                       | 26 +++++++++++++++++++
- azure-pipelines-PR.yml                        |  4 +++
+ azure-pipelines-PR.yml                        |  6 ++++-
  azure-pipelines.yml                           |  4 +++
  buildtools/AssemblyCheck/AssemblyCheck.fsproj |  2 +-
  buildtools/fslex/fslex.fsproj                 |  2 +-
@@ -24,7 +24,7 @@ Backport: https://github.com/dotnet/fsharp/pull/17259
  eng/SourceBuild.props                         |  4 +--
  src/fsc/fscProject/fsc.fsproj                 |  2 +-
  src/fsi/fsiProject/fsi.fsproj                 |  2 +-
- 9 files changed, 41 insertions(+), 7 deletions(-)
+ 9 files changed, 42 insertions(+), 8 deletions(-)
 
 diff --git a/Directory.Build.targets b/Directory.Build.targets
 index cd863377199..91ccc4be1fa 100644
@@ -62,7 +62,7 @@ index cd863377199..91ccc4be1fa 100644
 +
  </Project>
 diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
-index be8dc94eca5..ad2f2ce3462 100644
+index be8dc94eca5..ccc308b9245 100644
 --- a/azure-pipelines-PR.yml
 +++ b/azure-pipelines-PR.yml
 @@ -209,6 +209,10 @@ stages:
@@ -72,12 +72,19 @@ index be8dc94eca5..ad2f2ce3462 100644
 +        sourceBuildParameters:
 +          platforms:
 +          - name: Linux_x64
-+            targetRid: linux-x64
++            targetRID: linux-x64
          enableTelemetry: true
          helixRepo: dotnet/fsharp
          jobs:
+@@ -722,4 +726,4 @@ stages:
+               targetPath: './artifacts/log/Release/AheadOfTime/Trimming/'
+               artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
+             continueOnError: true
+-            condition: always()
+\ No newline at end of file
++            condition: always()
 diff --git a/azure-pipelines.yml b/azure-pipelines.yml
-index e0c4349b26b..c1fdd7cfd4d 100644
+index e0c4349b26b..355afef3924 100644
 --- a/azure-pipelines.yml
 +++ b/azure-pipelines.yml
 @@ -100,6 +100,10 @@ extends:
@@ -87,12 +94,12 @@ index e0c4349b26b..c1fdd7cfd4d 100644
 +          sourceBuildParameters:
 +            platforms:
 +            - name: Linux_x64
-+              targetRid: linux-x64
++              targetRID: linux-x64
            enableTelemetry: true
            helixRepo: dotnet/fsharp
            jobs:
 diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
-index 6cfd3b1103f..c09912a3ee8 100644
+index 6cfd3b1103f..bb4b9dd2b76 100644
 --- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj
 +++ b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
 @@ -8,7 +8,7 @@
@@ -100,12 +107,12 @@ index 6cfd3b1103f..c09912a3ee8 100644
    <PropertyGroup>
      <PublishReadyToRun>true</PublishReadyToRun>
 -    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
-+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
    </PropertyGroup>
  
    <ItemGroup>
 diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
-index 03ed6a77a60..15dd4b61002 100644
+index 03ed6a77a60..f93c26d5559 100644
 --- a/buildtools/fslex/fslex.fsproj
 +++ b/buildtools/fslex/fslex.fsproj
 @@ -9,7 +9,7 @@
@@ -113,12 +120,12 @@ index 03ed6a77a60..15dd4b61002 100644
    <PropertyGroup>
      <PublishReadyToRun>true</PublishReadyToRun>
 -    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
-+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
    </PropertyGroup>
  
    <ItemGroup>
 diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
-index 621a2f3c7ca..e2a5f578cf6 100644
+index 621a2f3c7ca..8dd8f9f7d6a 100644
 --- a/buildtools/fsyacc/fsyacc.fsproj
 +++ b/buildtools/fsyacc/fsyacc.fsproj
 @@ -9,7 +9,7 @@
@@ -126,7 +133,7 @@ index 621a2f3c7ca..e2a5f578cf6 100644
    <PropertyGroup>
      <PublishReadyToRun>true</PublishReadyToRun>
 -    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
-+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
    </PropertyGroup>
  
    <ItemGroup>
@@ -153,7 +160,7 @@ index 3bfd9f80fc4..83037bae417 100644
  
  </Project>
 diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj
-index 5f30ad30579..e487cf19d96 100644
+index 5f30ad30579..1f22c8531e9 100644
 --- a/src/fsc/fscProject/fsc.fsproj
 +++ b/src/fsc/fscProject/fsc.fsproj
 @@ -11,7 +11,7 @@
@@ -161,12 +168,12 @@ index 5f30ad30579..e487cf19d96 100644
      <TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
      <PublishReadyToRun>true</PublishReadyToRun>
 -    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
-+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
    </PropertyGroup>
  
    <ItemGroup Condition="'$(Configuration)' == 'Proto'">
 diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj
-index 639ab45af17..cc2183e0bf1 100644
+index 639ab45af17..634ed56a9ea 100644
 --- a/src/fsi/fsiProject/fsi.fsproj
 +++ b/src/fsi/fsiProject/fsi.fsproj
 @@ -11,7 +11,7 @@
@@ -174,7 +181,114 @@ index 639ab45af17..cc2183e0bf1 100644
      <TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
      <PublishReadyToRun>true</PublishReadyToRun>
 -    <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
-+    <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetRid)</RuntimeIdentifier>
++    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
    </PropertyGroup>
  
    <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+
+From 7271b277c17e66e8661f7b251819c833261be7ca Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Tue, 28 May 2024 09:18:23 +0000
+Subject: [PATCH 2/2] Undo unnecessary changes
+
+---
+ Directory.Build.targets | 26 --------------------------
+ azure-pipelines-PR.yml  |  6 +-----
+ azure-pipelines.yml     |  4 ----
+ eng/SourceBuild.props   |  4 ++--
+ 4 files changed, 3 insertions(+), 37 deletions(-)
+
+diff --git a/Directory.Build.targets b/Directory.Build.targets
+index 91ccc4be1fa..cd863377199 100644
+--- a/Directory.Build.targets
++++ b/Directory.Build.targets
+@@ -21,30 +21,4 @@
+     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
+     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
+   </ItemGroup>
+-
+-  <!--
+-    When .NET gets built from source, make the SDK aware there are bootstrap packages
+-    for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
+-  -->
+-  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+-    <KnownFrameworkReference Update="Microsoft.NETCore.App">
+-      <RuntimePackRuntimeIdentifiers
+-        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
+-    </KnownFrameworkReference>
+-    <KnownRuntimePack Update="Microsoft.NETCore.App">
+-      <RuntimePackRuntimeIdentifiers
+-        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
+-    </KnownRuntimePack>
+-    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
+-      <Crossgen2RuntimeIdentifiers
+-        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(Crossgen2RuntimeIdentifiers);$(TargetRid)</Crossgen2RuntimeIdentifiers>
+-    </KnownCrossgen2Pack>
+-    <KnownAppHostPack Update="Microsoft.NETCore.App">
+-      <AppHostRuntimeIdentifiers
+-        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(AppHostRuntimeIdentifiers);$(TargetRid)</AppHostRuntimeIdentifiers>
+-    </KnownAppHostPack>
+-    <!-- Avoid references to Microsoft.AspNetCore.App.Runtime.<rid> -->
+-    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+-  </ItemGroup>
+-
+ </Project>
+diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
+index ccc308b9245..be8dc94eca5 100644
+--- a/azure-pipelines-PR.yml
++++ b/azure-pipelines-PR.yml
+@@ -209,10 +209,6 @@ stages:
+         enablePublishBuildAssets: true
+         enablePublishUsingPipelines: $(_PublishUsingPipelines)
+         enableSourceBuild: true
+-        sourceBuildParameters:
+-          platforms:
+-          - name: Linux_x64
+-            targetRID: linux-x64
+         enableTelemetry: true
+         helixRepo: dotnet/fsharp
+         jobs:
+@@ -726,4 +722,4 @@ stages:
+               targetPath: './artifacts/log/Release/AheadOfTime/Trimming/'
+               artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
+             continueOnError: true
+-            condition: always()
++            condition: always()
+\ No newline at end of file
+diff --git a/azure-pipelines.yml b/azure-pipelines.yml
+index 355afef3924..e0c4349b26b 100644
+--- a/azure-pipelines.yml
++++ b/azure-pipelines.yml
+@@ -100,10 +100,6 @@ extends:
+           enablePublishBuildAssets: true
+           enablePublishUsingPipelines: $(_PublishUsingPipelines)
+           enableSourceBuild: true
+-          sourceBuildParameters:
+-            platforms:
+-            - name: Linux_x64
+-              targetRID: linux-x64
+           enableTelemetry: true
+           helixRepo: dotnet/fsharp
+           jobs:
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 83037bae417..3bfd9f80fc4 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -27,7 +27,7 @@
+           DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
+           BeforeTargets="RunInnerSourceBuildCommand"
+           Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
+-
++          
+     <PropertyGroup>
+       <SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
+     </PropertyGroup>
+@@ -42,7 +42,7 @@
+     <Exec
+       Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg)"
+       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
+-      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true;TargetRid=$(TargetRid)" />
++      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
+   </Target>
+ 
+ </Project>

From 275828bdd45a06736457edb525cd463aee1d97c3 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 11:21:56 +0200
Subject: [PATCH 4/7] Update fsharp.proj

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

diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index 0c9f1598e714..049ce263c406 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -12,8 +12,6 @@
     <BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:GenerateResourceUsePreserializedResources=true</BuildArgs>
 
-    <BuildArgs>$(BuildArgs) /p:TargetRid=$(TargetRid)</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

From 73dce19814fba8e43d8e1dc4cfa67e8e527eb246 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 14:55:21 +0200
Subject: [PATCH 5/7] Update 0001-fix-fsharp-r2r-rid.patch

---
 .../fsharp/0001-fix-fsharp-r2r-rid.patch      | 231 +-----------------
 1 file changed, 13 insertions(+), 218 deletions(-)

diff --git a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
index a73429b5e9db..36f2497ed28d 100644
--- a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
+++ b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
@@ -1,7 +1,7 @@
-From 04f2dbdbb3c93d72e42ed44af8648d08c05e9f68 Mon Sep 17 00:00:00 2001
+From 626c01676f58503743463270213b405949f8f9e6 Mon Sep 17 00:00:00 2001
 From: Viktor Hofer <viktor.hofer@microsoft.com>
 Date: Tue, 28 May 2024 07:24:18 +0000
-Subject: [PATCH 1/2] Fix full source-build product build when running R2R
+Subject: [PATCH] Fix full source-build product build when running R2R
 
 See https://github.com/dotnet/source-build/issues/4410
 When building from source, we must set the
@@ -15,91 +15,15 @@ remove the AspNetCore framework references.
 Backport: https://github.com/dotnet/fsharp/pull/17259
 
 ---
- Directory.Build.targets                       | 26 +++++++++++++++++++
- azure-pipelines-PR.yml                        |  6 ++++-
- azure-pipelines.yml                           |  4 +++
- buildtools/AssemblyCheck/AssemblyCheck.fsproj |  2 +-
- buildtools/fslex/fslex.fsproj                 |  2 +-
- buildtools/fsyacc/fsyacc.fsproj               |  2 +-
- eng/SourceBuild.props                         |  4 +--
- src/fsc/fscProject/fsc.fsproj                 |  2 +-
- src/fsi/fsiProject/fsi.fsproj                 |  2 +-
- 9 files changed, 42 insertions(+), 8 deletions(-)
+ buildtools/AssemblyCheck/AssemblyCheck.fsproj | 2 +-
+ buildtools/fslex/fslex.fsproj                 | 2 +-
+ buildtools/fsyacc/fsyacc.fsproj               | 2 +-
+ src/fsc/fscProject/fsc.fsproj                 | 2 +-
+ src/fsi/fsiProject/fsi.fsproj                 | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/Directory.Build.targets b/Directory.Build.targets
-index cd863377199..91ccc4be1fa 100644
---- a/Directory.Build.targets
-+++ b/Directory.Build.targets
-@@ -21,4 +21,30 @@
-     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
-     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
-   </ItemGroup>
-+
-+  <!--
-+    When .NET gets built from source, make the SDK aware there are bootstrap packages
-+    for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
-+  -->
-+  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-+    <KnownFrameworkReference Update="Microsoft.NETCore.App">
-+      <RuntimePackRuntimeIdentifiers
-+        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
-+    </KnownFrameworkReference>
-+    <KnownRuntimePack Update="Microsoft.NETCore.App">
-+      <RuntimePackRuntimeIdentifiers
-+        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
-+    </KnownRuntimePack>
-+    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
-+      <Crossgen2RuntimeIdentifiers
-+        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(Crossgen2RuntimeIdentifiers);$(TargetRid)</Crossgen2RuntimeIdentifiers>
-+    </KnownCrossgen2Pack>
-+    <KnownAppHostPack Update="Microsoft.NETCore.App">
-+      <AppHostRuntimeIdentifiers
-+        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(AppHostRuntimeIdentifiers);$(TargetRid)</AppHostRuntimeIdentifiers>
-+    </KnownAppHostPack>
-+    <!-- Avoid references to Microsoft.AspNetCore.App.Runtime.<rid> -->
-+    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
-+  </ItemGroup>
-+
- </Project>
-diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
-index be8dc94eca5..ccc308b9245 100644
---- a/azure-pipelines-PR.yml
-+++ b/azure-pipelines-PR.yml
-@@ -209,6 +209,10 @@ stages:
-         enablePublishBuildAssets: true
-         enablePublishUsingPipelines: $(_PublishUsingPipelines)
-         enableSourceBuild: true
-+        sourceBuildParameters:
-+          platforms:
-+          - name: Linux_x64
-+            targetRID: linux-x64
-         enableTelemetry: true
-         helixRepo: dotnet/fsharp
-         jobs:
-@@ -722,4 +726,4 @@ stages:
-               targetPath: './artifacts/log/Release/AheadOfTime/Trimming/'
-               artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
-             continueOnError: true
--            condition: always()
-\ No newline at end of file
-+            condition: always()
-diff --git a/azure-pipelines.yml b/azure-pipelines.yml
-index e0c4349b26b..355afef3924 100644
---- a/azure-pipelines.yml
-+++ b/azure-pipelines.yml
-@@ -100,6 +100,10 @@ extends:
-           enablePublishBuildAssets: true
-           enablePublishUsingPipelines: $(_PublishUsingPipelines)
-           enableSourceBuild: true
-+          sourceBuildParameters:
-+            platforms:
-+            - name: Linux_x64
-+              targetRID: linux-x64
-           enableTelemetry: true
-           helixRepo: dotnet/fsharp
-           jobs:
 diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
-index 6cfd3b1103f..bb4b9dd2b76 100644
+index 6cfd3b110..bb4b9dd2b 100644
 --- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj
 +++ b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
 @@ -8,7 +8,7 @@
@@ -112,7 +36,7 @@ index 6cfd3b1103f..bb4b9dd2b76 100644
  
    <ItemGroup>
 diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
-index 03ed6a77a60..f93c26d5559 100644
+index 03ed6a77a..f93c26d55 100644
 --- a/buildtools/fslex/fslex.fsproj
 +++ b/buildtools/fslex/fslex.fsproj
 @@ -9,7 +9,7 @@
@@ -125,7 +49,7 @@ index 03ed6a77a60..f93c26d5559 100644
  
    <ItemGroup>
 diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
-index 621a2f3c7ca..8dd8f9f7d6a 100644
+index 621a2f3c7..8dd8f9f7d 100644
 --- a/buildtools/fsyacc/fsyacc.fsproj
 +++ b/buildtools/fsyacc/fsyacc.fsproj
 @@ -9,7 +9,7 @@
@@ -137,30 +61,8 @@ index 621a2f3c7ca..8dd8f9f7d6a 100644
    </PropertyGroup>
  
    <ItemGroup>
-diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
-index 3bfd9f80fc4..83037bae417 100644
---- a/eng/SourceBuild.props
-+++ b/eng/SourceBuild.props
-@@ -27,7 +27,7 @@
-           DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
-           BeforeTargets="RunInnerSourceBuildCommand"
-           Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
--          
-+
-     <PropertyGroup>
-       <SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
-     </PropertyGroup>
-@@ -42,7 +42,7 @@
-     <Exec
-       Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg)"
-       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
--      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
-+      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true;TargetRid=$(TargetRid)" />
-   </Target>
- 
- </Project>
 diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj
-index 5f30ad30579..1f22c8531e9 100644
+index 5f30ad305..1f22c8531 100644
 --- a/src/fsc/fscProject/fsc.fsproj
 +++ b/src/fsc/fscProject/fsc.fsproj
 @@ -11,7 +11,7 @@
@@ -173,7 +75,7 @@ index 5f30ad30579..1f22c8531e9 100644
  
    <ItemGroup Condition="'$(Configuration)' == 'Proto'">
 diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj
-index 639ab45af17..634ed56a9ea 100644
+index 639ab45af..634ed56a9 100644
 --- a/src/fsi/fsiProject/fsi.fsproj
 +++ b/src/fsi/fsiProject/fsi.fsproj
 @@ -11,7 +11,7 @@
@@ -185,110 +87,3 @@ index 639ab45af17..634ed56a9ea 100644
    </PropertyGroup>
  
    <ItemGroup Condition="'$(Configuration)' == 'Proto'">
-
-From 7271b277c17e66e8661f7b251819c833261be7ca Mon Sep 17 00:00:00 2001
-From: Viktor Hofer <viktor.hofer@microsoft.com>
-Date: Tue, 28 May 2024 09:18:23 +0000
-Subject: [PATCH 2/2] Undo unnecessary changes
-
----
- Directory.Build.targets | 26 --------------------------
- azure-pipelines-PR.yml  |  6 +-----
- azure-pipelines.yml     |  4 ----
- eng/SourceBuild.props   |  4 ++--
- 4 files changed, 3 insertions(+), 37 deletions(-)
-
-diff --git a/Directory.Build.targets b/Directory.Build.targets
-index 91ccc4be1fa..cd863377199 100644
---- a/Directory.Build.targets
-+++ b/Directory.Build.targets
-@@ -21,30 +21,4 @@
-     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
-     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
-   </ItemGroup>
--
--  <!--
--    When .NET gets built from source, make the SDK aware there are bootstrap packages
--    for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
--  -->
--  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
--    <KnownFrameworkReference Update="Microsoft.NETCore.App">
--      <RuntimePackRuntimeIdentifiers
--        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
--    </KnownFrameworkReference>
--    <KnownRuntimePack Update="Microsoft.NETCore.App">
--      <RuntimePackRuntimeIdentifiers
--        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(TargetRid)</RuntimePackRuntimeIdentifiers>
--    </KnownRuntimePack>
--    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
--      <Crossgen2RuntimeIdentifiers
--        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(Crossgen2RuntimeIdentifiers);$(TargetRid)</Crossgen2RuntimeIdentifiers>
--    </KnownCrossgen2Pack>
--    <KnownAppHostPack Update="Microsoft.NETCore.App">
--      <AppHostRuntimeIdentifiers
--        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(AppHostRuntimeIdentifiers);$(TargetRid)</AppHostRuntimeIdentifiers>
--    </KnownAppHostPack>
--    <!-- Avoid references to Microsoft.AspNetCore.App.Runtime.<rid> -->
--    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
--  </ItemGroup>
--
- </Project>
-diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml
-index ccc308b9245..be8dc94eca5 100644
---- a/azure-pipelines-PR.yml
-+++ b/azure-pipelines-PR.yml
-@@ -209,10 +209,6 @@ stages:
-         enablePublishBuildAssets: true
-         enablePublishUsingPipelines: $(_PublishUsingPipelines)
-         enableSourceBuild: true
--        sourceBuildParameters:
--          platforms:
--          - name: Linux_x64
--            targetRID: linux-x64
-         enableTelemetry: true
-         helixRepo: dotnet/fsharp
-         jobs:
-@@ -726,4 +722,4 @@ stages:
-               targetPath: './artifacts/log/Release/AheadOfTime/Trimming/'
-               artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
-             continueOnError: true
--            condition: always()
-+            condition: always()
-\ No newline at end of file
-diff --git a/azure-pipelines.yml b/azure-pipelines.yml
-index 355afef3924..e0c4349b26b 100644
---- a/azure-pipelines.yml
-+++ b/azure-pipelines.yml
-@@ -100,10 +100,6 @@ extends:
-           enablePublishBuildAssets: true
-           enablePublishUsingPipelines: $(_PublishUsingPipelines)
-           enableSourceBuild: true
--          sourceBuildParameters:
--            platforms:
--            - name: Linux_x64
--              targetRID: linux-x64
-           enableTelemetry: true
-           helixRepo: dotnet/fsharp
-           jobs:
-diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
-index 83037bae417..3bfd9f80fc4 100644
---- a/eng/SourceBuild.props
-+++ b/eng/SourceBuild.props
-@@ -27,7 +27,7 @@
-           DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
-           BeforeTargets="RunInnerSourceBuildCommand"
-           Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
--
-+          
-     <PropertyGroup>
-       <SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
-     </PropertyGroup>
-@@ -42,7 +42,7 @@
-     <Exec
-       Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg)"
-       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
--      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true;TargetRid=$(TargetRid)" />
-+      EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
-   </Target>
- 
- </Project>

From 979c7e9a86897ef674d38006b86f8fa51a3f5fb6 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 20:17:27 +0200
Subject: [PATCH 6/7] Update 0001-fix-fsharp-r2r-rid.patch

---
 .../fsharp/0001-fix-fsharp-r2r-rid.patch      | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
index 36f2497ed28d..d76a0795a181 100644
--- a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
+++ b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
@@ -1,4 +1,4 @@
-From 626c01676f58503743463270213b405949f8f9e6 Mon Sep 17 00:00:00 2001
+From fce21126577f80d2c06db54ac3be4cba5329b33c Mon Sep 17 00:00:00 2001
 From: Viktor Hofer <viktor.hofer@microsoft.com>
 Date: Tue, 28 May 2024 07:24:18 +0000
 Subject: [PATCH] Fix full source-build product build when running R2R
@@ -15,13 +15,39 @@ remove the AspNetCore framework references.
 Backport: https://github.com/dotnet/fsharp/pull/17259
 
 ---
- buildtools/AssemblyCheck/AssemblyCheck.fsproj | 2 +-
- buildtools/fslex/fslex.fsproj                 | 2 +-
- buildtools/fsyacc/fsyacc.fsproj               | 2 +-
- src/fsc/fscProject/fsc.fsproj                 | 2 +-
- src/fsi/fsiProject/fsi.fsproj                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ Directory.Build.targets                       | 16 ++++++++++++++++
+ buildtools/AssemblyCheck/AssemblyCheck.fsproj |  2 +-
+ buildtools/fslex/fslex.fsproj                 |  2 +-
+ buildtools/fsyacc/fsyacc.fsproj               |  2 +-
+ src/fsc/fscProject/fsc.fsproj                 |  2 +-
+ src/fsi/fsiProject/fsi.fsproj                 |  2 +-
+ 6 files changed, 21 insertions(+), 5 deletions(-)
 
+diff --git a/Directory.Build.targets b/Directory.Build.targets
+index cd8633771..8a1a1fa4a 100644
+--- a/Directory.Build.targets
++++ b/Directory.Build.targets
+@@ -21,4 +21,20 @@
+     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
+     <PackageReference Include="NunitXml.TestLogger" Version="$(NunitXmlTestLoggerVersion)" />
+   </ItemGroup>
++
++  <!--
++    When .NET gets built from source, make the SDK aware there are bootstrap packages
++    for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
++  -->
++  <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
++    <KnownRuntimePack Update="Microsoft.NETCore.App">
++      <RuntimePackRuntimeIdentifiers
++        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
++    </KnownRuntimePack>
++    <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
++      <Crossgen2RuntimeIdentifiers
++        Condition="'%(TargetFramework)' == '$(NetCurrent)'">%(Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
++    </KnownCrossgen2Pack>
++  </ItemGroup>
++
+ </Project>
 diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
 index 6cfd3b110..bb4b9dd2b 100644
 --- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj
@@ -87,3 +113,6 @@ index 639ab45af..634ed56a9 100644
    </PropertyGroup>
  
    <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+-- 
+2.39.2
+

From 7fa3eaa75fb0910fd17607c0aec8895eceb68b78 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 28 May 2024 20:17:55 +0200
Subject: [PATCH 7/7] Update 0001-fix-fsharp-r2r-rid.patch

---
 src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
index d76a0795a181..3ac9106a9b98 100644
--- a/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
+++ b/src/SourceBuild/patches/fsharp/0001-fix-fsharp-r2r-rid.patch
@@ -113,6 +113,3 @@ index 639ab45af..634ed56a9 100644
    </PropertyGroup>
  
    <ItemGroup Condition="'$(Configuration)' == 'Proto'">
--- 
-2.39.2
-