Skip to content

Commit 071271a

Browse files
dotnet-maestro[bot]T-GroCopilot
authored
[main] Update dependencies from dotnet/arcade (#19691)
* 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 * 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> --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 46dce3d commit 071271a

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-arcade dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26255.9</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<!-- dotnet-msbuild dependencies -->
1111
<MicrosoftBuildPackageVersion>18.6.4</MicrosoftBuildPackageVersion>
1212
<MicrosoftBuildFrameworkPackageVersion>18.6.4</MicrosoftBuildFrameworkPackageVersion>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26222.2">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26255.9">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
81+
<Sha>658b93f2d1c0cdcdfb9c70113ff3c292cde97adb</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26180.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"xcopy-msbuild": "18.0.0"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26222.2",
25+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26255.9",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,10 @@ let ``Cancel running jobs with the same key`` () =
439439

440440
job.Wait()
441441

442-
let events = eventsWhen events (received Finished)
442+
// Wait for all 11 jobs to reach a terminal state (canceled/finished/failed)
443+
// before asserting, to avoid snapshot races where some Canceled events
444+
// haven't been observed yet when the Finished event arrives.
445+
let events = eventsWhen events (fun e -> countOf Canceled e + countOf Finished e + countOf Failed e >= 11)
443446

444447
Assert.Equal(0, events |> countOf Failed)
445448

0 commit comments

Comments
 (0)