Skip to content

Commit 894d9af

Browse files
authored
[Helix] Use standard win10 helix queues (#14263)
1 parent 98e4a1f commit 894d9af

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

eng/targets/Helix.Common.props

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
<Project>
2-
<ItemDefinitionGroup>
3-
<HelixAvailableTargetQueue>
4-
<EnableByDefault>true</EnableByDefault>
5-
</HelixAvailableTargetQueue>
6-
</ItemDefinitionGroup>
7-
82
<!-- this file is shared between Helix.proj and .csproj files -->
93
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
104
<HelixAvailablePlatform Include="Windows" />
@@ -14,10 +8,9 @@
148

159
<!-- x64 queues -->
1610
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'x64'">
17-
<HelixAvailableTargetQueue Include="Windows.10.Amd64.ClientRS4.VS2017.Open" Platform="Windows" />
11+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
1812
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
1913
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
20-
<HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" EnableByDefault="false" />
2114
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
2215
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
2316
<HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
@@ -40,7 +33,7 @@
4033
<ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true'">
4134
<HelixAvailablePlatform Include="Windows" />
4235

43-
<HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" />
36+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
4437
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
4538
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
4639

eng/targets/Helix.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
4242

4343
<ItemGroup>
4444
<!-- Include default queues based on platform -->
45-
<_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
45+
<_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true'" />
4646

4747
<_HelixApplicableTargetQueue Include="%(_HelixProjectTargetQueue.Identity)" Condition="'%(Identity)' == '$(HelixTargetQueue)'" />
4848
</ItemGroup>

src/Servers/Kestrel/Core/test/AddressBinderTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public void ParseAddressLocalhost()
7777
}
7878

7979
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")]
80+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/14382", Queues = "Windows.10.Amd64.Open")]
8081
[ConditionalFact]
8182
public void ParseAddressUnixPipe()
8283
{

src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class UnixDomainSocketsTest : TestApplicationErrorLoggerLoggedTest
2626
#else
2727
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win8, WindowsVersions.Win81, WindowsVersions.Win2008R2, SkipReason = "UnixDomainSocketEndPoint is not supported on older versions of Windows")]
2828
#endif
29+
[SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/14382", Queues = "Windows.10.Amd64.Open")]
2930
[ConditionalFact]
3031
[CollectDump]
3132
public async Task TestUnixDomainSocket()

0 commit comments

Comments
 (0)