Skip to content

Commit 9744792

Browse files
committed
Merge in 'release/6.0' changes
2 parents d504a7b + f81a942 commit 9744792

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>26</AspNetCorePatchVersion>
12-
<ValidateBaseline>true</ValidateBaseline>
11+
<AspNetCorePatchVersion>27</AspNetCorePatchVersion>
12+
<ValidateBaseline>false</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->

src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ public async Task LargeUpload(long? maxRequestBufferSize, bool connectionAdapter
210210
await memoryPoolFactory.WhenAllBlocksReturned(TestConstants.DefaultTimeout);
211211
}
212212

213-
[Fact]
213+
[ConditionalFact]
214+
[SkipOnAlpine("https://github.com/dotnet/aspnetcore/issues/50403")]
214215
public async Task ServerShutsDownGracefullyWhenMaxRequestBufferSizeExceeded()
215216
{
216217
// Parameters

src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,13 @@ public async Task RequestAbortedTokenFiredOnClientFIN()
630630
}
631631
}
632632

633-
[Theory]
633+
[ConditionalTheory]
634634
#if LIBUV
635635
[InlineData(true, 1)]
636636
[InlineData(false, 1)]
637637
[InlineData(true, 2)]
638638
[InlineData(false, 2)]
639+
[SkipOnAlpine("https://github.com/dotnet/aspnetcore/issues/50403")]
639640
public async Task AbortingTheConnection(bool fin, int threadCount)
640641
#else
641642
[InlineData(true)]

src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,10 @@ await connection.Send(
592592
}
593593
}
594594

595-
[Theory]
595+
[ConditionalTheory]
596596
[InlineData(true)]
597597
[InlineData(false)]
598+
[SkipOnAlpine("https://github.com/dotnet/aspnetcore/issues/50403")]
598599
public async Task HttpsConnectionClosedWhenResponseDoesNotSatisfyMinimumDataRate(bool fin)
599600
{
600601
const int chunkSize = 1024;

0 commit comments

Comments
 (0)