From 9a5b7feed78ca4d5b861c4ed21fbdf81a412337d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 6 May 2026 02:01:30 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
 build 20260505.9 On relative base path root Microsoft.DotNet.Arcade.Sdk From
 Version 10.0.0-beta.26222.2 -> To Version 10.0.0-beta.26255.9

---
 eng/Version.Details.props | 2 +-
 eng/Version.Details.xml   | 4 ++--
 global.json               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 1272b5b814..6878fdd47a 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet-arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26255.9</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- dotnet-msbuild dependencies -->
     <MicrosoftBuildPackageVersion>18.6.4</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>18.6.4</MicrosoftBuildFrameworkPackageVersion>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 80c1189cd0..8281863501 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -76,9 +76,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26222.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26255.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
+      <Sha>658b93f2d1c0cdcdfb9c70113ff3c292cde97adb</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26180.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
diff --git a/global.json b/global.json
index 69861f5833..99d15b3a15 100644
--- a/global.json
+++ b/global.json
@@ -22,7 +22,7 @@
     "xcopy-msbuild": "18.0.0"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26222.2",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26255.9",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

From 5e477ad903400023429f2fcd61af2c59c442049f Mon Sep 17 00:00:00 2001
From: Tomas Grosup <tomasgrosup@microsoft.com>
Date: Wed, 6 May 2026 13:50:20 +0200
Subject: [PATCH 2/2] Fix flaky AsyncMemoize test: wait for all terminal events
 before asserting

The 'Cancel running jobs with the same key' test was racy - it waited
only for the Finished event before asserting Canceled count == 10, but
Canceled events from background jobs could still be in-flight. Now waits
for all 11 terminal events (10 Canceled + 1 Finished) before asserting.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../CompilerService/AsyncMemoize.fs                          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs b/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs
index 3b50cd9fe2..070d0837ac 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs
@@ -439,7 +439,10 @@ let ``Cancel running jobs with the same key`` () =
 
     job.Wait()
 
-    let events = eventsWhen events (received Finished)
+    // Wait for all 11 jobs to reach a terminal state (canceled/finished/failed)
+    // before asserting, to avoid snapshot races where some Canceled events
+    // haven't been observed yet when the Finished event arrives.
+    let events = eventsWhen events (fun e -> countOf Canceled e + countOf Finished e + countOf Failed e >= 11)
 
     Assert.Equal(0, events |> countOf Failed)