Skip to content

Commit 849021b

Browse files
authored
Fix SkipHelixArm condition (#47083)
* Fix SkipHelixArm condition * Fixup * Fixup * Uno mas
1 parent 0e0d50f commit 849021b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

eng/targets/Helix.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123

124124
<PropertyGroup>
125125
<BuildHelixPayload Condition="'@(_HelixApplicableTargetQueue->Count())' == '0'">false</BuildHelixPayload>
126-
<BuildHelixPayload Condition="'$(TargetArchitecture)' == 'arm64' AND '$(SkipHelixArm)' == 'true'">false</BuildHelixPayload>
126+
<BuildHelixPayload Condition="$(HelixTargetQueue.ToUpperInvariant().Contains('ARM64')) AND '$(SkipHelixArm)' == 'true'">false</BuildHelixPayload>
127127
<BuildHelixPayload Condition="$(HelixTargetQueue.StartsWith('%28Alpine.')) AND '$(SkipHelixAlpine)' == 'true'">false</BuildHelixPayload>
128128
<BuildHelixPayload Condition="$(SkipHelixQueues.Contains('$(HelixTargetQueue)'))">false</BuildHelixPayload>
129129
</PropertyGroup>

src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ServerGarbageCollection>true</ServerGarbageCollection>
66
<TestGroupName>Libuv.BindTests</TestGroupName>
77
<!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
8-
<SkipHelixQueues>Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open</SkipHelixQueues>
8+
<SkipHelixArm>true</SkipHelixArm>
99
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1010
</PropertyGroup>
1111

src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Put this project into its own test group to avoid running parallel with other test projects. Libuv does not play nice with other test assemblies. -->
99
<TestGroupName>Libuv.FunctionalTests</TestGroupName>
1010
<!-- https://github.com/dotnet/aspnetcore/issues/22114 -->
11-
<SkipHelixQueues>Windows.10.Arm64;Windows.10.Arm64.Open;Windows.10.Arm64v8;Windows.10.Arm64v8.Open</SkipHelixQueues>
11+
<SkipHelixArm>true</SkipHelixArm>
1212
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1313
</PropertyGroup>
1414

0 commit comments

Comments
 (0)