Fix WaitUntilCountOrTimeoutAsync

eduardo-vp · eduardo-vp · commit dc94be74b0b7 · 2025-07-09T13:47:38.000-07:00
diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/SemaphoreSlim.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/SemaphoreSlim.cs
@@ -757,7 +757,9 @@ private async Task<bool> WaitUntilCountOrTimeoutAsync(TaskNode asyncWaiter, uint
             Debug.Assert(asyncWaiter is not null, "Waiter should have been constructed");
             Debug.Assert(Monitor.IsEntered(m_lockObjAndDisposed), "Requires the lock be held");
 
-            await ((Task)asyncWaiter.WaitAsync(TimeSpan.FromMilliseconds(millisecondsTimeout), cancellationToken)).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
+            await ((Task)asyncWaiter.WaitAsync(
+                TimeSpan.FromMilliseconds(millisecondsTimeout == Timeout.UnsignedInfinite ? (long)Timeout.Infinite : (long)millisecondsTimeout),
+                cancellationToken)).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
 
             if (cancellationToken.IsCancellationRequested)
             {

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,9 @@ private async Task<bool> WaitUntilCountOrTimeoutAsync(TaskNode asyncWaiter, uint`
`757`	`757`	`Debug.Assert(asyncWaiter is not null, "Waiter should have been constructed");`
`758`	`758`	`Debug.Assert(Monitor.IsEntered(m_lockObjAndDisposed), "Requires the lock be held");`
`759`	`759`
`760`		`- await ((Task)asyncWaiter.WaitAsync(TimeSpan.FromMilliseconds(millisecondsTimeout), cancellationToken)).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);`
	`760`	`+ await ((Task)asyncWaiter.WaitAsync(`
	`761`	`+ TimeSpan.FromMilliseconds(millisecondsTimeout == Timeout.UnsignedInfinite ? (long)Timeout.Infinite : (long)millisecondsTimeout),`
	`762`	`+ cancellationToken)).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);`
`761`	`763`
`762`	`764`	`if (cancellationToken.IsCancellationRequested)`
`763`	`765`	`{`