From 6a81359c192789f8562cebe889c78757cb95f694 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 02:01:41 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
 build 20250505.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25225.6 -> To Version 9.0.0-beta.25255.3
---
 eng/Version.Details.xml | 8 ++++----
 global.json             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3d486a94d20..125596a254d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -42,14 +42,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25225.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
+      <Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25225.6">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25255.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
+      <Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
diff --git a/global.json b/global.json
index 025b675460e..1c977b14b7c 100644
--- a/global.json
+++ b/global.json
@@ -17,7 +17,7 @@
     "perl": "5.38.2.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

From e142e1bdc4b363c6e50626773b84b46d5793b8f4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 6 May 2025 10:49:45 +0200
Subject: [PATCH 2/2] Disable report prebuilt usage

Remove SB intermediates & prebuilt baseline file

Fixes https://github.com/dotnet/source-build/issues/5085
---
 eng/DotNetBuild.props               |  4 ++++
 eng/SourceBuildPrebuiltBaseline.xml | 33 -----------------------------
 eng/Version.Details.xml             | 17 ---------------
 3 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 eng/SourceBuildPrebuiltBaseline.xml

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 78286b23bab..8bdf6363873 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -1,9 +1,13 @@
 <!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
 <Project>
 
+  <!-- TODO: Remove this file when fsharp upgrades to Arcade 10 -->
   <PropertyGroup>
     <GitHubRepositoryName>fsharp</GitHubRepositoryName>
     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
+    <ReportPrebuiltUsage Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(DotNetBuildOrchestrator)</ReportPrebuiltUsage>
+    <SetUpSourceBuildIntermediateNupkgCache>false</SetUpSourceBuildIntermediateNupkgCache>
+    <CreateIntermediatePackage>false</CreateIntermediatePackage>
   </PropertyGroup>
 
   <!--
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
deleted file mode 100644
index a3c0b4e6619..00000000000
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- When altering this file or making other Source Build related changes, include @dotnet/source-build as a reviewer. -->
-<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
-
-<UsageData>
-  <IgnorePatterns>
-    <!-- Ignoring the known prebuilts. -->
-    <!--
-      These will go away when repo updates targeting to net8.0
-      Tracked with https://github.com/dotnet/fsharp/issues/14765
-    -->
-    <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.*" />
-    <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0.0" />
-    <UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
-    <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/8.0.0" />
-    <UsagePattern IdentityGlob="System.CodeDom/8.0.0" />
-    <UsagePattern IdentityGlob="System.Resources.Extensions/8.0.0" />
-    <UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0.0" />
-    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/8.0.0" />
-
-    <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Runtime.linux-x64/9.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/9.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/9.0.*" />
-
-    <!-- Tracked in https://github.com/dotnet/source-build/issues/3438 -->
-    <UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
-  </IgnorePatterns>
-
-  <Usages>
-    <Usage Id="System.Formats.Asn1" Version="8.0.1" />
-  </Usages>
-</UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 125596a254d..ff7657a28c0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25223.3">
-      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>19eb5ea4e5f9c4e5256843a92805c8c9e942207d</Sha>
-      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
-    </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.25-preview-25214-09">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
-      <SourceBuild RepoName="msbuild" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.13.25">
       <Uri>https://github.com/dotnet/msbuild</Uri>
       <Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
@@ -46,12 +35,6 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
     </Dependency>
-    <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25255.3">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
-      <SourceBuild RepoName="arcade" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>