diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1272b5b8140..6878fdd47ad 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26222.2 + 10.0.0-beta.26255.9 18.6.4 18.6.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c1189cd02..82818635016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 58713cb9a664ed67642127fcaf70b8c0c3b55ef2 + 658b93f2d1c0cdcdfb9c70113ff3c292cde97adb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/global.json b/global.json index 69861f58336..99d15b3a15b 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" } } diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs b/tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs index 3b50cd9fe25..070d0837acc 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)