From 41f2b273b068d04162035cd4387f5872797e5cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:27:30 +0200
Subject: [PATCH 1/7] Only build applicable build Tasks when building the repo

We're starting to build too many tasks unconditionally.
---
 src/tasks/tasks.proj | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 504f3caad09474..9d0cce7e235d60 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -1,12 +1,26 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)**\*.csproj" />
+    <MonoTaskProject Include="AndroidAppBuilder\AndroidAppBuilder.csproj" />
+    <MonoTaskProject Include="AotCompilerTask\MonoAOTCompiler.csproj" />
+    <MonoTaskProject Include="AppleAppBuilder\AppleAppBuilder.csproj" />
+    <MonoTaskProject Include="LibraryBuilder\LibraryBuilder.csproj" />
+    <MonoTaskProject Include="Microsoft.NET.Sdk.WebAssembly.Pack.Tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj" />
+    <MonoTaskProject Include="Microsoft.NET.WebAssembly.Webcil\Microsoft.NET.WebAssembly.Webcil.csproj" />
+    <MonoTaskProject Include="MobileBuildTasks\MobileBuildTasks.csproj" />
+    <MonoTaskProject Include="MonoTargetsTasks\MonoTargetsTasks.csproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <MonoTaskProject Include="MonoTargetsTasks\ILStrip\AssemblyStripper\AssemblyStripper.csproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <MonoTaskProject Include="TestExclusionListTasks\TestExclusionListTasks.csproj" />
+    <MonoTaskProject Include="WasmAppBuilder\WasmAppBuilder.csproj" />
+    <MonoTaskProject Include="WasmBuildTasks\WasmBuildTasks.csproj" />
+    <MonoTaskProject Include="WorkloadBuildTasks\WorkloadBuildTasks.csproj" />
 
-    <!-- These projects do not need to be built during source-build. -->
-    <!-- For example, they may take dependencies on pre-built packages that aren't build-from-source. e.g. 'Microsoft.DotNet.CilStrip.Sources' -->
-    <ProjectReference Remove="MonoTargetsTasks\MonoTargetsTasks.csproj;
-                              MonoTargetsTasks\ILStrip\AssemblyStripper\AssemblyStripper.csproj"
-                      Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <CoreCLRTaskProject Include="Crossgen2Tasks\Crossgen2Tasks.csproj" />
+
+    <TaskProject Include="installer.tasks\installer.tasks.csproj" />
+
+    <ProjectReference Include="@(MonoTaskProject)" Condition="'$(RuntimeFlavor)' == 'Mono'" />
+    <ProjectReference Include="@(CoreCLRTaskProject)" Condition="'$(RuntimeFlavor)' == 'CoreCLR'" />
+    <ProjectReference Include="@(TaskProject)" />
   </ItemGroup>
 
   <!--

From 02682fdb755cd06985c139c9706650d9fbca2a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Mon, 1 Jul 2024 13:29:06 +0200
Subject: [PATCH 2/7] Update tasks.proj

---
 src/tasks/tasks.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 9d0cce7e235d60..456d871d50e954 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -14,7 +14,8 @@
     <MonoTaskProject Include="WasmBuildTasks\WasmBuildTasks.csproj" />
     <MonoTaskProject Include="WorkloadBuildTasks\WorkloadBuildTasks.csproj" />
 
-    <CoreCLRTaskProject Include="Crossgen2Tasks\Crossgen2Tasks.csproj" />
+    <!-- This should be CoreCLRTaskProject but Mono legs apparently need this for now -->
+    <TaskProject Include="Crossgen2Tasks\Crossgen2Tasks.csproj" />
 
     <TaskProject Include="installer.tasks\installer.tasks.csproj" />
 

From d484dcbc410d75b7cb3b4f4a85cd066374ce5f54 Mon Sep 17 00:00:00 2001
From: Steve Pfister <stpfiste@microsoft.com>
Date: Wed, 3 Jul 2024 09:47:43 -0400
Subject: [PATCH 3/7] Condition against mobile for most of the task projects

---
 src/tasks/tasks.proj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 456d871d50e954..0b562db69090b3 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
     <MonoTaskProject Include="AndroidAppBuilder\AndroidAppBuilder.csproj" />
     <MonoTaskProject Include="AotCompilerTask\MonoAOTCompiler.csproj" />
     <MonoTaskProject Include="AppleAppBuilder\AppleAppBuilder.csproj" />
@@ -12,8 +12,12 @@
     <MonoTaskProject Include="TestExclusionListTasks\TestExclusionListTasks.csproj" />
     <MonoTaskProject Include="WasmAppBuilder\WasmAppBuilder.csproj" />
     <MonoTaskProject Include="WasmBuildTasks\WasmBuildTasks.csproj" />
+  
+    <!-- For WasmBuildTests or any other configuration that tests against workloads -->
     <MonoTaskProject Include="WorkloadBuildTasks\WorkloadBuildTasks.csproj" />
+  </ItemGroup>
 
+  <ItemGroup>
     <!-- This should be CoreCLRTaskProject but Mono legs apparently need this for now -->
     <TaskProject Include="Crossgen2Tasks\Crossgen2Tasks.csproj" />
 

From bc48d7b46b5629d2df5f028db4a86743c18c9b6f Mon Sep 17 00:00:00 2001
From: Steve Pfister <stpfiste@microsoft.com>
Date: Wed, 3 Jul 2024 11:12:13 -0400
Subject: [PATCH 4/7] Duplicate the TargetsMobile property for now

---
 src/tasks/tasks.proj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 0b562db69090b3..fe846e4a00a40d 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.Build.Traversal">
+  <PropertyGroup>
+    <TargetsMobile Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'android' or '$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi'">true</TargetsMobile>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
     <MonoTaskProject Include="AndroidAppBuilder\AndroidAppBuilder.csproj" />
     <MonoTaskProject Include="AotCompilerTask\MonoAOTCompiler.csproj" />

From 8144b4295285cd01e5a159755083ebce0e1c8ae2 Mon Sep 17 00:00:00 2001
From: Steve Pfister <stpfiste@microsoft.com>
Date: Wed, 3 Jul 2024 11:59:06 -0400
Subject: [PATCH 5/7] Don't condition the projectref

---
 src/tasks/tasks.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index fe846e4a00a40d..58d2896b86b6b1 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -27,7 +27,7 @@
 
     <TaskProject Include="installer.tasks\installer.tasks.csproj" />
 
-    <ProjectReference Include="@(MonoTaskProject)" Condition="'$(RuntimeFlavor)' == 'Mono'" />
+    <ProjectReference Include="@(MonoTaskProject)" />
     <ProjectReference Include="@(CoreCLRTaskProject)" Condition="'$(RuntimeFlavor)' == 'CoreCLR'" />
     <ProjectReference Include="@(TaskProject)" />
   </ItemGroup>

From b88159eb978a96d3bd8a189fa27e027c0f8ba2c6 Mon Sep 17 00:00:00 2001
From: Steve Pfister <stpfiste@microsoft.com>
Date: Mon, 8 Jul 2024 08:44:46 -0400
Subject: [PATCH 6/7] Show that TargetsMobile is not resolved in tasks.proj

---
 src/tasks/tasks.proj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 58d2896b86b6b1..991a9afd507164 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.Build.Traversal">
-  <PropertyGroup>
-    <TargetsMobile Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'android' or '$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi'">true</TargetsMobile>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
     <MonoTaskProject Include="AndroidAppBuilder\AndroidAppBuilder.csproj" />
     <MonoTaskProject Include="AotCompilerTask\MonoAOTCompiler.csproj" />

From 48322ea7266fbcc7c098d379a1c664b4570a2978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:37:39 +0200
Subject: [PATCH 7/7] Update tasks.proj

---
 src/tasks/tasks.proj | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 991a9afd507164..4a59eac822a156 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -1,31 +1,27 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup Condition="'$(TargetsMobile)' == 'true'">
-    <MonoTaskProject Include="AndroidAppBuilder\AndroidAppBuilder.csproj" />
-    <MonoTaskProject Include="AotCompilerTask\MonoAOTCompiler.csproj" />
-    <MonoTaskProject Include="AppleAppBuilder\AppleAppBuilder.csproj" />
-    <MonoTaskProject Include="LibraryBuilder\LibraryBuilder.csproj" />
-    <MonoTaskProject Include="Microsoft.NET.Sdk.WebAssembly.Pack.Tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj" />
-    <MonoTaskProject Include="Microsoft.NET.WebAssembly.Webcil\Microsoft.NET.WebAssembly.Webcil.csproj" />
-    <MonoTaskProject Include="MobileBuildTasks\MobileBuildTasks.csproj" />
-    <MonoTaskProject Include="MonoTargetsTasks\MonoTargetsTasks.csproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-    <MonoTaskProject Include="MonoTargetsTasks\ILStrip\AssemblyStripper\AssemblyStripper.csproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-    <MonoTaskProject Include="TestExclusionListTasks\TestExclusionListTasks.csproj" />
-    <MonoTaskProject Include="WasmAppBuilder\WasmAppBuilder.csproj" />
-    <MonoTaskProject Include="WasmBuildTasks\WasmBuildTasks.csproj" />
+    <ProjectReference Include="AndroidAppBuilder\AndroidAppBuilder.csproj" />
+    <ProjectReference Include="AotCompilerTask\MonoAOTCompiler.csproj" />
+    <ProjectReference Include="AppleAppBuilder\AppleAppBuilder.csproj" />
+    <ProjectReference Include="LibraryBuilder\LibraryBuilder.csproj" />
+    <ProjectReference Include="Microsoft.NET.Sdk.WebAssembly.Pack.Tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj" />
+    <ProjectReference Include="Microsoft.NET.WebAssembly.Webcil\Microsoft.NET.WebAssembly.Webcil.csproj" />
+    <ProjectReference Include="MobileBuildTasks\MobileBuildTasks.csproj" />
+    <ProjectReference Include="MonoTargetsTasks\MonoTargetsTasks.csproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <ProjectReference Include="MonoTargetsTasks\ILStrip\AssemblyStripper\AssemblyStripper.csproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <ProjectReference Include="TestExclusionListTasks\TestExclusionListTasks.csproj" />
+    <ProjectReference Include="WasmAppBuilder\WasmAppBuilder.csproj" />
+    <ProjectReference Include="WasmBuildTasks\WasmBuildTasks.csproj" />
   
     <!-- For WasmBuildTests or any other configuration that tests against workloads -->
-    <MonoTaskProject Include="WorkloadBuildTasks\WorkloadBuildTasks.csproj" />
+    <ProjectReference Include="WorkloadBuildTasks\WorkloadBuildTasks.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <!-- This should be CoreCLRTaskProject but Mono legs apparently need this for now -->
-    <TaskProject Include="Crossgen2Tasks\Crossgen2Tasks.csproj" />
+    <!-- This could be conditioned on '$(RuntimeFlavor)' == 'CoreCLR' but Mono legs still need it right now -->
+    <ProjectReference Include="Crossgen2Tasks\Crossgen2Tasks.csproj" />
 
-    <TaskProject Include="installer.tasks\installer.tasks.csproj" />
-
-    <ProjectReference Include="@(MonoTaskProject)" />
-    <ProjectReference Include="@(CoreCLRTaskProject)" Condition="'$(RuntimeFlavor)' == 'CoreCLR'" />
-    <ProjectReference Include="@(TaskProject)" />
+    <ProjectReference Include="installer.tasks\installer.tasks.csproj" />
   </ItemGroup>
 
   <!--