Skip to content

Commit 480d605

Browse files
authored
20H1 to 20H2 (#29906)
1 parent 8600214 commit 480d605

File tree

11 files changed

+61
-61
lines changed

11 files changed

+61
-61
lines changed

src/Servers/IIS/IIS/test/Common.FunctionalTests/FrebTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static IList<FrebLogItem> FrebChecks()
3636
}
3737

3838
[ConditionalFact]
39-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
39+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
4040
[RequiresIIS(IISCapability.FailedRequestTracingModule)]
4141
public async Task CheckCommonFrebEvents()
4242
{
@@ -50,7 +50,7 @@ public async Task CheckCommonFrebEvents()
5050
}
5151

5252
[ConditionalFact]
53-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
53+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
5454
[RequiresNewShim]
5555
[RequiresIIS(IISCapability.FailedRequestTracingModule)]
5656
public async Task FrebIncludesHResultFailures()
@@ -67,7 +67,7 @@ public async Task FrebIncludesHResultFailures()
6767
}
6868

6969
[ConditionalFact]
70-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
70+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
7171
[RequiresIIS(IISCapability.FailedRequestTracingModule)]
7272
public async Task CheckFailedRequestEvents()
7373
{
@@ -83,7 +83,7 @@ public async Task CheckFailedRequestEvents()
8383
// I think this test is flaky due to freb file not being created quickly enough.
8484
// Adding extra logging, marking as flaky, and repeating should help
8585
[ConditionalFact]
86-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
86+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
8787
[Repeat(10)]
8888
[RequiresIIS(IISCapability.FailedRequestTracingModule)]
8989
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/29428")]

src/Servers/IIS/IIS/test/Common.FunctionalTests/GlobalVersionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task GlobalVersion_DefaultWorks()
4141
}
4242

4343
[ConditionalFact]
44-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
44+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
4545
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
4646
[RequiresNewShim]
4747
public async Task GlobalVersion_EnvironmentVariableWorks()
@@ -88,7 +88,7 @@ public async Task GlobalVersion_NewVersionNumber_Fails(string version)
8888
}
8989

9090
[ConditionalTheory]
91-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
91+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
9292
[InlineData("2.1.0")]
9393
[InlineData("2.1.0-preview")]
9494
public async Task GlobalVersion_NewVersionNumber(string version)
@@ -110,7 +110,7 @@ public async Task GlobalVersion_NewVersionNumber(string version)
110110
}
111111

112112
[ConditionalTheory]
113-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
113+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
114114
[InlineData("2.1.0")]
115115
[InlineData("2.1.0-preview")]
116116
public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string version)
@@ -134,7 +134,7 @@ public async Task GlobalVersion_MultipleRequestHandlers_PicksHighestOne(string v
134134
}
135135

136136
[ConditionalTheory]
137-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
137+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
138138
[InlineData("2.1.0")]
139139
[InlineData("2.1.0-preview")]
140140
public async Task GlobalVersion_MultipleRequestHandlers_UpgradeWorks(string version)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
124124
[InlineData("PATCH")]
125125
[InlineData("DELETE")]
126126
[InlineData("CUSTOM")]
127-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Http2 requires Win10, and older versions of Win10 send some odd empty data frames.")]
127+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Http2 requires Win10, and older versions of Win10 send some odd empty data frames.")]
128128
public async Task Http2_RequestWithDataAndContentLength_Success(string method)
129129
{
130130
await new HostBuilder()
@@ -194,7 +194,7 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
194194
[InlineData("PATCH")]
195195
[InlineData("DELETE")]
196196
[InlineData("CUSTOM")]
197-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Http2 requires Win10, and older versions of Win10 send some odd empty data frames.")]
197+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Http2 requires Win10, and older versions of Win10 send some odd empty data frames.")]
198198
public async Task Http2_RequestWithDataAndNoContentLength_Success(string method)
199199
{
200200
await new HostBuilder()
@@ -256,7 +256,7 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
256256
}
257257

258258
[ConditionalFact]
259-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Http2 requires Win10, and older versions of Win10 send some odd empty data frames.")]
259+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Http2 requires Win10, and older versions of Win10 send some odd empty data frames.")]
260260
public async Task Http2_ResponseWithData_Success()
261261
{
262262
await new HostBuilder()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +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")]
120+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
121121
public async Task SetIISLimitMaxRequestBodyLogsWarning()
122122
{
123123
var deploymentParameters = Fixture.GetBaseDeploymentParameters();

src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ public static TestMatrix InprocessTestVariants
3232
.WithHostingModels(HostingModel.InProcess);
3333

3434
[ConditionalTheory]
35-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
35+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
3636
[MemberData(nameof(TestVariants))]
3737
public async Task CheckStdoutLoggingToFile(TestVariant variant)
3838
{
3939
await CheckStdoutToFile(variant, "ConsoleWrite");
4040
}
4141

4242
[ConditionalTheory]
43-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
43+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
4444
[MemberData(nameof(TestVariants))]
4545
public async Task CheckStdoutErrLoggingToFile(TestVariant variant)
4646
{
@@ -67,7 +67,7 @@ private async Task CheckStdoutToFile(TestVariant variant, string path)
6767

6868
// Move to separate file
6969
[ConditionalTheory]
70-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
70+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
7171
[MemberData(nameof(TestVariants))]
7272
public async Task InvalidFilePathForLogs_ServerStillRuns(TestVariant variant)
7373
{
@@ -137,7 +137,7 @@ public async Task StartupMessagesAreLoggedIntoDefaultDebugLogFileWhenEnabledWith
137137
}
138138

139139
[ConditionalTheory]
140-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
140+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
141141
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
142142
[MemberData(nameof(InprocessTestVariants))]
143143
public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig(TestVariant variant)
@@ -170,7 +170,7 @@ public async Task StartupMessagesLogFileSwitchedWhenLogFilePresentInWebConfig(Te
170170
}
171171

172172
[ConditionalTheory]
173-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
173+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
174174
[MemberData(nameof(InprocessTestVariants))]
175175
public async Task DebugLogsAreWrittenToEventLog(TestVariant variant)
176176
{
@@ -182,7 +182,7 @@ public async Task DebugLogsAreWrittenToEventLog(TestVariant variant)
182182
}
183183

184184
[ConditionalTheory]
185-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
185+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
186186
[MemberData(nameof(InprocessTestVariants))]
187187
public async Task CheckUTF8File(TestVariant variant)
188188
{
@@ -208,7 +208,7 @@ public async Task CheckUTF8File(TestVariant variant)
208208
}
209209

210210
[ConditionalTheory]
211-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
211+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
212212
[MemberData(nameof(InprocessTestVariants))]
213213
public async Task OnlyOneFileCreatedWithProcessStartTime(TestVariant variant)
214214
{
@@ -225,7 +225,7 @@ public async Task OnlyOneFileCreatedWithProcessStartTime(TestVariant variant)
225225
}
226226

227227
[ConditionalFact]
228-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
228+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
229229
public async Task CaptureLogsForOutOfProcessWhenProcessFailsToStart()
230230
{
231231
var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess);
@@ -240,7 +240,7 @@ public async Task CaptureLogsForOutOfProcessWhenProcessFailsToStart()
240240
}
241241

242242
[ConditionalFact]
243-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
243+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
244244
[RequiresNewShim]
245245
public async Task DisableRedirectionNoLogs()
246246
{
@@ -257,7 +257,7 @@ public async Task DisableRedirectionNoLogs()
257257
}
258258

259259
[ConditionalFact]
260-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
260+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
261261
public async Task CaptureLogsForOutOfProcessWhenProcessFailsToStart30KbMax()
262262
{
263263
var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess);
@@ -272,7 +272,7 @@ public async Task CaptureLogsForOutOfProcessWhenProcessFailsToStart30KbMax()
272272
}
273273

274274
[ConditionalTheory]
275-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
275+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
276276
[InlineData("ConsoleErrorWriteStartServer")]
277277
[InlineData("ConsoleWriteStartServer")]
278278
public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ await connection.Send(
115115
}
116116

117117
[ConditionalFact]
118-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
118+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
119119
[RequiresNewHandler]
120120
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
121121
public async Task SetIISLimitMaxRequestBodyLogsWarning()

src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task RunsTwoOutOfProcessApps()
3636
}
3737

3838
[ConditionalFact]
39-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
39+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
4040
public async Task FailsAndLogsWhenRunningTwoInProcessApps()
4141
{
4242
var parameters = Fixture.GetBaseDeploymentParameters(HostingModel.InProcess);
@@ -58,7 +58,7 @@ public async Task FailsAndLogsWhenRunningTwoInProcessApps()
5858
}
5959

6060
[ConditionalTheory]
61-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
61+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
6262
[InlineData(HostingModel.OutOfProcess)]
6363
[InlineData(HostingModel.InProcess)]
6464
public async Task FailsAndLogsEventLogForMixedHostingModel(HostingModel firstApp)

src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ await connection.Send(
666666
}
667667

668668
[ConditionalFact]
669-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
669+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
670670
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "NullReferenceException https://github.com/dotnet/aspnetcore/issues/26839")]
671671
public async Task ClientDisconnectStress()
672672
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ShutdownTests(PublishedSitesFixture fixture) : base(fixture)
2727
}
2828

2929
[ConditionalFact]
30-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
30+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
3131
public async Task ShutdownTimeoutIsApplied()
3232
{
3333
var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite);
@@ -309,7 +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")]
312+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
313313
public async Task AppOfflineAddedAndRemovedStress_InProcess()
314314
{
315315
await AppOfflineAddAndRemovedStress(HostingModel.InProcess);
@@ -418,7 +418,7 @@ public async Task OutOfProcessToInProcessHostingModelSwitchWorks()
418418
}
419419

420420
[ConditionalFact]
421-
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
421+
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
422422
public async Task ConfigurationTouchedStress_InProcess()
423423
{
424424
await ConfigurationTouchedStress(HostingModel.InProcess);

0 commit comments

Comments
 (0)