Skip to content

Commit 8cb8375

Browse files
TratcherTratcher
authored
Switch to the new Server20H2 queue (#28712)
1 parent 40630e9 commit 8cb8375

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

‎eng/targets/Helix.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!-- PR(ci.yaml) required queues -->
2222
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64'">
2323
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
24-
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H1.Open" Platform="Windows" />
24+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
2525
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
2626
</ItemGroup>
2727

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/Http2Tests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
487487

488488
[ConditionalFact]
489489
[RequiresNewHandler]
490-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Custom Reset support was added in Win10_20H2.")]
490+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
491491
public async Task AppException_AfterHeaders_ResetInternalError()
492492
{
493493
await new HostBuilder()
@@ -541,7 +541,7 @@ public async Task Reset_PriorOSVersions_NotSupported()
541541

542542
[ConditionalFact]
543543
[RequiresNewHandler]
544-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
544+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
545545
public async Task Reset_BeforeResponse_Resets()
546546
{
547547
await new HostBuilder()
@@ -568,7 +568,7 @@ public async Task Reset_BeforeResponse_Resets()
568568

569569
[ConditionalFact]
570570
[RequiresNewHandler]
571-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
571+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
572572
public async Task Reset_BeforeResponse_Zero_Resets()
573573
{
574574
await new HostBuilder()
@@ -595,7 +595,7 @@ public async Task Reset_BeforeResponse_Zero_Resets()
595595

596596
[ConditionalFact]
597597
[RequiresNewHandler]
598-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
598+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
599599
public async Task Reset_AfterResponseHeaders_Resets()
600600
{
601601
await new HostBuilder()
@@ -627,7 +627,7 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
627627

628628
[ConditionalFact]
629629
[RequiresNewHandler]
630-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
630+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
631631
public async Task Reset_DuringResponseBody_Resets()
632632
{
633633
await new HostBuilder()
@@ -664,7 +664,7 @@ public async Task Reset_DuringResponseBody_Resets()
664664

665665
[ConditionalFact]
666666
[RequiresNewHandler]
667-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
667+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
668668
public async Task Reset_BeforeRequestBody_Resets()
669669
{
670670
await new HostBuilder()
@@ -689,7 +689,7 @@ public async Task Reset_BeforeRequestBody_Resets()
689689

690690
[ConditionalFact]
691691
[RequiresNewHandler]
692-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
692+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
693693
public async Task Reset_DuringRequestBody_Resets()
694694
{
695695
await new HostBuilder()
@@ -714,7 +714,7 @@ public async Task Reset_DuringRequestBody_Resets()
714714
}
715715

716716
[ConditionalFact]
717-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
717+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
718718
public async Task Reset_AfterCompleteAsync_NoReset()
719719
{
720720
await new HostBuilder()
@@ -743,7 +743,7 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
743743
}
744744

745745
[ConditionalFact]
746-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers, SkipReason = "Reset support was added in Win10_20H2.")]
746+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersionForTrailers)]
747747
public async Task Reset_CompleteAsyncDuringRequestBody_Resets()
748748
{
749749
await new HostBuilder()

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ await connection.Send(
117117
[ConditionalFact]
118118
[RequiresNewHandler]
119119
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
120+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
120121
public async Task SetIISLimitMaxRequestBodyLogsWarning()
121122
{
122123
var deploymentParameters = Fixture.GetBaseDeploymentParameters();

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/ShutdownTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ public async Task AppOfflineDropped_CanRemoveAppOfflineAfterAddingAndSiteWorks_O
309309
}
310310

311311
[ConditionalFact]
312+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
312313
public async Task AppOfflineAddedAndRemovedStress_InProcess()
313314
{
314315
await AppOfflineAddAndRemovedStress(HostingModel.InProcess);
@@ -417,6 +418,7 @@ public async Task OutOfProcessToInProcessHostingModelSwitchWorks()
417418
}
418419

419420
[ConditionalFact]
421+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
420422
public async Task ConfigurationTouchedStress_InProcess()
421423
{
422424
await ConfigurationTouchedStress(HostingModel.InProcess);

‎src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public async Task StartsWithDotnetOnThePath(string path)
122122
[SkipIfNotAdmin]
123123
[RequiresNewShim]
124124
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
125+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
125126
public async Task StartsWithDotnetInstallLocation()
126127
{
127128
var deploymentParameters = Fixture.GetBaseDeploymentParameters();

‎src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public override Task<DeploymentResult> DeployAsync()
7575
{
7676
StartTimer();
7777

78+
Logger.LogInformation(Environment.OSVersion.ToString());
79+
7880
if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent))
7981
{
8082
DeploymentParameters.ServerConfigTemplateContent = File.ReadAllText("IIS.config");

‎src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ public override async Task<DeploymentResult> DeployAsync()
5151
// Start timer
5252
StartTimer();
5353

54+
Logger.LogInformation(Environment.OSVersion.ToString());
55+
5456
// For an unpublished application the dllroot points pre-built dlls like projectdir/bin/debug/netcoreappX.Y/
5557
// and contentRoot points to the project directory so you get things like static assets.
5658
// For a published app both point to the publish directory.

0 commit comments

Comments
 (0)