From 9f05a3d0fd2b663bc8d3f04323f24ab5cf48f3e6 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Fri, 29 May 2026 14:09:23 -0500
Subject: [PATCH] Tune Helix partitioning: use TargetOS/TargetArchitecture and
 bump NetAnalyzers multiplier

- Replace TargetRid.StartsWith('osx-arm64') with TargetOS/TargetArchitecture
  condition for clearer, more explicit platform detection
- Increase NetAnalyzers MethodLimitMultiplier from 5 to 10, reducing its
  Windows partitions from ~41 to ~21 work items (targeting 5min/item)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 test/UnitTests.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/UnitTests.proj b/test/UnitTests.proj
index 40b6df390d43..4bd02f33137f 100644
--- a/test/UnitTests.proj
+++ b/test/UnitTests.proj
@@ -76,7 +76,7 @@
        Targeting ~5 minutes per work item across all platforms. -->
   <PropertyGroup>
     <BaseMethodLimit Condition="'$(TestFullMSBuild)' == 'true'">64</BaseMethodLimit>
-    <BaseMethodLimit Condition="$(TargetRid.StartsWith('osx-arm64'))">128</BaseMethodLimit>
+    <BaseMethodLimit Condition="'$(TargetOS)' == 'osx' and '$(TargetArchitecture)' == 'arm64'">128</BaseMethodLimit>
     <BaseMethodLimit Condition="'$(BaseMethodLimit)' == ''">32</BaseMethodLimit>
   </PropertyGroup>
 
@@ -85,7 +85,7 @@
        fewer (but larger) work items and reducing per-item overhead on Helix queues. -->
   <ItemGroup>
     <SDKCustomXUnitProject Update="$(RepoRoot)src\Microsoft.CodeAnalysis.NetAnalyzers\tests\**\*.*Tests.csproj">
-      <MethodLimitMultiplier>5</MethodLimitMultiplier>
+      <MethodLimitMultiplier>10</MethodLimitMultiplier>
     </SDKCustomXUnitProject>
     <SDKCustomXUnitProject Update="TemplateEngine\**\*.csproj;**\Microsoft.TemplateEngine.Cli.UnitTests.csproj">
       <MethodLimitMultiplier>20</MethodLimitMultiplier>