From ef499fe9c33a00bb5b1ef67b14ef7acbd8b74e24 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 13 Jan 2022 08:46:17 -0800 Subject: [PATCH] Revert "[release/6.0] Switch to Windows.Amd64.Server2022.Open (#39364)" (#39476) - fix #39363 - Windows.11.Amd64.ClientPre now exists, enabling use in internal PRs - this reverts commit 2dcd7e555af870a0c1b3ae63d31bc56513653d6c --- eng/targets/Helix.Common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index b06f5ecbb9f..c82fe494c85 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -7,7 +7,7 @@ <HelixQueueMariner>(Mariner)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner> <HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11> </PropertyGroup> - + <ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'"> <HelixAvailablePlatform Include="Windows" /> <HelixAvailablePlatform Include="OSX" /> @@ -21,7 +21,7 @@ <!-- x64 PR(ci.yaml) required queues for internal and public cases --> <ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' != 'true'"> <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" /> - <HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" /> + <HelixAvailableTargetQueue Include="Windows.11.Amd64.ClientPre.Open" Platform="Windows" /> <HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" /> </ItemGroup> -- GitLab