Skip to content

Commit 44e287e

Browse files
authored
Merge branch 'main' into sfx-aspnetcore
2 parents ad87dc3 + ffabb29 commit 44e287e

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,17 +414,17 @@
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415415
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24531.2">
417+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24551.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>12f956787e1b8db30a6322c3fe24b10ac5dcab13</Sha>
419+
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24525.2">
421+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24554.1">
422422
<Uri>https://github.com/dotnet/extensions</Uri>
423-
<Sha>443dc6e0052405b308671b5d4ca94ae2368d1d0d</Sha>
423+
<Sha>9eea77d211b201c6e60c5f5074238cca08ac1ba9</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.1.0-preview.1.24525.2">
425+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.1.0-preview.1.24554.1">
426426
<Uri>https://github.com/dotnet/extensions</Uri>
427-
<Sha>443dc6e0052405b308671b5d4ca94ae2368d1d0d</Sha>
427+
<Sha>9eea77d211b201c6e60c5f5074238cca08ac1ba9</Sha>
428428
</Dependency>
429429
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
430430
<Uri>https://github.com/nuget/nuget.client</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
<SystemIOHashingVersion>10.0.0-alpha.1.24551.5</SystemIOHashingVersion>
143143
<SystemRuntimeCachingVersion>10.0.0-alpha.1.24551.5</SystemRuntimeCachingVersion>
144144
<!-- Packages from dotnet/extensions -->
145-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.1.0-preview.1.24525.2</MicrosoftExtensionsDiagnosticsTestingVersion>
146-
<MicrosoftExtensionsTimeProviderTestingVersion>9.1.0-preview.1.24525.2</MicrosoftExtensionsTimeProviderTestingVersion>
145+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.1.0-preview.1.24554.1</MicrosoftExtensionsDiagnosticsTestingVersion>
146+
<MicrosoftExtensionsTimeProviderTestingVersion>9.1.0-preview.1.24554.1</MicrosoftExtensionsTimeProviderTestingVersion>
147147
<!-- Packages from dotnet/efcore -->
148148
<dotnetefVersion>10.0.0-alpha.1.24531.1</dotnetefVersion>
149149
<MicrosoftEntityFrameworkCoreInMemoryVersion>10.0.0-alpha.1.24531.1</MicrosoftEntityFrameworkCoreInMemoryVersion>

src/Servers/Kestrel/test/InMemory.FunctionalTests/KestrelMetricsTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ await connection.ReceiveEnd(
159159
}
160160

161161
[Fact]
162-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57944")]
163162
public async Task Http1Connection_RequestEndsWithIncompleteReadAsync()
164163
{
165164
var testMeterFactory = new TestMeterFactory();
@@ -391,7 +390,6 @@ await connection.ReceiveEnd(
391390
}
392391

393392
[Fact]
394-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/58086")]
395393
public async Task Http1Connection_ServerAbort_HasErrorType()
396394
{
397395
var testMeterFactory = new TestMeterFactory();

src/Servers/Kestrel/test/Interop.FunctionalTests/Http2/Http2RequestTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,9 @@ public async Task GET_NoTLS_Http11RequestToHttp2Endpoint_400Result()
219219
}
220220
}
221221

222-
[Theory]
222+
[Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/41074")]
223223
[InlineData(true)]
224224
[InlineData(false)]
225-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/41074")]
226225
public async Task GET_RequestReturnsLargeData_GracefulShutdownDuringRequest_RequestGracefullyCompletes(bool hasTrailers)
227226
{
228227
// Enable client logging.

0 commit comments

Comments
 (0)