From ab76e2fe8237fc0f63178fd8fdcd9335d7a9bf28 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Thu, 26 Sep 2024 10:11:31 -0400
Subject: [PATCH 01/11] Introduce a join point for SdkLocator and
 VSTemplateLocator

Closes: https://github.com/dotnet/source-build/issues/4336
---
 eng/pipelines/templates/stages/vmr-build.yml   | 16 ++++++++++++++++
 src/SourceBuild/content/repo-projects/sdk.proj |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
index 216be2415593..1f082f648a2a 100644
--- a/eng/pipelines/templates/stages/vmr-build.yml
+++ b/eng/pipelines/templates/stages/vmr-build.yml
@@ -1092,3 +1092,19 @@ stages:
             targetArchitecture: arm64
             extraProperties: /p:PgoInstrument=true
             runTests: false
+
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Windows_Sdk_Join
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: x64
+            pool: ${{ parameters.pool_Windows }}
+            targetOS: windows
+            targetArchitecture: x64
+            runTests: false
+            buildPass: 2
+            reuseBuildArtifactsFrom:
+            - Windows_x64
+            - Windows_x86
+            - Windows_arm64
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 858678e015ac..10633cef6990 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -41,7 +41,7 @@
     <BuildArgs Condition="'$(EnablePoison)' == 'true'">$(BuildArgs) /p:DISABLE_CROSSGEN=true</BuildArgs>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(DotNetBuildPass)' != ''">
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="aspire" />
     <RepositoryReference Include="aspnetcore" />

From c90d8f803e136909491d3db36e3f53e79b36f50c Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Thu, 26 Sep 2024 10:17:30 -0400
Subject: [PATCH 02/11] Force stringiness

---
 eng/pipelines/templates/jobs/vmr-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
index 3875e9d54279..873cc98ee658 100644
--- a/eng/pipelines/templates/jobs/vmr-build.yml
+++ b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -215,7 +215,7 @@ jobs:
           **/*.nupkg
         displayName: Download Previous Build (${{ reuseBuildArtifacts }})
 
-      - ${{ eq(parameters.buildSourceOnly, true) }}:
+      - ${{ eq(parameters.buildSourceOnly, 'true') }}:
         - task: CopyFiles@2
           displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - Source Build artifacts)
           inputs:

From 14e4b6bdd4c501a543cbf8cbdd922f60b4fa1b9d Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Thu, 26 Sep 2024 10:18:57 -0400
Subject: [PATCH 03/11] Add missing `if`

---
 eng/pipelines/templates/jobs/vmr-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
index 873cc98ee658..83bfa0a3754e 100644
--- a/eng/pipelines/templates/jobs/vmr-build.yml
+++ b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -215,7 +215,7 @@ jobs:
           **/*.nupkg
         displayName: Download Previous Build (${{ reuseBuildArtifacts }})
 
-      - ${{ eq(parameters.buildSourceOnly, 'true') }}:
+      - ${{ if eq(parameters.buildSourceOnly, true) }}:
         - task: CopyFiles@2
           displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - Source Build artifacts)
           inputs:

From 632fe57f050ca40bb2871e6cb98dc6171a6ae344 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Thu, 26 Sep 2024 10:30:33 -0400
Subject: [PATCH 04/11] Had the conditional backwards. Also, move arcade out of
 condition

---
 src/SourceBuild/content/repo-projects/sdk.proj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 10633cef6990..e486dcd212f9 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -41,8 +41,11 @@
     <BuildArgs Condition="'$(EnablePoison)' == 'true'">$(BuildArgs) /p:DISABLE_CROSSGEN=true</BuildArgs>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(DotNetBuildPass)' != ''">
+  <ItemGroup>
     <RepositoryReference Include="arcade" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildPass)' == ''">
     <RepositoryReference Include="aspire" />
     <RepositoryReference Include="aspnetcore" />
     <RepositoryReference Include="command-line-api" />

From c6336d8efffaccd4f510c425ba7b4c1c26c76f10 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Thu, 26 Sep 2024 13:43:49 -0400
Subject: [PATCH 05/11] Only build SDK once, on win-x64, depending on artifacts
 from arm64/x86

---
 eng/pipelines/templates/stages/vmr-build.yml  | 23 +++++--------------
 .../content/repo-projects/sdk.proj            |  3 ---
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
index 1f082f648a2a..2d93af132d1b 100644
--- a/eng/pipelines/templates/stages/vmr-build.yml
+++ b/eng/pipelines/templates/stages/vmr-build.yml
@@ -390,6 +390,11 @@ stages:
         pool: ${{ parameters.pool_Windows }}
         targetOS: windows
         targetArchitecture: x64
+        ${{ if in(parameters.scope, 'full') }}:
+          buildPass: 2
+          reuseBuildArtifactsFrom:
+          - Windows_x86
+          - Windows_arm64
 
     - template: ../jobs/vmr-build.yml
       parameters:
@@ -1091,20 +1096,4 @@ stages:
             targetOS: windows
             targetArchitecture: arm64
             extraProperties: /p:PgoInstrument=true
-            runTests: false
-
-        - template: ../jobs/vmr-build.yml
-          parameters:
-            buildName: Windows_Sdk_Join
-            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-            vmrBranch: ${{ variables.VmrBranch }}
-            architecture: x64
-            pool: ${{ parameters.pool_Windows }}
-            targetOS: windows
-            targetArchitecture: x64
-            runTests: false
-            buildPass: 2
-            reuseBuildArtifactsFrom:
-            - Windows_x64
-            - Windows_x86
-            - Windows_arm64
+            runTests: false
\ No newline at end of file
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index e486dcd212f9..858678e015ac 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -43,9 +43,6 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DotNetBuildPass)' == ''">
     <RepositoryReference Include="aspire" />
     <RepositoryReference Include="aspnetcore" />
     <RepositoryReference Include="command-line-api" />

From 4907de7f9311494757a5c92fd1c078f5ea425476 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Fri, 27 Sep 2024 10:01:06 -0400
Subject: [PATCH 06/11] Actually attempt to build join-point-only projects

---
 src/Installer/redist-installer/redist-installer.csproj | 8 ++------
 src/SourceBuild/content/repo-projects/sdk.proj         | 3 +++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Installer/redist-installer/redist-installer.csproj b/src/Installer/redist-installer/redist-installer.csproj
index 972a0838cc9a..210b5205dbb7 100644
--- a/src/Installer/redist-installer/redist-installer.csproj
+++ b/src/Installer/redist-installer/redist-installer.csproj
@@ -19,12 +19,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Layout\redist\redist.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" />
-    <!--
-      These two projects reference assets from multiple architectures, so they can't be built until we have a join point job that can pull assets from multiple legs.
-      https://github.com/dotnet/source-build/issues/4336
-    -->
-    <ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
-    <ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true'" />
+    <ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildPass)' >= '2'" />
+    <ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildPass)' >= '2'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 858678e015ac..75b5634f22de 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -25,6 +25,9 @@
     <BuildArgs>$(BuildArgs) /p:Architecture=$(TargetArchitecture)</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:DOTNET_INSTALL_DIR=$(DotNetRoot)</BuildArgs>
 
+    <!-- Pass through DotNetBuildPass due to conditional behaviour for this project on join points -->
+    <BuildArgs Condition="'$(DotNetBuildPass)' != ''">$(BuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)</BuildArgs>
+
     <BuildArgs Condition="'$(TargetOS)' != 'windows'">$(BuildArgs) /p:AspNetCoreInstallerRid=$(TargetRid)</BuildArgs>
     <!-- sdk always wants to build portable on FreeBSD -->
     <BuildArgs Condition="'$(TargetOS)' == 'freebsd' and '$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) /p:PortableBuild=true</BuildArgs>

From 4daec2ac0dfae4480143c4f10decb3cc6604f403 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Fri, 27 Sep 2024 10:23:34 -0400
Subject: [PATCH 07/11] fix condition maybe

---
 src/Installer/redist-installer/redist-installer.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Installer/redist-installer/redist-installer.csproj b/src/Installer/redist-installer/redist-installer.csproj
index 210b5205dbb7..dcba423856ac 100644
--- a/src/Installer/redist-installer/redist-installer.csproj
+++ b/src/Installer/redist-installer/redist-installer.csproj
@@ -19,8 +19,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Layout\redist\redist.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildPass)' >= '2'" />
-    <ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildPass)' >= '2'" />
+    <ProjectReference Include="projects\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' != ''" />
+    <ProjectReference Include="projects\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' != ''" />
   </ItemGroup>
 
   <ItemGroup>

From 50ad8175ef08972072770cbc0a00488b09513283 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Tue, 1 Oct 2024 13:37:09 -0400
Subject: [PATCH 08/11] pass through build pass in dotnetbuild.props

---
 eng/DotNetBuild.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index efb463b9ea62..716734d48003 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -17,6 +17,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(PgoInstrument)' == 'true'">$(InnerBuildArgs) /p:PgoInstrument=true</InnerBuildArgs>
+      <InnerBuildArgs Condition="'$(DotNetBuildPass)' != ''">$(InnerBuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 

From fef2474a11b285981b3a88e675af1260ae7940b0 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Fri, 4 Oct 2024 10:03:23 -0400
Subject: [PATCH 09/11] oops

---
 src/Installer/redist-installer/projects/SdkResolver.csproj   | 5 -----
 .../redist-installer/projects/VSTemplateLocator.csproj       | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Installer/redist-installer/projects/SdkResolver.csproj b/src/Installer/redist-installer/projects/SdkResolver.csproj
index 5b2373bfe817..234860adc8fa 100644
--- a/src/Installer/redist-installer/projects/SdkResolver.csproj
+++ b/src/Installer/redist-installer/projects/SdkResolver.csproj
@@ -7,11 +7,6 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <!--
-      References assets from multiple architectures and can't be built inside the VMR until we have a join point job
-      that can pull assets from multiple legs. https://github.com/dotnet/source-build/issues/4336
-    -->
-    <ExcludeFromDotNetBuild>true</ExcludeFromDotNetBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
index 892d2acbe03a..9fc714c4a3ae 100644
--- a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
+++ b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
@@ -7,11 +7,6 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <!--
-      References assets from multiple architectures and can't be built inside the VMR until we have a join point job
-      that can pull assets from multiple legs. https://github.com/dotnet/source-build/issues/4336
-    -->
-    <ExcludeFromDotNetBuild>true</ExcludeFromDotNetBuild>
   </PropertyGroup>
 
   <ItemGroup>

From 252851245187f360c9d7539750cffcac9e2c08d3 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Fri, 4 Oct 2024 16:57:08 -0400
Subject: [PATCH 10/11] Re-introduce exclusion but make it conditional

---
 eng/pipelines/templates/stages/vmr-build.yml                    | 2 +-
 src/Installer/redist-installer/projects/SdkResolver.csproj      | 1 +
 .../redist-installer/projects/VSTemplateLocator.csproj          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
index 2d93af132d1b..7fd0577e4ce5 100644
--- a/eng/pipelines/templates/stages/vmr-build.yml
+++ b/eng/pipelines/templates/stages/vmr-build.yml
@@ -1096,4 +1096,4 @@ stages:
             targetOS: windows
             targetArchitecture: arm64
             extraProperties: /p:PgoInstrument=true
-            runTests: false
\ No newline at end of file
+            runTests: false
diff --git a/src/Installer/redist-installer/projects/SdkResolver.csproj b/src/Installer/redist-installer/projects/SdkResolver.csproj
index 234860adc8fa..67ef5f849efb 100644
--- a/src/Installer/redist-installer/projects/SdkResolver.csproj
+++ b/src/Installer/redist-installer/projects/SdkResolver.csproj
@@ -7,6 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != ''">true</ExcludeFromDotNetBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
index 9fc714c4a3ae..4a17caa41d2d 100644
--- a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
+++ b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
@@ -7,6 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
+    <ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != ''">true</ExcludeFromDotNetBuild>
   </PropertyGroup>
 
   <ItemGroup>

From 4f5f0bdf55cbc42d31118a6a0b4490bdd7a26011 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Fri, 4 Oct 2024 16:58:47 -0400
Subject: [PATCH 11/11] invert conditional

---
 src/Installer/redist-installer/projects/SdkResolver.csproj      | 2 +-
 .../redist-installer/projects/VSTemplateLocator.csproj          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Installer/redist-installer/projects/SdkResolver.csproj b/src/Installer/redist-installer/projects/SdkResolver.csproj
index 67ef5f849efb..7ceb0b9b0817 100644
--- a/src/Installer/redist-installer/projects/SdkResolver.csproj
+++ b/src/Installer/redist-installer/projects/SdkResolver.csproj
@@ -7,7 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != ''">true</ExcludeFromDotNetBuild>
+    <ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' == ''">true</ExcludeFromDotNetBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
index 4a17caa41d2d..8119ec06e288 100644
--- a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
+++ b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
@@ -7,7 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != ''">true</ExcludeFromDotNetBuild>
+    <ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' == ''">true</ExcludeFromDotNetBuild>
   </PropertyGroup>
 
   <ItemGroup>