Skip to content

Commit e8200cb

Browse files
wtgodbeTratcher
andauthored
Add Server2022 to helix matrix & quarantine jobs (dotnet#37745)
* Add Server2022 to helix matrix & quarantine jobs * Skip TLS1.1 test on 2022 * Off by 1 * Update src/Testing/src/xunit/WindowsVersions.cs Co-authored-by: Chris Ross <chrross@microsoft.com> * TLS test max versions Co-authored-by: Chris Ross <chrross@microsoft.com>
1 parent 5753b83 commit e8200cb

File tree

5 files changed

+12
-0
lines changed

5 files changed

+12
-0
lines changed

eng/targets/Helix.Common.props

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
5353
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
5454
<HelixAvailableTargetQueue Include="Windows.11.Amd64.ClientPre.Open" Platform="Windows" />
55+
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
5556
</ItemGroup>
5657

5758
<!-- x64 Queues for internal helix-matrix.yml and quarantine pipelines -->

src/Servers/Kestrel/Transport.Quic/test/QuicConnectionListenerTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public async Task AcceptAsync_ClientCreatesConnection_ServerAccepts()
6060
[ConditionalFact]
6161
[MsQuicSupported]
6262
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
63+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2,
64+
SkipReason = "Windows versions newer than 20H2 do not enable TLS 1.1: https://github.com/dotnet/aspnetcore/issues/37761")]
6365
public async Task ClientCertificate_Required_Sent_Populated()
6466
{
6567
// Arrange

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public class TlsTests : LoggedTest
2929
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "TLS 1.1 ciphers are now disabled by default: https://github.com/dotnet/docs/issues/20842")]
3030
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10,
3131
SkipReason = "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support or incompatible ciphers on Windows 8.1")]
32+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2,
33+
SkipReason = "Windows versions newer than 20H2 do not enable TLS 1.1: https://github.com/dotnet/aspnetcore/issues/37761")]
3234
public async Task TlsHandshakeRejectsTlsLessThan12()
3335
{
3436
await using (var server = new TestServer(context =>

src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3TlsTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ public async Task ServerCertificateSelector_Invoked()
6767
[InlineData(ClientCertificateMode.AllowCertificate)]
6868
[MsQuicSupported]
6969
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/aspnetcore/issues/35800")]
70+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2,
71+
SkipReason = "Windows versions newer than 20H2 do not enable TLS 1.1: https://github.com/dotnet/aspnetcore/issues/37761")]
7072
public async Task ClientCertificate_AllowOrRequire_Available_Accepted(ClientCertificateMode mode)
7173
{
7274
var builder = CreateHostBuilder(async context =>

src/Testing/src/xunit/WindowsVersions.cs

+5
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,10 @@ public static class WindowsVersions
5050
/// 20H2, 19042
5151
/// </summary>
5252
public const string Win10_20H2 = "10.0.19042";
53+
54+
/// <summary>
55+
/// 2022, 20348
56+
/// </summary>
57+
public const string Win_Server_2022 = "10.0.20348";
5358
}
5459
}

0 commit comments

Comments
 (0)