diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1ce7e0379f8..da9c7df8725 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props 1.0.0-prerelease.26180.1 1.0.0-prerelease.26180.1 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 - 5.7.0-1.26181.7 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 + 5.7.0-1.26209.5 10.0.2 10.0.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a90f0ac3ccc..568e89381bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,37 +18,37 @@ https://github.com/dotnet/msbuild 8a330c4406f03bafa3006d1e1213ec5c62252640 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 - + https://github.com/dotnet/roslyn - ebe25bbad4e01d716f724d9bf8e21be94d3bbc3f + e3a102fb75ef112d064feebd2f9385385a445a06 diff --git a/eng/Versions.props b/eng/Versions.props index b96d89e5c09..054f4320ef3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ 11 0 - 100 + 101 0 diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs index 1e872a07a3f..3bf50a19fb3 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs @@ -172,7 +172,8 @@ type AsyncType() = let t : Task = Async.StartAsTask(a, cancellationToken = cts.Token) // Wait for the async body to actually start executing before checking timing. - Assert.True(asyncStarted.Wait(5000), "Async body did not start within 5 seconds") + // Use a generous timeout to avoid flaky failures on loaded CI machines where the thread pool may be saturated. + Assert.True(asyncStarted.Wait(30_000), "Async body did not start within 30 seconds") // Should not finish, we don't eagerly mark the task done just because it's been signaled to cancel. try