Skip to content

Commit 261d95d

Browse files
authored
Swap out Win11 for Win-VS2022 in CI (#61743)
* Swap out Win11 for Win-VS2022 in CI * More stars * Unskip a bunch of tests * Revert matrix changes * Revert "Revert matrix changes" This reverts commit 1b00075. * Undo helix-matrix change * More unskips * Skip test
1 parent 62212a6 commit 261d95d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+5
-50
lines changed

eng/targets/Helix.Common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ItemGroup>
3232
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
3333
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
34-
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
34+
<HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
3535
</ItemGroup>
3636
</When>
3737
<Otherwise>
@@ -54,7 +54,7 @@
5454

5555
<!-- Windows -->
5656
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />
57-
<HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
57+
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
5858

5959
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on its setup scripts. -->
6060
<HelixAvailableTargetQueue Include="windows.11.arm64.open" Platform="Windows"

src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests;
2323

24-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
2524
public class Http2Tests : LoggedTest
2625
{
2726
private const string VersionForReset = "10.0.19529";

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2929
#endif
3030

3131
[Collection(PublishedSitesCollection.Name)]
32-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3332
public class AspNetCorePortTests : IISFunctionalTestBase
3433
{
3534
// Port range allowed by ANCM config

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2828
#endif
2929

3030
[Collection(PublishedSitesCollection.Name)]
31-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3231
public class BasicAuthTests : IISFunctionalTestBase
3332
{
3433
public BasicAuthTests(PublishedSitesFixture fixture) : base(fixture)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2626
#endif
2727

2828
[Collection(IISCompressionSiteCollection.Name)]
29-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3029
public class CompressionTests : FixtureLoggedTest
3130
{
3231
private readonly IISCompressionSiteFixture _fixture;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
3131
#endif
3232

3333
[Collection(PublishedSitesCollection.Name)]
34-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3534
public class FrebTests : IISFunctionalTestBase
3635
{
3736
public FrebTests(PublishedSitesFixture fixture) : base(fixture)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2929
#endif
3030

3131
[Collection(PublishedSitesCollection.Name)]
32-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3332
public class GlobalVersionTests : IISFunctionalTestBase
3433
{
3534
public GlobalVersionTests(PublishedSitesFixture fixture) : base(fixture)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
3838
/// with newer functionality.
3939
/// </summary>
4040
[Collection(IISHttpsTestSiteCollection.Name)]
41-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
4241
public class Http2Tests
4342
{
4443
public Http2Tests(IISTestSiteFixture fixture)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
3131

3232
[Collection(PublishedSitesCollection.Name)]
3333
[SkipIfNotAdmin]
34-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3534
public class ClientCertificateTests : IISFunctionalTestBase
3635
{
3736
private readonly ClientCertificateFixture _certFixture;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
2727
#endif
2828

2929
[Collection(PublishedSitesCollection.Name)]
30-
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
3130
public class Latin1Tests : IISFunctionalTestBase
3231
{
3332
public Latin1Tests(PublishedSitesFixture fixture) : base(fixture)

0 commit comments

Comments
 (0)