Skip to content

Commit 4187129

Browse files
authored
Add ARM64 to TestMatrix logic (#27838)
* Add default arch for arm64 #26872 * Re-enable IsWindowsOnlyTest on arm #27838
1 parent 66d1924 commit 4187129

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

eng/targets/Helix.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
4545
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
4646
</ItemGroup>
47-
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
47+
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
4848
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
4949
</ItemGroup>
5050
</Project>

src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -124,9 +124,11 @@ private void ResolveDefaultArchitecture()
124124
{
125125
switch (RuntimeInformation.OSArchitecture)
126126
{
127+
case Architecture.Arm:
127128
case Architecture.X86:
128129
Architectures.Add(RuntimeArchitecture.x86);
129130
break;
131+
case Architecture.Arm64:
130132
case Architecture.X64:
131133
Architectures.Add(RuntimeArchitecture.x64);
132134
break;

0 commit comments

Comments
 (0)