From 719f9d6fa80d498d1e535b61cf8b405fdb20f17a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Apr 2026 02:02:17 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/roslyn build 20260422.3 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26217.6 -> To Version 5.0.0-2.26222.3 --- eng/Version.Details.props | 16 ++++++++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c65966eb87..ddaa4830ca 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.25467.1 1.0.0-prerelease.25467.1 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 - 5.0.0-2.26217.6 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 + 5.0.0-2.26222.3 9.0.0 9.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c60ad5ca11..b16516ff5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,37 +42,37 @@ https://github.com/dotnet/runtime 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 - + https://github.com/dotnet/roslyn - 7888e0d795d36806bbaf3cecea9fc61f6aac8279 + 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 From eefb5c944b51b7ae1499ac8f1b22ab6217d445b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Apr 2026 02:01:54 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/roslyn build 20260426.17 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26217.6 -> To Version 5.0.0-2.26226.17 --- eng/Version.Details.props | 16 ++++++++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ddaa4830ca..d9db06e430 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.25467.1 1.0.0-prerelease.25467.1 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 - 5.0.0-2.26222.3 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 + 5.0.0-2.26226.17 9.0.0 9.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b16516ff5c..0f80cf4b0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,37 +42,37 @@ https://github.com/dotnet/runtime 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 - + https://github.com/dotnet/roslyn - 7b49162f9da8b87e593f5e7b47e3e61d21ea5bb9 + 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 From 2a393dc50117fe5359fa61ebc628c9f98cc13339 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Apr 2026 02:02:16 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/roslyn build 20260427.2 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26217.6 -> To Version 5.0.0-2.26227.2 --- eng/Version.Details.props | 16 ++++++++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d9db06e430..1132ae0291 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.25467.1 1.0.0-prerelease.25467.1 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 - 5.0.0-2.26226.17 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 + 5.0.0-2.26227.2 9.0.0 9.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f80cf4b0e..d3751c05d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,37 +42,37 @@ https://github.com/dotnet/runtime 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a - + https://github.com/dotnet/roslyn - 9b79d7217b8915f20eeb170a5d1762b0bbafadd1 + 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a From fa790666e36edd92a625aefe2daed887c2a94dc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Apr 2026 02:01:36 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/roslyn build 20260428.14 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26217.6 -> To Version 5.0.0-2.26228.14 --- eng/Version.Details.props | 16 ++++++++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1132ae0291..b319b0bccd 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.25467.1 1.0.0-prerelease.25467.1 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 - 5.0.0-2.26227.2 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 + 5.0.0-2.26228.14 9.0.0 9.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3751c05d5..336179881f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,37 +42,37 @@ https://github.com/dotnet/runtime 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 - + https://github.com/dotnet/roslyn - 39e6e3a13c61eaffd23fc9d8f65bc1ad2a64be1a + 83e5a53ac08744260899d5012e20e1102ba87403 From b7ddcba224edc3807dcf8a0308bc98f7c45c6665 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 5 May 2026 15:54:25 +0200 Subject: [PATCH 5/7] Re-trigger CI: Benchmarks job cancelled due to agent infrastructure failure The previous CI run had all build and test jobs pass successfully, but the Benchmarks job was cancelled due to an Azure DevOps agent crash (exit code -1073741502 / STATUS_DLL_INIT_FAILED). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> From 28752f6403a441971bd0ba7dd62ab8ceaf17eae5 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 5 May 2026 17:22:51 +0200 Subject: [PATCH 6/7] Fix flaky async/task tests: remove premature Task disposal and increase timeouts Port fixes from main branch (PRs #19632, #19569, #19274) to release/dev18.0: - Replace 'use t' with 'let t' in StartAsTaskCancellation to avoid InvalidOperationException on Task.Dispose() in .NET 10 - Add ManualResetEventSlim to ensure async body starts before timing checks - Increase wait timeouts from 300ms/1s to 1s/5s/30s for CI load tolerance - Rename waitASec to waitForCompletion with 30s timeout - Add ManualResetEvent to CancellationPropagatesToTask for determinism Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Microsoft.FSharp.Control/AsyncType.fs | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) 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 550ff93186..3ba6ab2a34 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 @@ -49,9 +49,10 @@ type AsyncType() = [] let mutable spinloop = true - let waitASec (t:Task) = - let result = t.Wait(TimeSpan(hours=0,minutes=0,seconds=1)) - Assert.True(result, "Task did not finish after waiting for a second.") + // Use a generous timeout to avoid flaky failures on loaded CI machines where the thread pool may be saturated. + let waitForCompletion (t: Task) = + let result = t.Wait(TimeSpan.FromSeconds(30.0)) + Assert.True(result, "Task did not finish after waiting for 30 seconds.") [] member _.AsyncRunSynchronouslyReusesThreadPoolThread() = @@ -153,34 +154,41 @@ type AsyncType() = member _.CreateTask () = let s = "Hello tasks!" let a = async { return s } - use t : Task = Async.StartAsTask a - waitASec t + let t : Task = Async.StartAsTask a + waitForCompletion t Assert.True (t.IsCompleted) Assert.AreEqual(s, t.Result) [] member _.StartAsTaskCancellation () = let cts = new CancellationTokenSource() + let asyncStarted = new ManualResetEventSlim(false) let doSpinloop () = while spinloop do () let a = async { + asyncStarted.Set() cts.CancelAfter (100) doSpinloop() } - use t : Task = Async.StartAsTask(a, cancellationToken = cts.Token) + 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(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 - let result = t.Wait(300) + let result = t.Wait(1000) Assert.False (result) with :? AggregateException -> Assert.Fail "Task should not finish, yet" spinloop <- false try - waitASec t + let result = t.Wait(TimeSpan(hours=0,minutes=0,seconds=5)) + Assert.True(result, "Task did not finish after waiting for 5 seconds.") with :? AggregateException as a -> match a.InnerException with - | :? TaskCanceledException as t -> () + | :? TaskCanceledException -> () | _ -> reraise() Assert.True (t.IsCompleted, "Task is not completed") @@ -204,7 +212,7 @@ type AsyncType() = innerTcs.SetResult () try - waitASec tcs.Task + waitForCompletion tcs.Task with :? AggregateException as a -> match a.InnerException with | :? TaskCanceledException -> () @@ -247,14 +255,17 @@ type AsyncType() = [] member _.CancellationPropagatesToTask () = + let ewh = new ManualResetEvent(false) let a = async { + ewh.Set() |> Assert.True while true do () } let t = Async.StartAsTask a + ewh.WaitOne() |> Assert.True Async.CancelDefaultToken () let mutable exceptionThrown = false try - t.Wait() + waitForCompletion t with e -> exceptionThrown <- true Assert.True (exceptionThrown) Assert.True(t.IsCanceled) @@ -287,8 +298,8 @@ type AsyncType() = member _.CreateImmediateAsTask () = let s = "Hello tasks!" let a = async { return s } - use t : Task = Async.StartImmediateAsTask a - waitASec t + let t : Task = Async.StartImmediateAsTask a + waitForCompletion t Assert.True (t.IsCompleted) Assert.AreEqual(s, t.Result) @@ -296,8 +307,8 @@ type AsyncType() = member _.StartImmediateAsTask () = let s = "Hello tasks!" let a = async { return s } - use t = Async.StartImmediateAsTask a - waitASec t + let t = Async.StartImmediateAsTask a + waitForCompletion t Assert.True (t.IsCompleted) Assert.AreEqual(s, t.Result) From 628efc41f614f42df83ccf37e88b81b84c43516b Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Wed, 6 May 2026 13:48:12 +0200 Subject: [PATCH 7/7] Re-trigger CI: previous run had jobs cancelled due to agent pool unavailability Four jobs (coreclr_release, Desktop 4, testDesktop 3, StrictIndentation) were cancelled immediately due to Azure DevOps agent pool capacity issues. All jobs that did run passed successfully. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>