|
13 | 13 |
|
14 | 14 | <!-- PR(ci.yaml) required queues -->
|
15 | 15 | <ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
|
16 |
| - <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" /> |
17 |
| - <HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" /> |
| 16 | + <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" Condition=" '$(TargetOsName)' == 'linux' " /> |
| 17 | + <HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" Condition=" '$(TargetOsName)' == 'win' " /> |
18 | 18 | </ItemGroup>
|
19 | 19 |
|
20 | 20 | <!-- queues for helix-matrix.yml pipeline -->
|
21 |
| - <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'"> |
| 21 | + <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND |
| 22 | + '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true' AND '$(TargetOsName)' == 'linux' "> |
22 | 23 | <HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
|
23 | 24 | <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
|
24 | 25 | <HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
|
25 | 26 | <HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
|
26 | 27 | < HelixAvailableTargetQueue Include= "(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform= "Linux" />
|
27 | 28 | < HelixAvailableTargetQueue Include= "(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673" Platform= "Linux" />
|
28 | 29 | </ItemGroup>
|
29 |
| - <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'"> |
| 30 | + <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND |
| 31 | + '$(_UseHelixOpenQueues)' == 'true' AND '$(TargetOsName)' == 'win' "> |
30 | 32 | <!-- TODO Re-enable Win-7 queue when dotnet restore are fixed. https://github.com/dotnet/aspnetcore/issues/32683 -->
|
31 | 33 | <!-- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" /> -->
|
32 | 34 | <HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
|
33 | 35 | </ItemGroup>
|
34 |
| - <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' != 'true'"> |
| 36 | + <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND |
| 37 | + '$(_UseHelixOpenQueues)' != 'true' AND '$(TargetOsName)' == 'win' "> |
35 | 38 | <HelixAvailableTargetQueue Include="Windows.10.Amd64.ClientPre.VS2019.Pre" Platform="Windows" />
|
36 | 39 | </ItemGroup>
|
37 | 40 |
|
38 | 41 | <!-- arm64 queues for helix-matrix.yml pipeline -->
|
39 |
| - <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'"> |
| 42 | + <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND |
| 43 | + '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true' AND '$(TargetOsName)' == 'linux' "> |
40 | 44 | < HelixAvailableTargetQueue Include= "(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform= "Linux" />
|
41 | 45 | </ItemGroup>
|
42 | 46 | <!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->
|
43 |
| - <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'"> |
| 47 | + <ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND |
| 48 | + '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true' AND '$(TargetOsName)' == 'win' "> |
44 | 49 | <HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
|
45 | 50 | </ItemGroup>
|
46 | 51 | </Project>
|
0 commit comments