Skip to content

Commit f9dad29

Browse files
authored
[automated] Merge branch 'release/10.0' => 'main' (#37546)
2 parents f8d5e5e + cd53c6b commit f9dad29

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

azure-pipelines-internal-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ extends:
198198
templateContext:
199199
sdl:
200200
binskim:
201-
prereleaseVersion: ''
201+
preReleaseVersion: ''
202202
- job: Helix
203203
timeoutInMinutes: 180
204204
pool:

test/EFCore.Relational.Tests/RelationalConnectionTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,8 +1101,9 @@ public async Task HandleTransactionCompleted_with_concurrent_ClearTransactions_i
11011101
scope.Complete();
11021102

11031103
// Start the reset task first, which will yield and then try to reset
1104-
var resetTask = Task.Run(() =>
1104+
var resetTask = Task.Run(async () =>
11051105
{
1106+
await Task.Yield();
11061107
// ResetState calls ClearTransactions which might race with HandleTransactionCompleted
11071108
((IResettableService)connection).ResetState();
11081109
});

0 commit comments

Comments
 (0)