From 983ae624cd62d4f70f564f9636f86bcc5b996710 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 27 Feb 2025 14:57:43 -0800
Subject: [PATCH 1/4] Only build BuildAfterTargeting pack on win-x64 in VMR

---
 .../BuildAfterTargetingPack.csproj                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index bbc1d339174d..d59f071a8c2c 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -39,9 +39,10 @@
   </ItemGroup>
 
   <!-- Cannot build in source-build because that does not create an App.Ref layout. -->
+  <!-- In VMR builds, only build on win-x64 -->
   <Target Name="BuildDelayedProjects"
       BeforeTargets="Build"
-      Condition=" '$(DotNetBuildSourceOnly)' != 'true' "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) "
       Returns="@(TargetPathWithTargetPlatformMoniker)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -52,13 +53,13 @@
     </MSBuild>
   </Target>
 
-  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
+  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Clean" />
   </Target>
 
   <Target Name="CreateHelixPayloadDelayedProjects"
       BeforeTargets="CreateHelixPayload"
-      Condition=" '$(DotNetBuildSourceOnly)' != 'true' "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) "
       Returns="@(HelixWorkItem)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -76,19 +77,19 @@
     </MSBuild>
   </Target>
 
-  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
+  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Pack" />
   </Target>
 
-  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
+  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Publish" />
   </Target>
 
-  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
+  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Test" />
   </Target>
 
-  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
+  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="VSTest" />
   </Target>
 

From 682165326e1af4d72434d6148952402094860eb0 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 27 Feb 2025 15:13:02 -0800
Subject: [PATCH 2/4] Only build on win-x64 period

---
 .../BuildAfterTargetingPack.csproj                 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index d59f071a8c2c..5245d5a6ffdf 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -42,7 +42,7 @@
   <!-- In VMR builds, only build on win-x64 -->
   <Target Name="BuildDelayedProjects"
       BeforeTargets="Build"
-      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       Returns="@(TargetPathWithTargetPlatformMoniker)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -53,13 +53,13 @@
     </MSBuild>
   </Target>
 
-  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
+  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Clean" />
   </Target>
 
   <Target Name="CreateHelixPayloadDelayedProjects"
       BeforeTargets="CreateHelixPayload"
-      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       Returns="@(HelixWorkItem)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -77,19 +77,19 @@
     </MSBuild>
   </Target>
 
-  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
+  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Pack" />
   </Target>
 
-  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
+  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Publish" />
   </Target>
 
-  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
+  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Test" />
   </Target>
 
-  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(DotNetBuild)' != 'true' OR ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64')) ">
+  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="VSTest" />
   </Target>
 

From 04cb4a90043d37ed43661e66ec7c6e0acc54f89e Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 27 Feb 2025 15:13:38 -0800
Subject: [PATCH 3/4] AND AND

---
 .../BuildAfterTargetingPack.csproj                 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index 5245d5a6ffdf..6145775b0809 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -42,7 +42,7 @@
   <!-- In VMR builds, only build on win-x64 -->
   <Target Name="BuildDelayedProjects"
       BeforeTargets="Build"
-      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       Returns="@(TargetPathWithTargetPlatformMoniker)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -53,13 +53,13 @@
     </MSBuild>
   </Target>
 
-  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
+  <Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Clean" />
   </Target>
 
   <Target Name="CreateHelixPayloadDelayedProjects"
       BeforeTargets="CreateHelixPayload"
-      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
+      Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "
       Returns="@(HelixWorkItem)">
     <MSBuild Projects="@(RequiresDelayedBuild)"
         BuildInParallel="$(BuildInParallel)"
@@ -77,19 +77,19 @@
     </MSBuild>
   </Target>
 
-  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
+  <Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Pack" />
   </Target>
 
-  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
+  <Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Publish" />
   </Target>
 
-  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
+  <Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Test" />
   </Target>
 
-  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
+  <Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') ">
     <MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="VSTest" />
   </Target>
 

From faffaf940b81a624e5088a9e04557d8c436d0b69 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 27 Feb 2025 16:51:28 -0800
Subject: [PATCH 4/4] Remove VMR build comment

---
 src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
index 6145775b0809..49a8a3b6431e 100644
--- a/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
+++ b/src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <!-- Cannot build in source-build because that does not create an App.Ref layout. -->
-  <!-- In VMR builds, only build on win-x64 -->
+  <!-- Only build on win-x64 -->
   <Target Name="BuildDelayedProjects"
       BeforeTargets="Build"
       Condition=" '$(DotNetBuildSourceOnly)' != 'true' AND ('$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64') "