From 0ea4e6c63a02290d21b670f1f4038b3948322ddd Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 6 Feb 2024 16:23:47 -0600
Subject: [PATCH 01/40] Isolate package flow between repos

---
 src/SourceBuild/content/Directory.Build.props |  2 +-
 .../repo-projects/Directory.Build.props       |  1 +
 .../repo-projects/Directory.Build.targets     | 46 +++++++++++++++----
 .../content/repo-projects/aspnetcore.proj     |  9 ++--
 .../content/repo-projects/cecil.proj          |  1 +
 .../repo-projects/command-line-api.proj       |  1 +
 .../repo-projects/deployment-tools.proj       |  3 +-
 .../content/repo-projects/diagnostics.proj    |  1 +
 .../content/repo-projects/dotnet.proj         | 37 ++-------------
 .../content/repo-projects/emsdk.proj          |  1 +
 .../content/repo-projects/format.proj         |  6 +++
 .../content/repo-projects/fsharp.proj         |  6 ++-
 .../repo-projects/installer-deps.props        | 24 ++++++++++
 .../content/repo-projects/installer.proj      | 18 ++------
 .../content/repo-projects/msbuild.proj        |  3 +-
 .../content/repo-projects/nuget-client.proj   |  2 +-
 .../repo-projects/package-source-build.proj   | 34 +++++++++++---
 .../content/repo-projects/razor.proj          |  3 +-
 .../repo-projects/roslyn-analyzers.proj       |  4 +-
 .../content/repo-projects/roslyn.proj         |  3 +-
 .../content/repo-projects/runtime.proj        |  3 +-
 .../content/repo-projects/scenario-tests.proj |  3 +-
 .../content/repo-projects/sdk.proj            | 21 ++++++---
 .../repo-projects/source-build-externals.proj |  5 ++
 .../content/repo-projects/sourcelink.proj     |  1 +
 .../content/repo-projects/symreader.proj      |  1 +
 .../content/repo-projects/templating.proj     |  1 +
 .../content/repo-projects/test-templates.proj |  2 +-
 .../content/repo-projects/vstest.proj         |  1 +
 29 files changed, 156 insertions(+), 87 deletions(-)
 create mode 100644 src/SourceBuild/content/repo-projects/installer-deps.props

diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
index 2ab3da9ec3c9..6d2e6bcc9ec3 100644
--- a/src/SourceBuild/content/Directory.Build.props
+++ b/src/SourceBuild/content/Directory.Build.props
@@ -158,7 +158,7 @@
     <SharedIntermediateOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(TargetArchitecture)', '$(Configuration)'))</SharedIntermediateOutputPath>
 
     <SourceBuiltBlobFeedDir>$([MSBuild]::NormalizeDirectory('$(SharedIntermediateOutputPath)', 'blob-feed'))</SourceBuiltBlobFeedDir>
-    <SourceBuiltPackagesPath>$([MSBuild]::NormalizeDirectory('$(SourceBuiltBlobFeedDir)', 'packages'))</SourceBuiltPackagesPath>
+    <SourceBuiltBasePackagesPath>$([MSBuild]::NormalizeDirectory('$(SourceBuiltBlobFeedDir)', 'packages'))</SourceBuiltBasePackagesPath>
     <SourceBuiltAssetsDir>$([MSBuild]::NormalizeDirectory('$(SourceBuiltBlobFeedDir)', 'assets'))</SourceBuiltAssetsDir>
 
     <PrebuiltPackagesPath>$([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'prebuilt'))</PrebuiltPackagesPath>
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index 7c9ac1dd64ba..e0cab1d7a19e 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -33,6 +33,7 @@
     <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
 
     <SourceBuiltSdksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'source-built-sdks'))</SourceBuiltSdksDir>
+    <SourceBuiltPackagesPath>$(SourceBuiltBasePackagesPath)$(RepositoryName)/</SourceBuiltPackagesPath>
 
     <!-- Set the bootstrap version to the VMR's version if empty. (no bootstrap set). -->
     <ArcadeBootstrapVersion>$([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)'))</ArcadeBootstrapVersion>
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index a06ced3c0801..3455279d8c0a 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -54,6 +54,17 @@
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WritePackageVersionsProps" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WritePackageUsageData" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteUsageReports" />
+  
+  <Target Name="GetRepositoryReferenceInfo">
+    <ItemGroup>
+      <RepositoryReferenceInfo Include="@(RepositoryReference)">
+        <SourceName>source-built-%(Identity)</SourceName>
+        <PackagesPath>$(SourceBuiltBasePackagesPath)%(Identity)/</PackagesPath>
+      </RepositoryReferenceInfo>
+      <DependentRepoSourceName Include="@(RepositoryReferenceInfo->'%(SourceName)')" />
+      <DependentRepoPackageFile Include="%(RepositoryReferenceInfo.PackagesPath)**" />
+    </ItemGroup>
+  </Target>
 
   <Target Name="CopyNuGetConfig"
           Condition="'$(NuGetConfigFile)' != ''"
@@ -70,24 +81,32 @@
   </Target>
 
   <Target Name="UpdateNuGetConfig"
-          DependsOnTargets="CopyNuGetConfig"
+          DependsOnTargets="CopyNuGetConfig;GetRepositoryReferenceInfo"
           Condition="'$(NuGetConfigFile)' != ''"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete">
     <PropertyGroup>
-      <SourceBuiltNuGetSourceName>source-built</SourceBuiltNuGetSourceName>
       <ExtraSourcesNuGetSourceName>ExtraSources</ExtraSourcesNuGetSourceName>
-      <SourceBuildSources>$(SourceBuiltNuGetSourceName)</SourceBuildSources>
-      <SourceBuildSources Condition="'$(ExtraRestoreSourcePath)' != ''">$(SourceBuildSources);$(ExtraSourcesNuGetSourceName)</SourceBuildSources>
     </PropertyGroup>
   
     <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
       <PrebuiltNuGetSourceName>prebuilt</PrebuiltNuGetSourceName>
       <PreviouslySourceBuiltNuGetSourceName>previously-source-built</PreviouslySourceBuiltNuGetSourceName>
       <ReferencePackagesNuGetSourceName>reference-packages</ReferencePackagesNuGetSourceName>
-      <SourceBuildSources>$(SourceBuildSources);$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName)</SourceBuildSources>
     </PropertyGroup>
 
+    <ItemGroup>
+      <_CommonSourceBuildSources Include="@(DependentRepoSourceName)" />
+      <_CommonSourceBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <SourceBuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'"
+                          Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName);@(_CommonSourceBuildSources)" />
+      <SourceBuildSources Condition="'$(DotNetBuildSourceOnly)' != 'true'"
+                          Include="@(_CommonSourceBuildSources)" />
+    </ItemGroup>
+    
     <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
       <!-- When not building source-only, repositories lagging behind on the .NET SDK (e.g. tooling repos)
           that need to utilize a VS-aligned version for development purposes may not have the latest product
@@ -126,8 +145,9 @@
                             Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
-                            SourceName="$(SourceBuiltNuGetSourceName)"
-                            SourcePath="$(SourceBuiltPackagesPath)" />
+                            SourceName="%(RepositoryReferenceInfo.SourceName)"
+                            SourcePath="%(RepositoryReferenceInfo.PackagesPath)"
+                            Condition=" '@(RepositoryReferenceInfo)' != '' " />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
                             SourceName="$(ExtraSourcesNuGetSourceName)"
@@ -143,12 +163,16 @@
     <UpdateNuGetConfigPackageSourcesMappings
       NuGetConfigFile="$(NuGetConfigFile)"
       BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
-      SourceBuildSources="$(SourceBuildSources)" />
+      SourceBuildSources="@(SourceBuildSources)" />
 
     <MakeDir Directories="$(BaseIntermediateOutputPath)" />
     <Touch Files="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete" AlwaysCreate="true">
       <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
     </Touch>
+
+    <ItemGroup>
+      <EmbedInBinlog Include="$(NuGetConfigFile)" />
+  </ItemGroup>
   </Target>
 
   <!-- Update the SDK version in the repo's global.json file.
@@ -193,11 +217,13 @@
   <!-- Before a repository builds, set up the version property files that override the repo's defaults.
        There are 3 files generated -->
   <Target Name="CreateBuildInputProps"
+          DependsOnTargets="GetRepositoryReferenceInfo"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)CreateBuildInputProps.complete">
     <ItemGroup>
-      <_CurrentSourceBuiltPackages Include="$(SourceBuiltPackagesPath)*.nupkg"
-                                   Exclude="$(SourceBuiltPackagesPath)*.symbols.nupkg" />
+      <!-- Collect all the NuGet packages from dependent repos except for the symbols -->
+      <_CurrentSourceBuiltPackages Include="@(DependentRepoPackageFile)"
+                                   Condition="'%(Extension)' == '.nupkg' and !$([System.String]::new('%(Filename)').EndsWith('.symbols')) " />
       <_PreviouslyBuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)*.nupkg" />
     </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index be3d4294cead..c0b219d8a6c7 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -23,11 +23,12 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="roslyn-analyzers" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="symreader" />
+    <RepositoryReference Include="xdt" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/cecil.proj b/src/SourceBuild/content/repo-projects/cecil.proj
index c4068fe7b99c..563e7998b4b3 100644
--- a/src/SourceBuild/content/repo-projects/cecil.proj
+++ b/src/SourceBuild/content/repo-projects/cecil.proj
@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/command-line-api.proj b/src/SourceBuild/content/repo-projects/command-line-api.proj
index a16b2412a19b..198cebc2b07d 100644
--- a/src/SourceBuild/content/repo-projects/command-line-api.proj
+++ b/src/SourceBuild/content/repo-projects/command-line-api.proj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/deployment-tools.proj b/src/SourceBuild/content/repo-projects/deployment-tools.proj
index 8ef3a8a5a61f..e25768a77c40 100644
--- a/src/SourceBuild/content/repo-projects/deployment-tools.proj
+++ b/src/SourceBuild/content/repo-projects/deployment-tools.proj
@@ -2,7 +2,8 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/diagnostics.proj b/src/SourceBuild/content/repo-projects/diagnostics.proj
index c4068fe7b99c..563e7998b4b3 100644
--- a/src/SourceBuild/content/repo-projects/diagnostics.proj
+++ b/src/SourceBuild/content/repo-projects/diagnostics.proj
@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 0de74d67944c..4137fd8ca6e0 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -10,43 +10,12 @@
        - We need an "empty" build after the last real repo for prebuilt detection to work - this is that file.
        - If we have a repo that is not in sdk's dependency tree, we can still build it by including it here.  -->
 
-  <ItemGroup>
-    <!-- Toolsets -->
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="arcade" />
+  <!-- This import can be removed when https://github.com/dotnet/source-build/issues/4017 is resolved -->
+  <Import Project="$(MSBuildThisFileDirectory)installer-deps.props" />
 
-    <!-- Product Repos -->
-    <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="sourcelink" />
-    <RepositoryReference Include="diagnostics" />
-    <RepositoryReference Include="emsdk" />
-    <RepositoryReference Include="cecil" />
-    <RepositoryReference Include="symreader" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
-    <RepositoryReference Include="xdt" />
-    <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="roslyn-analyzers" />
-    <RepositoryReference Include="aspnetcore" />
-    <RepositoryReference Include="razor" />
-    <RepositoryReference Include="deployment-tools" />
-    <RepositoryReference Include="format" />
-    <RepositoryReference Include="nuget-client" />
-    <RepositoryReference Include="templating" />
-    <RepositoryReference Include="test-templates" />
-    <RepositoryReference Include="fsharp" />
-    <RepositoryReference Include="vstest" />
-    <RepositoryReference Include="sdk" />
-    <RepositoryReference Include="aspire" />
+  <ItemGroup>
     <RepositoryReference Include="installer" />
-
-    <!-- Package source-build artifacts -->
     <RepositoryReference Include="package-source-build" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-
-    <!-- Testing. -->
-    <RepositoryReference Include="scenario-tests" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/emsdk.proj b/src/SourceBuild/content/repo-projects/emsdk.proj
index df9c063263e6..65f811a0bcac 100644
--- a/src/SourceBuild/content/repo-projects/emsdk.proj
+++ b/src/SourceBuild/content/repo-projects/emsdk.proj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
index 9418953b7e8d..12e84f7a56a0 100644
--- a/src/SourceBuild/content/repo-projects/format.proj
+++ b/src/SourceBuild/content/repo-projects/format.proj
@@ -2,9 +2,15 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="command-line-api" />
+    <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="roslyn-analyzers" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="sourcelink" />
+    <RepositoryReference Include="symreader" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index bac7243b5321..cc0bfde7289d 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -20,8 +20,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="msbuild" /> 
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="sourcelink" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/installer-deps.props b/src/SourceBuild/content/repo-projects/installer-deps.props
new file mode 100644
index 000000000000..2dbf035e6b47
--- /dev/null
+++ b/src/SourceBuild/content/repo-projects/installer-deps.props
@@ -0,0 +1,24 @@
+<Project>
+
+  <ItemGroup>
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="aspire" />
+    <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="command-line-api" />
+    <RepositoryReference Include="deployment-tools" />
+    <RepositoryReference Include="emsdk" />
+    <RepositoryReference Include="fsharp" />
+    <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="nuget-client" />
+    <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="scenario-tests" />
+    <RepositoryReference Include="sdk" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="symreader" />
+    <RepositoryReference Include="test-templates" />
+    <RepositoryReference Include="vstest" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index bcc0fe5f7534..bc65393006e9 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -10,6 +10,8 @@
 
     <!-- Restore and Build actions are already passed in by the root script. -->
     <BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
+    
+    <SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
 
     <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)runtime-id $(TargetRid)</BuildArgs>
 
@@ -34,20 +36,8 @@
     <BuildArgs>$(BuildArgs) /p:UsePortableLinuxSharedFramework=false</BuildArgs>
   </PropertyGroup>
 
-  <ItemGroup>
-    <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="aspnetcore" />
-    <RepositoryReference Include="emsdk" />
-    <RepositoryReference Include="fsharp" />
-    <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="nuget-client" />
-    <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="sdk" />
-    <RepositoryReference Include="test-templates" />
-    <RepositoryReference Include="vstest" />
-  </ItemGroup>
+  <!-- Import RepositoryReferences of installer from a shared file -->
+  <Import Project="$(MSBuildThisFileDirectory)installer-deps.props" />
 
   <!--
     If we have authentication, keep the templating internal feed (if one exists) to acquire the
diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index e54e9318f2e9..91132e58da51 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -12,8 +12,9 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj
index a0797bcb8ab0..37ab58a63d6f 100644
--- a/src/SourceBuild/content/repo-projects/nuget-client.proj
+++ b/src/SourceBuild/content/repo-projects/nuget-client.proj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="xdt" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index d95a7336f926..21606513ba05 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -7,6 +7,8 @@
     <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)installer-deps.props" />
+
   <ItemGroup>
     <RepositoryReference Include="installer" />
   </ItemGroup>
@@ -14,11 +16,9 @@
   <Target Name="CustomRepoBuild"
           AfterTargets="RepoBuild"
           DependsOnTargets="CreateBuildInputProps;DetermineSourceBuiltSdkVersion">
-    <!-- Copy PVP to packages dir in order to package them together -->
-    <Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)" DestinationFiles="$(SourceBuiltPackagesPath)PackageVersions.props" />
-
     <PropertyGroup>
-      <SourceBuildReferencePackagesDestination>$(SourceBuiltPackagesPath)SourceBuildReferencePackages/</SourceBuildReferencePackagesDestination>
+      <SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
+      <SourceBuildReferencePackagesDestination>$(SourceBuiltPackagesPath)$(SourceBuildReferencePackagesDestinationDirName)/</SourceBuildReferencePackagesDestination>
     </PropertyGroup>
 
     <ItemGroup>
@@ -47,10 +47,32 @@
       Overwrite="true" />
 
     <MakeDir Directories="$(SharedOutputPath)" />
-    <Exec Command="tar --numeric-owner --exclude='Microsoft.SourceBuild.Intermediate.*.nupkg' -czf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *.nupkg *.props SourceBuildReferencePackages/"
-          WorkingDirectory="$(SourceBuiltPackagesPath)" />
+
+    <ItemGroup>
+      <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(SourceBuiltBasePackagesPath)))"
+                    Exclude="$(SourceBuiltBasePackagesPath)package-source-build" />
+    </ItemGroup>
+
+    <!-- Create a layout directory for the files that are to be included in the artifacts tarball. Since there are a large number of files, this will use symlinks
+         instead of copying files to make this execute quickly. -->
+    <PropertyGroup>
+      <_SourceBuiltLayoutDir>$(BaseIntermediateOutputPath)artifacts-layout/</_SourceBuiltLayoutDir>
+    </PropertyGroup>
+    <MakeDir Directories="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
+    <Exec Command="ln -sf %(_AllRepoDirs.Identity)/* $(_SourceBuiltLayoutDir)"
+          Condition="$([System.IO.Directory]::GetFiles('%(_AllRepoDirs.Identity)')) != ''" />
+    <Exec Command="ln -sf $(SourceBuiltPackagesPath)$(SourceBuiltVersionFileName) $(_SourceBuiltLayoutDir)" />
+    <Exec Command="ln -sf $(CurrentSourceBuiltPackageVersionPropsPath) $(_SourceBuiltLayoutDir)PackageVersions.props" />
+    <Exec Command="ln -sf $(SourceBuildReferencePackagesDestination)* $(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
+
+    <Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"
+          WorkingDirectory="$(_SourceBuiltLayoutDir)" />
 
     <Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
   </Target>
 
+  <ItemGroup>
+    <RepositoryReference Include="installer" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj
index 800961adeb73..d95de454c619 100644
--- a/src/SourceBuild/content/repo-projects/razor.proj
+++ b/src/SourceBuild/content/repo-projects/razor.proj
@@ -2,8 +2,9 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
index 23819f4994d4..aa624342037a 100644
--- a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj
index 68d4995140eb..a1c47c04c70d 100644
--- a/src/SourceBuild/content/repo-projects/roslyn.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn.proj
@@ -30,8 +30,9 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index 35bbd9b03822..a056276a7f29 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -31,8 +31,9 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="cecil" />
-    <RepositoryReference Include="symreader" />
+    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 25c6f1b9cd57..b71f89c20748 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="arcade" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 69c6a2826dc4..b22bcb759378 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -14,17 +14,26 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="command-line-api" />
+    <RepositoryReference Include="deployment-tools" />
+    <RepositoryReference Include="emsdk" />
+    <RepositoryReference Include="format" />
+    <RepositoryReference Include="fsharp" />
     <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="nuget-client" />
+    <RepositoryReference Include="razor" />
+    <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="roslyn-analyzers" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="sourcelink" />
+    <RepositoryReference Include="symreader" />
+    <RepositoryReference Include="templating" />
     <RepositoryReference Include="vstest" />
-    <RepositoryReference Include="fsharp" />
-    <RepositoryReference Include="format" />
-    <RepositoryReference Include="deployment-tools" />
-    <RepositoryReference Include="razor" />
     <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
+    <RepositoryReference Include="xdt" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj
index a391c4cd6689..c86415ade2f4 100644
--- a/src/SourceBuild/content/repo-projects/source-build-externals.proj
+++ b/src/SourceBuild/content/repo-projects/source-build-externals.proj
@@ -10,4 +10,9 @@
     <UseInnerClone>true</UseInnerClone>
   </PropertyGroup>
 
+  <ItemGroup>
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="source-build-reference-packages" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj
index 87026a8e9930..1eb75e01a1be 100644
--- a/src/SourceBuild/content/repo-projects/sourcelink.proj
+++ b/src/SourceBuild/content/repo-projects/sourcelink.proj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj
index c4068fe7b99c..563e7998b4b3 100644
--- a/src/SourceBuild/content/repo-projects/symreader.proj
+++ b/src/SourceBuild/content/repo-projects/symreader.proj
@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj
index 999d5a167488..6c108ed896b9 100644
--- a/src/SourceBuild/content/repo-projects/templating.proj
+++ b/src/SourceBuild/content/repo-projects/templating.proj
@@ -11,6 +11,7 @@
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj
index a272afd4f160..f3957fa25f92 100644
--- a/src/SourceBuild/content/repo-projects/test-templates.proj
+++ b/src/SourceBuild/content/repo-projects/test-templates.proj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="templating" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj
index c228f58a635b..39891d188188 100644
--- a/src/SourceBuild/content/repo-projects/vstest.proj
+++ b/src/SourceBuild/content/repo-projects/vstest.proj
@@ -11,6 +11,7 @@
     <RepositoryReference Include="diagnostics" />
     <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
 </Project>

From 3878626094371851cb220b836c647a77c3e32e9f Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 12 Feb 2024 14:35:27 -0600
Subject: [PATCH 02/40] Compute transitive dependencies

---
 .../repo-projects/Directory.Build.targets     | 30 ++++---------------
 .../content/repo-projects/aspnetcore.proj     |  2 --
 .../content/repo-projects/dotnet.proj         |  3 --
 .../content/repo-projects/format.proj         |  4 ---
 .../content/repo-projects/fsharp.proj         |  2 --
 .../content/repo-projects/installer.proj      | 22 ++++++++++++--
 .../content/repo-projects/msbuild.proj        |  2 --
 .../repo-projects/package-source-build.proj   |  2 --
 .../content/repo-projects/razor.proj          |  2 --
 .../content/repo-projects/roslyn.proj         |  2 --
 .../content/repo-projects/runtime.proj        |  1 -
 .../content/repo-projects/scenario-tests.proj |  1 -
 .../content/repo-projects/sdk.proj            | 10 -------
 .../content/repo-projects/templating.proj     |  1 -
 .../content/repo-projects/vstest.proj         |  1 -
 .../content/repo-projects/winforms.proj       |  1 -
 .../content/repo-projects/wpf.proj            |  1 -
 17 files changed, 26 insertions(+), 61 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 3455279d8c0a..cd93c61f5cb1 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -25,26 +25,6 @@
     <RepoManifestFile>$([MSBuild]::NormalizePath('$(ProjectDirectory)', 'artifacts', 'RepoManifest.xml'))</RepoManifestFile>
   </PropertyGroup>
 
-  <!-- Exclude repositories that currently don't build when not building source-only. -->
-  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <RepositoryReference Remove="roslyn" />
-    <RepositoryReference Remove="wpf" />
-    <RepositoryReference Remove="msbuild" />
-    <RepositoryReference Remove="roslyn-analyzers" />
-    <RepositoryReference Remove="aspnetcore" />
-    <RepositoryReference Remove="razor" />
-    <RepositoryReference Remove="deployment-tools" />
-    <RepositoryReference Remove="format" />
-    <RepositoryReference Remove="nuget-client" />
-    <RepositoryReference Remove="templating" />
-    <RepositoryReference Remove="test-templates" />
-    <RepositoryReference Remove="fsharp" />
-    <RepositoryReference Remove="vstest" />
-    <RepositoryReference Remove="sdk" />
-    <RepositoryReference Remove="aspire" />
-    <RepositoryReference Remove="installer" />
-  </ItemGroup>
-
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="AddSourceToNuGetConfig" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReadNuGetPackageInfos" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="RemoveInternetSourcesFromNuGetConfig" />
@@ -55,9 +35,10 @@
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WritePackageUsageData" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteUsageReports" />
   
-  <Target Name="GetRepositoryReferenceInfo">
+  <Target Name="GetRepositoryReferenceInfo"
+          DependsOnTargets="GetTransitiveRepositoryReferences">
     <ItemGroup>
-      <RepositoryReferenceInfo Include="@(RepositoryReference)">
+      <RepositoryReferenceInfo Include="@(TransitiveRepositoryReference)">
         <SourceName>source-built-%(Identity)</SourceName>
         <PackagesPath>$(SourceBuiltBasePackagesPath)%(Identity)/</PackagesPath>
       </RepositoryReferenceInfo>
@@ -286,11 +267,12 @@
 
   <!-- SkipRepoReferences is a developer innerloop switch to skip building dependencies. -->
   <Target Name="BuildRepoReferences"
+          DependsOnTargets="GetTransitiveRepositoryReferences"
           Condition="'@(RepositoryReference)' != '' and '$(SkipRepoReferences)' != 'true'">
-    <Message Importance="High" Text="Building dependencies [@(RepositoryReference)] needed by '$(RepositoryName)'." />
+    <Message Importance="High" Text="Building dependencies [@(TransitiveRepositoryReference)] needed by '$(RepositoryName)'." />
 
     <ItemGroup>
-      <_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" />
+      <_DependentProject Include="@(TransitiveRepositoryReference -> '%(Identity).proj')" />
     </ItemGroup>
 
     <MSBuild Projects="@(_DependentProject)"
diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index c0b219d8a6c7..1dae63bfe628 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -22,9 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="symreader" />
diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 4137fd8ca6e0..94891c25ce0e 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -10,9 +10,6 @@
        - We need an "empty" build after the last real repo for prebuilt detection to work - this is that file.
        - If we have a repo that is not in sdk's dependency tree, we can still build it by including it here.  -->
 
-  <!-- This import can be removed when https://github.com/dotnet/source-build/issues/4017 is resolved -->
-  <Import Project="$(MSBuildThisFileDirectory)installer-deps.props" />
-
   <ItemGroup>
     <RepositoryReference Include="installer" />
     <RepositoryReference Include="package-source-build" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
index 12e84f7a56a0..efffabcb3b02 100644
--- a/src/SourceBuild/content/repo-projects/format.proj
+++ b/src/SourceBuild/content/repo-projects/format.proj
@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="roslyn-analyzers" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="sourcelink" />
diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index cc0bfde7289d..dd18fea7fc8a 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -19,9 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="sourcelink" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index bc65393006e9..45075464d4bf 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -36,8 +36,26 @@
     <BuildArgs>$(BuildArgs) /p:UsePortableLinuxSharedFramework=false</BuildArgs>
   </PropertyGroup>
 
-  <!-- Import RepositoryReferences of installer from a shared file -->
-  <Import Project="$(MSBuildThisFileDirectory)installer-deps.props" />
+  <ItemGroup>
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="aspire" />
+    <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="command-line-api" />
+    <RepositoryReference Include="deployment-tools" />
+    <RepositoryReference Include="emsdk" />
+    <RepositoryReference Include="fsharp" />
+    <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="nuget-client" />
+    <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="scenario-tests" />
+    <RepositoryReference Include="sdk" />
+    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="symreader" />
+    <RepositoryReference Include="test-templates" />
+    <RepositoryReference Include="vstest" />
+  </ItemGroup>
 
   <!--
     If we have authentication, keep the templating internal feed (if one exists) to acquire the
diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index 91132e58da51..c040c63f1cca 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -11,9 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 21606513ba05..69a9c0630504 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -7,8 +7,6 @@
     <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)installer-deps.props" />
-
   <ItemGroup>
     <RepositoryReference Include="installer" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj
index d95de454c619..74ce7402d5e1 100644
--- a/src/SourceBuild/content/repo-projects/razor.proj
+++ b/src/SourceBuild/content/repo-projects/razor.proj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="aspnetcore" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj
index a1c47c04c70d..34ad46b9e9d4 100644
--- a/src/SourceBuild/content/repo-projects/roslyn.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn.proj
@@ -28,8 +28,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index a056276a7f29..f13342176063 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -29,7 +29,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="cecil" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index b71f89c20748..2a163ae46cb7 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index b22bcb759378..4dc18056efb8 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -13,23 +13,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="aspnetcore" />
-    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="deployment-tools" />
     <RepositoryReference Include="emsdk" />
     <RepositoryReference Include="format" />
     <RepositoryReference Include="fsharp" />
-    <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="razor" />
-    <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="roslyn-analyzers" />
-    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="sourcelink" />
-    <RepositoryReference Include="symreader" />
     <RepositoryReference Include="templating" />
     <RepositoryReference Include="vstest" />
     <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj
index 6c108ed896b9..8b1d44af6ca1 100644
--- a/src/SourceBuild/content/repo-projects/templating.proj
+++ b/src/SourceBuild/content/repo-projects/templating.proj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj
index 39891d188188..6495f20b7290 100644
--- a/src/SourceBuild/content/repo-projects/vstest.proj
+++ b/src/SourceBuild/content/repo-projects/vstest.proj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="diagnostics" />
     <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/winforms.proj b/src/SourceBuild/content/repo-projects/winforms.proj
index 489f0055d7c0..05371f56f51c 100644
--- a/src/SourceBuild/content/repo-projects/winforms.proj
+++ b/src/SourceBuild/content/repo-projects/winforms.proj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="runtime" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/wpf.proj b/src/SourceBuild/content/repo-projects/wpf.proj
index 142161497870..2020adf681bd 100644
--- a/src/SourceBuild/content/repo-projects/wpf.proj
+++ b/src/SourceBuild/content/repo-projects/wpf.proj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="winforms" />
   </ItemGroup>
 

From 823a8aa54b7338d9ab365061f43e0eb48c893adc Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 12 Feb 2024 14:36:19 -0600
Subject: [PATCH 03/40] Swap dep graph visualizer with a simple YAML-based
 representation

---
 .../generate-graphviz/generate-graphviz.proj  | 49 ------------
 .../repo-projects/Directory.Build.targets     | 79 +++++++++++++++++++
 2 files changed, 79 insertions(+), 49 deletions(-)
 delete mode 100644 src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj

diff --git a/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj b/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj
deleted file mode 100644
index b35a7aa50637..000000000000
--- a/src/SourceBuild/content/eng/tools/generate-graphviz/generate-graphviz.proj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets">
-
-  <PropertyGroup>
-    <TargetFramework>$(NetCurrent)</TargetFramework>
-  </PropertyGroup>
-
-  <Target Name="GenerateGraphViz"
-          AfterTargets="Build">
-    <ItemGroup>
-      <RepoProject Include="$(RepoProjectsDir)*.proj"
-                   Exclude="$(RepoProjectsDir)dotnet.proj;
-                            $(RepoProjectsDir)package-source-build.proj" />
-    </ItemGroup>
-
-    <MSBuild Projects="@(RepoProject)"
-             Targets="GetRepositoryReferences">
-      <Output TaskParameter="TargetOutputs" ItemName="RepoReference" />
-    </MSBuild>
-
-    <ItemGroup>
-      <RepoLink Include="%(RepoReference.MSBuildSourceProjectFile)" SourceRepo="%(RepoReference.Identity)" />
-      <RepoLink TargetRepo="%(Filename)" />
-      <RepoLink Text="&quot;%(SourceRepo)&quot; -> &quot;%(TargetRepo)&quot;" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <GraphVizFile>$(BaseIntermediateOutputPath)graphviz.dot</GraphVizFile>
-      <GraphVizPngFile>$(BaseIntermediateOutputPath)graphviz.png</GraphVizPngFile>
-      <GraphVizContent>digraph {
-graph [ dpi = 150 ]
-@(RepoLink -> '%(Text)')
-}</GraphVizContent>
-    </PropertyGroup>
-
-    <WriteLinesToFile Lines="$(GraphVizContent)"
-                      File="$(GraphVizFile)"
-                      Overwrite="True" />
-
-    <Message Text="$(MSBuildProjectName) -> $(GraphVizFile)" Importance="High" />
-
-    <Exec Command="$([MSBuild]::NormalizePath('$(GraphVizDir)', 'dot')) $(GraphVizFile) -Tpng:cairo -o $(GraphVizPngFile)"
-          Condition="'$(GraphVizDir)' != ''" />
-
-    <Message Text="$(MSBuildProjectName) -> $(GraphVizPngFile)"
-             Importance="High"
-             Condition="'$(GraphVizDir)' != ''" />
-  </Target>
-
-</Project>
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index cd93c61f5cb1..99b30beb7614 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -798,4 +798,83 @@
   <Target Name="GetProjectDirectory" Outputs="$(ProjectDirectory)" />
   <Target Name="GetRepositoryReferences" Outputs="@(RepositoryReference)" />
 
+  <!-- Returns the repository references of this project and all the projects this project references, recursively -->
+  <Target Name="GetTransitiveRepositoryReferences" Outputs="@(TransitiveRepositoryReference)">
+    <ItemGroup>
+      <_TransitiveRepositoryReference Include="@(RepositoryReference)" />
+    </ItemGroup>
+
+    <MSBuild Projects="@(RepositoryReference->'%(Identity).proj')"
+             Targets="GetTransitiveRepositoryReferences">
+      <Output TaskParameter="TargetOutputs" ItemName="_DependencyTransitiveRepositoryReference" />
+    </MSBuild>
+
+    <!-- When items are transferred between projects, they get metadata indicating their source (e.g. MSBuildSourceProjectFile).
+         This is problematic because it causes introduces distinctness on the items. For example, an arcade RepositoryReference
+         that comes from both msbuild and source-build-externals will be treated as two separate items. But we only want one arcade
+         reference. To prevent this from happening, we need to remove the extra metadata so the two references can be seen as duplicates. -->
+    <ItemGroup>
+      <_TransitiveRepositoryReference Include="@(_DependencyTransitiveRepositoryReference)"
+                                      RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" />
+      <TransitiveRepositoryReference Include="@(_TransitiveRepositoryReference)" KeepDuplicates="false" />
+    </ItemGroup>
+
+    <!-- Exclude repositories that currently don't build when not building source-only. -->
+    <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+      <TransitiveRepositoryReference Remove="roslyn" />
+      <TransitiveRepositoryReference Remove="wpf" />
+      <TransitiveRepositoryReference Remove="msbuild" />
+      <TransitiveRepositoryReference Remove="roslyn-analyzers" />
+      <TransitiveRepositoryReference Remove="aspnetcore" />
+      <TransitiveRepositoryReference Remove="razor" />
+      <TransitiveRepositoryReference Remove="deployment-tools" />
+      <TransitiveRepositoryReference Remove="format" />
+      <TransitiveRepositoryReference Remove="nuget-client" />
+      <TransitiveRepositoryReference Remove="templating" />
+      <TransitiveRepositoryReference Remove="test-templates" />
+      <TransitiveRepositoryReference Remove="fsharp" />
+      <TransitiveRepositoryReference Remove="vstest" />
+      <TransitiveRepositoryReference Remove="sdk" />
+      <TransitiveRepositoryReference Remove="aspire" />
+      <TransitiveRepositoryReference Remove="installer" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Outputs a dependency graph of the repos, in YAML form, to the console. -->
+  <Target Name="ShowDependencyGraph">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+             Targets="GetDependencyGraphString"
+             Properties="DependencyGraphIndent=">
+      <Output TaskParameter="TargetOutputs" PropertyName="DependencyGraphString" />
+    </MSBuild>
+
+    <!-- Replace the '_' placeholder with spaces -->
+    <Message Importance="High" Text="$(DependencyGraphString.Replace('_', ' ').Trim())" />
+  </Target>
+
+  <!-- Recursively walks the repo dependency graph gathering each repo's dependencies which are returned as a YAML string representation -->
+  <Target Name="GetDependencyGraphString"
+          DependsOnTargets="GetTransitiveRepositoryReferences"
+          Outputs="$(DependencyGraphString)">
+    <PropertyGroup>
+      <!-- Each step deeper in the graph builds up the indentation used for the YAML representation.
+           Use '_' as a placeholder for the space ' ' character since trailing spaces aren't handled well as property values. -->
+      <_NextIndent>$(DependencyGraphIndent)__</_NextIndent>
+    </PropertyGroup>
+    
+    <!-- For each of the current project's direct repo dependencies, recursively call the target to get each of there dependency graphs -->
+    <MSBuild Projects="@(RepositoryReference->'%(Identity).proj')"
+             Targets="GetDependencyGraphString"
+             Properties="DependencyGraphIndent=$(_NextIndent)">
+      <Output TaskParameter="TargetOutputs" ItemName="_DependencyGraphString" />
+    </MSBuild>
+
+    <!-- Append all the separate dependency graph snippets together -->
+    <PropertyGroup>
+      <!-- Ensure the item `;` separators are removed from the the target output -->
+      <_DependencyGraphString>@(_DependencyGraphString, '')</_DependencyGraphString>
+      <_LineBreak>%0a</_LineBreak>
+      <DependencyGraphString>$(DependencyGraphIndent)-_$(RepositoryName)$(_LineBreak)$(_DependencyGraphString)</DependencyGraphString>
+    </PropertyGroup>
+  </Target>
 </Project>

From edebea74ce5d93ed82140d750bc729322b03d233 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 12 Feb 2024 14:54:58 -0600
Subject: [PATCH 04/40] Fix dependency on scenario-tests

---
 src/SourceBuild/content/repo-projects/dotnet.proj               | 1 +
 src/SourceBuild/content/repo-projects/installer.proj            | 1 -
 src/SourceBuild/content/repo-projects/package-source-build.proj | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 94891c25ce0e..732eb34f9932 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <RepositoryReference Include="installer" />
     <RepositoryReference Include="package-source-build" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="scenario-tests" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index 45075464d4bf..d1b3dacf3c71 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -48,7 +48,6 @@
     <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="scenario-tests" />
     <RepositoryReference Include="sdk" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 69a9c0630504..a329557630dc 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -71,6 +71,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="installer" />
+    <RepositoryReference Include="scenario-tests" />
   </ItemGroup>
 
 </Project>

From 5b8a5a232b1a6d26636cbe504abaeb45a8dca7c9 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 12 Feb 2024 14:55:31 -0600
Subject: [PATCH 05/40] Remove duplicate installer dependency

---
 .../content/repo-projects/package-source-build.proj           | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index a329557630dc..c54e6b327906 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -7,10 +7,6 @@
     <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
   </PropertyGroup>
 
-  <ItemGroup>
-    <RepositoryReference Include="installer" />
-  </ItemGroup>
-
   <Target Name="CustomRepoBuild"
           AfterTargets="RepoBuild"
           DependsOnTargets="CreateBuildInputProps;DetermineSourceBuiltSdkVersion">

From 566f613417d62293ab682115143de735661e9648 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Mon, 12 Feb 2024 15:49:02 -0600
Subject: [PATCH 06/40] Delete obsolete installer-deps

---
 .../repo-projects/installer-deps.props        | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 src/SourceBuild/content/repo-projects/installer-deps.props

diff --git a/src/SourceBuild/content/repo-projects/installer-deps.props b/src/SourceBuild/content/repo-projects/installer-deps.props
deleted file mode 100644
index 2dbf035e6b47..000000000000
--- a/src/SourceBuild/content/repo-projects/installer-deps.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project>
-
-  <ItemGroup>
-    <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="aspire" />
-    <RepositoryReference Include="aspnetcore" />
-    <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="deployment-tools" />
-    <RepositoryReference Include="emsdk" />
-    <RepositoryReference Include="fsharp" />
-    <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="nuget-client" />
-    <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="scenario-tests" />
-    <RepositoryReference Include="sdk" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="symreader" />
-    <RepositoryReference Include="test-templates" />
-    <RepositoryReference Include="vstest" />
-  </ItemGroup>
-
-</Project>

From 8ce569e8889352e040203353af4db43a9f457e5b Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 13 Feb 2024 12:38:50 -0600
Subject: [PATCH 07/40] Add conditional deps specific to source build

---
 src/SourceBuild/content/repo-projects/aspnetcore.proj   | 2 +-
 src/SourceBuild/content/repo-projects/format.proj       | 5 ++---
 src/SourceBuild/content/repo-projects/fsharp.proj       | 1 -
 src/SourceBuild/content/repo-projects/nuget-client.proj | 4 ++--
 src/SourceBuild/content/repo-projects/razor.proj        | 3 ++-
 src/SourceBuild/content/repo-projects/roslyn.proj       | 3 ++-
 src/SourceBuild/content/repo-projects/sdk.proj          | 2 ++
 src/SourceBuild/content/repo-projects/sourcelink.proj   | 1 -
 src/SourceBuild/content/repo-projects/templating.proj   | 2 +-
 src/SourceBuild/content/repo-projects/vstest.proj       | 2 +-
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index 1dae63bfe628..fe20eb430019 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -25,7 +25,7 @@
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="symreader" />
+    <RepositoryReference Include="symreader" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="xdt" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
index efffabcb3b02..c1aed107e367 100644
--- a/src/SourceBuild/content/repo-projects/format.proj
+++ b/src/SourceBuild/content/repo-projects/format.proj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="roslyn-analyzers" />
+    <RepositoryReference Include="msbuild" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="roslyn-analyzers" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="sourcelink" />
     <RepositoryReference Include="symreader" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index dd18fea7fc8a..a38e59e1a3ab 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -21,7 +21,6 @@
   <ItemGroup>
     <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="sourcelink" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj
index 37ab58a63d6f..896dc622e871 100644
--- a/src/SourceBuild/content/repo-projects/nuget-client.proj
+++ b/src/SourceBuild/content/repo-projects/nuget-client.proj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="msbuild" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="xdt" />
+    <RepositoryReference Include="xdt" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj
index 74ce7402d5e1..7dd9f0435467 100644
--- a/src/SourceBuild/content/repo-projects/razor.proj
+++ b/src/SourceBuild/content/repo-projects/razor.proj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="aspnetcore" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj
index 34ad46b9e9d4..4917e12dffe2 100644
--- a/src/SourceBuild/content/repo-projects/roslyn.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn.proj
@@ -28,7 +28,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 4dc18056efb8..9983f62d6086 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -17,9 +17,11 @@
     <RepositoryReference Include="emsdk" />
     <RepositoryReference Include="format" />
     <RepositoryReference Include="fsharp" />
+    <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="razor" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="sourcelink" />
     <RepositoryReference Include="templating" />
     <RepositoryReference Include="vstest" />
     <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj
index 1eb75e01a1be..2efaedbbcb37 100644
--- a/src/SourceBuild/content/repo-projects/sourcelink.proj
+++ b/src/SourceBuild/content/repo-projects/sourcelink.proj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj
index 8b1d44af6ca1..a3fa0bcbd112 100644
--- a/src/SourceBuild/content/repo-projects/templating.proj
+++ b/src/SourceBuild/content/repo-projects/templating.proj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="nuget-client" />
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj
index 6495f20b7290..e1c80094317f 100644
--- a/src/SourceBuild/content/repo-projects/vstest.proj
+++ b/src/SourceBuild/content/repo-projects/vstest.proj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="diagnostics" />
-    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>

From d18498a7931f3306aa10ee2c08b1edbdfb74308f Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Fri, 16 Feb 2024 15:35:36 -0600
Subject: [PATCH 08/40] Updates to integrate with artifact path refactoring

---
 .../repo-projects/Directory.Build.props       |  6 +-
 .../repo-projects/Directory.Build.targets     | 72 +++++++++----------
 .../content/repo-projects/aspnetcore.proj     |  1 +
 .../repo-projects/package-source-build.proj   | 48 ++-----------
 .../repo-projects/roslyn-analyzers.proj       |  1 +
 5 files changed, 50 insertions(+), 78 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index a216ef3de041..ec56c01a858d 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -33,7 +33,11 @@
     <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
 
     <SourceBuiltSdksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'source-built-sdks'))</SourceBuiltSdksDir>
-    <SourceBuiltPackagesPath>$(SourceBuiltBasePackagesPath)$(RepositoryName)/</SourceBuiltPackagesPath>
+    <RepoArtifactsShippingPackagesDir Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$([MSBuild]::NormalizeDirectory('$(ArtifactsShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsShippingPackagesDir>
+    <RepoArtifactsShippingPackagesDir Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</RepoArtifactsShippingPackagesDir>
+    <RepoArtifactsNonShippingPackagesDir Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsNonShippingPackagesDir>
+    <RepoArtifactsNonShippingPackagesDir Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir>
+    
 
     <!-- Set the bootstrap version to the VMR's version if empty. (no bootstrap set). -->
     <ArcadeBootstrapVersion>$([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)'))</ArcadeBootstrapVersion>
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 6b99bdc8f431..7a4457071341 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -41,15 +41,24 @@
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WritePackageUsageData" />
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="WriteUsageReports" />
   
+  <!-- Wraps the transitive repo references with additional metadata -->
   <Target Name="GetRepositoryReferenceInfo"
           DependsOnTargets="GetTransitiveRepositoryReferences">
-    <ItemGroup>
-      <RepositoryReferenceInfo Include="@(TransitiveRepositoryReference)">
-        <SourceName>source-built-%(Identity)</SourceName>
-        <PackagesPath>$(SourceBuiltBasePackagesPath)%(Identity)/</PackagesPath>
+    <!-- SBRP is explicitly excluded since it is output to its own special directory, $(ReferencePackagesDir). -->
+    <ItemGroup Condition="'@(TransitiveRepositoryReference)' != ''">
+      <RepositoryReferenceInfo Include="@(TransitiveRepositoryReference)"
+                               Condition="'%(Identity)' != 'source-build-reference-packages'">
+        <ShippingSourceName>source-built-%(Identity)</ShippingSourceName>
+        <NonShippingSourceName>source-built-transport-%(Identity)</NonShippingSourceName>
+        <ShippingPackagesPath>$(ArtifactsShippingPackagesDir)/%(Identity)/</ShippingPackagesPath>
+        <NonShippingPackagesPath>$(ArtifactsNonShippingPackagesDir)/%(Identity)/</NonShippingPackagesPath>
       </RepositoryReferenceInfo>
-      <DependentRepoSourceName Include="@(RepositoryReferenceInfo->'%(SourceName)')" />
-      <DependentRepoPackageFile Include="%(RepositoryReferenceInfo.PackagesPath)**" />
+    </ItemGroup>
+    <ItemGroup Condition="'@(RepositoryReferenceInfo)' != ''">
+      <DependentRepoSourceName Include="@(RepositoryReferenceInfo->'%(ShippingSourceName)')" />
+      <DependentRepoSourceName Include="@(RepositoryReferenceInfo->'%(NonShippingSourceName)')" />
+      <DependentRepoPackageFile Include="%(RepositoryReferenceInfo.ShippingPackagesPath)**" />
+      <DependentRepoPackageFile Include="%(RepositoryReferenceInfo.NonShippingPackagesPath)**" />
     </ItemGroup>
   </Target>
 
@@ -73,8 +82,6 @@
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete">
     <PropertyGroup>
-      <!-- Feed for the non-shipping live built packages -->
-      <SourceBuiltNonShippingNuGetSourceName>source-built-transport</SourceBuiltNonShippingNuGetSourceName>
       <!-- Dev innerloop opt-in feed: /p:ExtraRestoreSourcePath=... -->
       <ExtraSourcesNuGetSourceName>ExtraSources</ExtraSourcesNuGetSourceName>
     </PropertyGroup>
@@ -87,7 +94,6 @@
 
     <ItemGroup>
       <_CommonSourceBuildSources Include="@(DependentRepoSourceName)" />
-      <_CommonSourceBuildSources Include="$(SourceBuiltNonShippingNuGetSourceName)" />
       <_CommonSourceBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" />
     </ItemGroup>
 
@@ -136,13 +142,14 @@
                             Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
-                            SourceName="%(RepositoryReferenceInfo.SourceName)"
-                            SourcePath="%(RepositoryReferenceInfo.PackagesPath)"
+                            SourceName="%(RepositoryReferenceInfo.ShippingSourceName)"
+                            SourcePath="%(RepositoryReferenceInfo.ShippingPackagesPath)"
                             Condition=" '@(RepositoryReferenceInfo)' != '' " />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
-                            SourceName="$(SourceBuiltNonShippingNuGetSourceName)"
-                            SourcePath="$(ArtifactsNonShippingPackagesDir)" />
+                            SourceName="%(RepositoryReferenceInfo.NonShippingSourceName)"
+                            SourcePath="%(RepositoryReferenceInfo.NonShippingPackagesPath)"
+                            Condition=" '@(RepositoryReferenceInfo)' != '' " />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
                             SourceName="$(ExtraSourcesNuGetSourceName)"
@@ -216,7 +223,6 @@
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)CreateBuildInputProps.complete">
     <ItemGroup>
-      <!-- TODO: Double-check this is targeting the right path. Should include both shipping and non-shipping -->
       <!-- Collect all the NuGet packages from dependent repos except for the symbols -->
       <_CurrentSourceBuiltPackages Include="@(DependentRepoPackageFile)"
                                    Condition="!$([System.String]::Copy('%(Identity)').EndsWith('.symbols.nupkg'))" />
@@ -339,8 +345,8 @@
     </PropertyGroup>
 
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(RepoConsoleLogFile)'));
-                          $(ArtifactsShippingPackagesDir);
-                          $(ArtifactsNonShippingPackagesDir);
+                          $(RepoArtifactsShippingPackagesDir);
+                          $(RepoArtifactsNonShippingPackagesDir);
                           $(ArtifactsAssetsDir)" />
 
     <!-- Create directories for extra debugging. -->
@@ -412,14 +418,12 @@
     <ItemGroup>
       <RepoManifestNonShippingPackage Include="@(RepoManifestPackage)"
                                       Condition="$([System.String]::Copy('%(Identity)').Contains('$([System.IO.Path]::DirectorySeparatorChar)NonShipping$([System.IO.Path]::DirectorySeparatorChar)'))">
-        <DestinationFolder Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(ArtifactsNonShippingPackagesDir)</DestinationFolder>
-        <DestinationFolder Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</DestinationFolder>
+        <DestinationFolder>$(RepoArtifactsNonShippingPackagesDir)</DestinationFolder>
       </RepoManifestNonShippingPackage>
 
       <RepoManifestShippingPackage Include="@(RepoManifestPackage)"
                                    Exclude="@(RepoManifestNonShippingPackage)">
-        <DestinationFolder Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(ArtifactsShippingPackagesDir)</DestinationFolder>
-        <DestinationFolder Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</DestinationFolder>
+        <DestinationFolder>$(RepoArtifactsShippingPackagesDir)</DestinationFolder>
       </RepoManifestShippingPackage>
     </ItemGroup>
 
@@ -520,8 +524,7 @@
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
     <PropertyGroup>
-      <_ToolPackagesRoot Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$(ArtifactsNonShippingPackagesDir)</_ToolPackagesRoot>
-      <_ToolPackagesRoot Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</_ToolPackagesRoot>
+      <_ToolPackagesRoot>$(RepoArtifactsNonShippingPackagesDir)</_ToolPackagesRoot>
     </PropertyGroup>
 
     <ItemGroup>
@@ -731,20 +734,17 @@
 
     <!-- Exclude repositories that currently don't build when not building source-only. -->
     <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-	  <TransitiveRepositoryReference Remove="roslyn" />
-	  <TransitiveRepositoryReference Remove="msbuild" />
-	  <TransitiveRepositoryReference Remove="sdk" />
-	  <TransitiveRepositoryReference Remove="aspnetcore" />
-	  <TransitiveRepositoryReference Remove="razor" />
-	  <TransitiveRepositoryReference Remove="deployment-tools" />
-	  <TransitiveRepositoryReference Remove="format" />
-	  <TransitiveRepositoryReference Remove="nuget-client" />
-	  <TransitiveRepositoryReference Remove="test-templates" />
-	  <TransitiveRepositoryReference Remove="fsharp" />
-	  <TransitiveRepositoryReference Remove="vstest" />
-	  <TransitiveRepositoryReference Remove="aspire" />
-	  <TransitiveRepositoryReference Remove="installer" />
-	  </ItemGroup>
+	  <RepositoryReference Remove="roslyn" />
+	  <RepositoryReference Remove="msbuild" />
+	  <RepositoryReference Remove="aspnetcore" />
+	  <RepositoryReference Remove="razor" />
+	  <RepositoryReference Remove="format" />
+	  <RepositoryReference Remove="nuget-client" />
+	  <RepositoryReference Remove="fsharp" />
+	  <RepositoryReference Remove="vstest" />
+	  <RepositoryReference Remove="aspire" />
+	  <RepositoryReference Remove="installer" />
+	</ItemGroup>
   </Target>
 
   <!-- Outputs a dependency graph of the repos, in YAML form, to the console. -->
diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index 5e576dabda60..e0dca23c0354 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -21,6 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="nuget-client" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 3487b6d02fd0..9da0a9a576b5 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -10,79 +10,45 @@
   <Target Name="CustomRepoBuild"
           AfterTargets="RepoBuild"
           DependsOnTargets="CreateBuildInputProps;DetermineSourceBuiltSdkVersion">
-    <PropertyGroup>
-      <SourceBuildTarballStagingDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(SourceBuiltArtifactsTarballName)'))</SourceBuildTarballStagingDir>
-      <SourceBuildReferencePackagesDestination>$([MSBuild]::NormalizeDirectory('$(SourceBuildTarballStagingDir)', 'SourceBuildReferencePackages'))</SourceBuildReferencePackagesDestination>
-      <!-- TODO: This was my stuff
-      <SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
-      <SourceBuildReferencePackagesDestination>$(SourceBuiltPackagesPath)$(SourceBuildReferencePackagesDestinationDirName)/</SourceBuildReferencePackagesDestination>
-      -->
-    </PropertyGroup>
-
-    <!-- Copy PVP to staging dir in order to package them together. -->
-    <Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)"
-          DestinationFiles="$(SourceBuildTarballStagingDir)PackageVersions.props" />
-
-    <ItemGroup>
-      <SourceBuildReferencePackagesNupkgFiles Include="$(ReferencePackagesDir)**/*.nupkg" />
-    </ItemGroup>
-
-    <!-- Copy reference packages from ReferencePackagesDir to staging dir. -->
-    <Copy
-      SourceFiles="@(SourceBuildReferencePackagesNupkgFiles)"
-      DestinationFiles="@(SourceBuildReferencePackagesNupkgFiles -> '$(SourceBuildReferencePackagesDestination)%(Filename)%(Extension)')"
-      Condition="'@(SourceBuildReferencePackagesNupkgFiles)' != ''" />
-
-    <ItemGroup>
-      <ArtifactsPackage Include="$(ArtifactsPackagesDir)**\*.nupkg" />
-    </ItemGroup>
-
-    <!-- Copy packages to staging dir. -->
-    <!-- TODO: Get rid of this -->
-    <Copy SourceFiles="@(ArtifactsPackage)"
-          DestinationFolder="$(SourceBuildTarballStagingDir)"
-          Condition="'@(ArtifactsPackage)' != ''" />
-
     <PropertyGroup>
       <SourceBuiltTarballName>$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName).$(SourceBuiltSdkVersion).$(TargetRid)$(ArchiveExtension)</SourceBuiltTarballName>
       <SourceBuiltVersionFileName>.version</SourceBuiltVersionFileName>
     </PropertyGroup>
 
-    <!-- Content of the .version file to include in the tarball. Write to staging dir. -->
+    <!-- Content of the .version file to include in the tarball -->
     <ItemGroup>
       <VersionFileContent Include="$(RepositoryCommit);$(SourceBuiltSdkVersion)" />
     </ItemGroup>
 
     <WriteLinesToFile
-      File="$(SourceBuildTarballStagingDir)$(SourceBuiltVersionFileName)"
+      File="$(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName)"
       Lines="@(VersionFileContent)"
       Overwrite="true" />
 
     <MakeDir Directories="$(SharedOutputPath)" />
 
     <ItemGroup>
-      <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(SourceBuiltBasePackagesPath)))"
-                    Exclude="$(SourceBuiltBasePackagesPath)package-source-build" />
+      <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsShippingPackagesDir)))" />
+      <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsNonShippingPackagesDir)))" />
     </ItemGroup>
 
     <!-- Create a layout directory for the files that are to be included in the artifacts tarball. Since there are a large number of files, this will use symlinks
          instead of copying files to make this execute quickly. -->
     <PropertyGroup>
       <_SourceBuiltLayoutDir>$(BaseIntermediateOutputPath)artifacts-layout/</_SourceBuiltLayoutDir>
+      <SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
     </PropertyGroup>
     <MakeDir Directories="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
     <Exec Command="ln -sf %(_AllRepoDirs.Identity)/* $(_SourceBuiltLayoutDir)"
           Condition="$([System.IO.Directory]::GetFiles('%(_AllRepoDirs.Identity)')) != ''" />
-    <Exec Command="ln -sf $(SourceBuiltPackagesPath)$(SourceBuiltVersionFileName) $(_SourceBuiltLayoutDir)" />
+    <Exec Command="ln -sf $(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName) $(_SourceBuiltLayoutDir)" />
     <Exec Command="ln -sf $(CurrentSourceBuiltPackageVersionPropsPath) $(_SourceBuiltLayoutDir)PackageVersions.props" />
-    <Exec Command="ln -sf $(SourceBuildReferencePackagesDestination)* $(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
+    <Exec Command="ln -sf $(ReferencePackagesDir)* $(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
 
     <Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"
           WorkingDirectory="$(_SourceBuiltLayoutDir)" />
 
     <Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
-
-    <RemoveDir Directories="$(SourceBuildTarballStagingDir)" />
   </Target>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
index aa624342037a..4de42e5956fc 100644
--- a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>

From 608e3adab65aca27adcc828a17383c6b401466dc Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:33:52 -0600
Subject: [PATCH 09/40] Add back primary dependencies

---
 src/SourceBuild/content/repo-projects/aspnetcore.proj     | 4 +++-
 src/SourceBuild/content/repo-projects/format.proj         | 4 ++++
 src/SourceBuild/content/repo-projects/fsharp.proj         | 2 ++
 src/SourceBuild/content/repo-projects/msbuild.proj        | 2 ++
 src/SourceBuild/content/repo-projects/runtime.proj        | 1 +
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 1 +
 src/SourceBuild/content/repo-projects/sdk.proj            | 8 ++++++++
 src/SourceBuild/content/repo-projects/sourcelink.proj     | 1 +
 src/SourceBuild/content/repo-projects/vstest.proj         | 1 +
 src/SourceBuild/content/repo-projects/winforms.proj       | 1 +
 src/SourceBuild/content/repo-projects/wpf.proj            | 1 +
 11 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index e0dca23c0354..d5a6f748e10f 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -21,8 +21,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="nuget-client" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="nuget-client" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="symreader" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
index c1aed107e367..f311513cafe1 100644
--- a/src/SourceBuild/content/repo-projects/format.proj
+++ b/src/SourceBuild/content/repo-projects/format.proj
@@ -1,8 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="msbuild" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="roslyn-analyzers" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="symreader" />
diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index a38e59e1a3ab..52e43fbb828c 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -19,7 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />  
     <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index 5d62b7b39af2..e4259a9038e0 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -8,7 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index 6991872c92cb..c911d46aa5e8 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -31,6 +31,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />  
     <RepositoryReference Include="cecil" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 2a163ae46cb7..b71f89c20748 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 9983f62d6086..b22bcb759378 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -13,15 +13,23 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="deployment-tools" />
     <RepositoryReference Include="emsdk" />
     <RepositoryReference Include="format" />
     <RepositoryReference Include="fsharp" />
+    <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="razor" />
+    <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="roslyn-analyzers" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="sourcelink" />
+    <RepositoryReference Include="symreader" />
     <RepositoryReference Include="templating" />
     <RepositoryReference Include="vstest" />
     <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj
index 2efaedbbcb37..1eb75e01a1be 100644
--- a/src/SourceBuild/content/repo-projects/sourcelink.proj
+++ b/src/SourceBuild/content/repo-projects/sourcelink.proj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj
index e1c80094317f..4a7faf4e4098 100644
--- a/src/SourceBuild/content/repo-projects/vstest.proj
+++ b/src/SourceBuild/content/repo-projects/vstest.proj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="diagnostics" />
     <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
diff --git a/src/SourceBuild/content/repo-projects/winforms.proj b/src/SourceBuild/content/repo-projects/winforms.proj
index 05371f56f51c..489f0055d7c0 100644
--- a/src/SourceBuild/content/repo-projects/winforms.proj
+++ b/src/SourceBuild/content/repo-projects/winforms.proj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="runtime" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/wpf.proj b/src/SourceBuild/content/repo-projects/wpf.proj
index a84fac4f4629..e5ee42cc7bcf 100644
--- a/src/SourceBuild/content/repo-projects/wpf.proj
+++ b/src/SourceBuild/content/repo-projects/wpf.proj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="winforms" />
   </ItemGroup>
 

From a7a6f797cf0c959a333b8362958a0873b3540f5b Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:34:13 -0600
Subject: [PATCH 10/40] Move psb references

---
 .../content/repo-projects/package-source-build.proj    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 9da0a9a576b5..cfc3672f8f8c 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -7,6 +7,11 @@
     <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
   </PropertyGroup>
 
+  <ItemGroup>
+    <RepositoryReference Include="installer" />
+    <RepositoryReference Include="scenario-tests" />
+  </ItemGroup>
+
   <Target Name="CustomRepoBuild"
           AfterTargets="RepoBuild"
           DependsOnTargets="CreateBuildInputProps;DetermineSourceBuiltSdkVersion">
@@ -51,9 +56,4 @@
     <Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
   </Target>
 
-  <ItemGroup>
-    <RepositoryReference Include="installer" />
-    <RepositoryReference Include="scenario-tests" />
-  </ItemGroup>
-
 </Project>

From bdaa440797890f0ef606393025d6967d656c4917 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:34:33 -0600
Subject: [PATCH 11/40] Use Exclude instead of Condition

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 7a4457071341..546ea2ec37c0 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -47,7 +47,7 @@
     <!-- SBRP is explicitly excluded since it is output to its own special directory, $(ReferencePackagesDir). -->
     <ItemGroup Condition="'@(TransitiveRepositoryReference)' != ''">
       <RepositoryReferenceInfo Include="@(TransitiveRepositoryReference)"
-                               Condition="'%(Identity)' != 'source-build-reference-packages'">
+                               Exclude="source-build-reference-packages">
         <ShippingSourceName>source-built-%(Identity)</ShippingSourceName>
         <NonShippingSourceName>source-built-transport-%(Identity)</NonShippingSourceName>
         <ShippingPackagesPath>$(ArtifactsShippingPackagesDir)/%(Identity)/</ShippingPackagesPath>

From 241ad6fec829efd38530b3744604fae68f0f5efe Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:34:44 -0600
Subject: [PATCH 12/40] whitespace

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 546ea2ec37c0..26503d5c6b85 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -54,6 +54,7 @@
         <NonShippingPackagesPath>$(ArtifactsNonShippingPackagesDir)/%(Identity)/</NonShippingPackagesPath>
       </RepositoryReferenceInfo>
     </ItemGroup>
+
     <ItemGroup Condition="'@(RepositoryReferenceInfo)' != ''">
       <DependentRepoSourceName Include="@(RepositoryReferenceInfo->'%(ShippingSourceName)')" />
       <DependentRepoSourceName Include="@(RepositoryReferenceInfo->'%(NonShippingSourceName)')" />

From a50512dc17ae245c0ac70d263c90b7c632961889 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:35:37 -0600
Subject: [PATCH 13/40] Remove MakeDir for package dirs

---
 .../content/repo-projects/Directory.Build.targets           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 26503d5c6b85..76b6605ef7f7 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -145,12 +145,12 @@
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
                             SourceName="%(RepositoryReferenceInfo.ShippingSourceName)"
                             SourcePath="%(RepositoryReferenceInfo.ShippingPackagesPath)"
-                            Condition=" '@(RepositoryReferenceInfo)' != '' " />
+                            Condition="Exists('%(RepositoryReferenceInfo.ShippingPackagesPath)')" />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
                             SourceName="%(RepositoryReferenceInfo.NonShippingSourceName)"
                             SourcePath="%(RepositoryReferenceInfo.NonShippingPackagesPath)"
-                            Condition=" '@(RepositoryReferenceInfo)' != '' " />
+                            Condition="Exists('%(RepositoryReferenceInfo.NonShippingPackagesPath)')" />
 
     <AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
                             SourceName="$(ExtraSourcesNuGetSourceName)"
@@ -346,8 +346,6 @@
     </PropertyGroup>
 
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(RepoConsoleLogFile)'));
-                          $(RepoArtifactsShippingPackagesDir);
-                          $(RepoArtifactsNonShippingPackagesDir);
                           $(ArtifactsAssetsDir)" />
 
     <!-- Create directories for extra debugging. -->

From c97b8d2c442032017f5ec4a57a7421841660631c Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:36:07 -0600
Subject: [PATCH 14/40] Add comment for embedding

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 76b6605ef7f7..b6e0a3ea9805 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -174,6 +174,8 @@
     </Touch>
 
     <ItemGroup>
+      <!-- This is defined in this target to ensure the NuGet.config file is updated before it gets embedded. If this item
+           was define globally, it would immediately get embedded with the original, unmodified version of the file. -->
       <EmbedInBinlog Include="$(NuGetConfigFile)" />
   </ItemGroup>
   </Target>

From 8b3f3b271825f5c273d951a1c95160516e6ad51e Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:36:23 -0600
Subject: [PATCH 15/40] indenting

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index b6e0a3ea9805..1490ded5b2d4 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -177,7 +177,7 @@
       <!-- This is defined in this target to ensure the NuGet.config file is updated before it gets embedded. If this item
            was define globally, it would immediately get embedded with the original, unmodified version of the file. -->
       <EmbedInBinlog Include="$(NuGetConfigFile)" />
-  </ItemGroup>
+    </ItemGroup>
   </Target>
 
   <!-- Update the SDK version in the repo's global.json file.

From 88347439bdd4e5a30e1211cacde3eaeed2fcdaee Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:37:00 -0600
Subject: [PATCH 16/40] Remove TransitiveRepositoryReference instead of
 RepositoryReference, fix indent

---
 .../repo-projects/Directory.Build.targets     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 1490ded5b2d4..639fb31555ab 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -735,17 +735,17 @@
 
     <!-- Exclude repositories that currently don't build when not building source-only. -->
     <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-	  <RepositoryReference Remove="roslyn" />
-	  <RepositoryReference Remove="msbuild" />
-	  <RepositoryReference Remove="aspnetcore" />
-	  <RepositoryReference Remove="razor" />
-	  <RepositoryReference Remove="format" />
-	  <RepositoryReference Remove="nuget-client" />
-	  <RepositoryReference Remove="fsharp" />
-	  <RepositoryReference Remove="vstest" />
-	  <RepositoryReference Remove="aspire" />
-	  <RepositoryReference Remove="installer" />
-	</ItemGroup>
+      <TransitiveRepositoryReference Remove="roslyn" />
+      <TransitiveRepositoryReference Remove="msbuild" />
+      <TransitiveRepositoryReference Remove="aspnetcore" />
+      <TransitiveRepositoryReference Remove="razor" />
+      <TransitiveRepositoryReference Remove="format" />
+      <TransitiveRepositoryReference Remove="nuget-client" />
+      <TransitiveRepositoryReference Remove="fsharp" />
+      <TransitiveRepositoryReference Remove="vstest" />
+      <TransitiveRepositoryReference Remove="aspire" />
+      <TransitiveRepositoryReference Remove="installer" />
+    </ItemGroup>
   </Target>
 
   <!-- Outputs a dependency graph of the repos, in YAML form, to the console. -->

From 0540025c557a98c47a62c7f24d8a2335c20d179a Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:37:17 -0600
Subject: [PATCH 17/40] Remove SkipEnsurePackagesCreated

---
 src/SourceBuild/content/repo-projects/installer.proj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index fb749c74b4de..17fd81a2df98 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -11,8 +11,6 @@
     <!-- Restore and Build actions are already passed in by the root script. -->
     <BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
     
-    <SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
-
     <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)runtime-id $(TargetRid)</BuildArgs>
 
     <!--

From 3c0edf61488301528f9645ed14585a35eee21eb3 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:37:41 -0600
Subject: [PATCH 18/40] Remove SharedOutputPath MakeDir

---
 src/SourceBuild/content/repo-projects/package-source-build.proj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index cfc3672f8f8c..2a722278c514 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -30,8 +30,6 @@
       Lines="@(VersionFileContent)"
       Overwrite="true" />
 
-    <MakeDir Directories="$(SharedOutputPath)" />
-
     <ItemGroup>
       <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsShippingPackagesDir)))" />
       <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsNonShippingPackagesDir)))" />

From fe82c369960c55039a75546a81cb0a937c78d9c6 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:38:11 -0600
Subject: [PATCH 19/40] Use Copy instead of ln

---
 .../repo-projects/package-source-build.proj   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 2a722278c514..706599794a06 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -33,6 +33,8 @@
     <ItemGroup>
       <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsShippingPackagesDir)))" />
       <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsNonShippingPackagesDir)))" />
+      <_AllRepoFiles Include="%(_AllRepoDirs.Identity)/**" />
+      <_ReferencePackageFiles Include="$(ReferencePackagesDir)**" />
     </ItemGroup>
 
     <!-- Create a layout directory for the files that are to be included in the artifacts tarball. Since there are a large number of files, this will use symlinks
@@ -42,11 +44,18 @@
       <SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
     </PropertyGroup>
     <MakeDir Directories="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
-    <Exec Command="ln -sf %(_AllRepoDirs.Identity)/* $(_SourceBuiltLayoutDir)"
-          Condition="$([System.IO.Directory]::GetFiles('%(_AllRepoDirs.Identity)')) != ''" />
-    <Exec Command="ln -sf $(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName) $(_SourceBuiltLayoutDir)" />
-    <Exec Command="ln -sf $(CurrentSourceBuiltPackageVersionPropsPath) $(_SourceBuiltLayoutDir)PackageVersions.props" />
-    <Exec Command="ln -sf $(ReferencePackagesDir)* $(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
+    <Copy SourceFiles="@(_AllRepoFiles)"
+          DestinationFolder="$(_SourceBuiltLayoutDir)"
+          UseSymbolicLinksIfPossible="true" />
+    <Copy SourceFiles="$(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName)"
+          DestinationFolder="$(_SourceBuiltLayoutDir)"
+          UseSymbolicLinksIfPossible="true" />
+    <Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)"
+          DestinationFiles="$(_SourceBuiltLayoutDir)PackageVersions.props"
+          UseSymbolicLinksIfPossible="true" />
+    <Copy SourceFiles="@(_ReferencePackageFiles)"
+          DestinationFolder="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)"
+          UseSymbolicLinksIfPossible="true" />
 
     <Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"
           WorkingDirectory="$(_SourceBuiltLayoutDir)" />

From 816e8dce709bc9384f5f5c90da07171208bbf4a1 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 12:48:41 -0600
Subject: [PATCH 20/40] Separate SB refs into separate ItemGroup

---
 src/SourceBuild/content/repo-projects/aspnetcore.proj | 11 +++++++----
 src/SourceBuild/content/repo-projects/cecil.proj      |  5 ++++-
 .../content/repo-projects/command-line-api.proj       |  5 ++++-
 .../content/repo-projects/deployment-tools.proj       |  7 +++++--
 .../content/repo-projects/diagnostics.proj            |  5 ++++-
 src/SourceBuild/content/repo-projects/dotnet.proj     |  5 ++++-
 src/SourceBuild/content/repo-projects/emsdk.proj      |  5 ++++-
 src/SourceBuild/content/repo-projects/format.proj     | 11 +++++++----
 src/SourceBuild/content/repo-projects/fsharp.proj     |  5 ++++-
 src/SourceBuild/content/repo-projects/installer.proj  |  7 +++++--
 src/SourceBuild/content/repo-projects/msbuild.proj    |  5 ++++-
 .../content/repo-projects/nuget-client.proj           |  8 ++++----
 src/SourceBuild/content/repo-projects/razor.proj      |  7 +++++--
 .../content/repo-projects/roslyn-analyzers.proj       |  9 ++++++---
 src/SourceBuild/content/repo-projects/roslyn.proj     |  9 ++++++---
 src/SourceBuild/content/repo-projects/runtime.proj    |  7 +++++--
 .../content/repo-projects/scenario-tests.proj         |  7 +++++--
 src/SourceBuild/content/repo-projects/sdk.proj        |  7 +++++--
 src/SourceBuild/content/repo-projects/sourcelink.proj |  5 ++++-
 src/SourceBuild/content/repo-projects/symreader.proj  |  5 ++++-
 src/SourceBuild/content/repo-projects/templating.proj |  7 +++++--
 .../content/repo-projects/test-templates.proj         |  5 ++++-
 src/SourceBuild/content/repo-projects/vstest.proj     |  9 ++++++---
 23 files changed, 111 insertions(+), 45 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index d5a6f748e10f..24dddd442f40 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -24,13 +24,16 @@
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="nuget-client" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="symreader" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="xdt" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="nuget-client" />
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
+    <RepositoryReference Include="symreader" />
+  </ItemGroup>
+
   <ItemGroup>
     <EnvironmentVariables Include="warn_as_error=false" />
   </ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/cecil.proj b/src/SourceBuild/content/repo-projects/cecil.proj
index 563e7998b4b3..9cb33b7c4fa7 100644
--- a/src/SourceBuild/content/repo-projects/cecil.proj
+++ b/src/SourceBuild/content/repo-projects/cecil.proj
@@ -2,7 +2,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/command-line-api.proj b/src/SourceBuild/content/repo-projects/command-line-api.proj
index 198cebc2b07d..28ba676c0e24 100644
--- a/src/SourceBuild/content/repo-projects/command-line-api.proj
+++ b/src/SourceBuild/content/repo-projects/command-line-api.proj
@@ -8,7 +8,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/deployment-tools.proj b/src/SourceBuild/content/repo-projects/deployment-tools.proj
index 46c3343f4b49..7fd4eb25fb1f 100644
--- a/src/SourceBuild/content/repo-projects/deployment-tools.proj
+++ b/src/SourceBuild/content/repo-projects/deployment-tools.proj
@@ -2,8 +2,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/diagnostics.proj b/src/SourceBuild/content/repo-projects/diagnostics.proj
index 563e7998b4b3..9cb33b7c4fa7 100644
--- a/src/SourceBuild/content/repo-projects/diagnostics.proj
+++ b/src/SourceBuild/content/repo-projects/diagnostics.proj
@@ -2,7 +2,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 732eb34f9932..c5f305b1bedc 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -12,8 +12,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="installer" />
-    <RepositoryReference Include="package-source-build" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="scenario-tests" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="package-source-build" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/emsdk.proj b/src/SourceBuild/content/repo-projects/emsdk.proj
index 65f811a0bcac..a210d9c4bd7f 100644
--- a/src/SourceBuild/content/repo-projects/emsdk.proj
+++ b/src/SourceBuild/content/repo-projects/emsdk.proj
@@ -12,7 +12,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
index f311513cafe1..70f47a2e1168 100644
--- a/src/SourceBuild/content/repo-projects/format.proj
+++ b/src/SourceBuild/content/repo-projects/format.proj
@@ -3,13 +3,16 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="msbuild" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="roslyn" />
-    <RepositoryReference Include="roslyn-analyzers" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="symreader" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="roslyn-analyzers" />
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index 52e43fbb828c..6453af9136ba 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -22,7 +22,10 @@
     <RepositoryReference Include="arcade" />  
     <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index 17fd81a2df98..0e52f7ec59c7 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -47,13 +47,16 @@
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
     <RepositoryReference Include="sdk" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="symreader" />
     <RepositoryReference Include="test-templates" />
     <RepositoryReference Include="vstest" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
+  </ItemGroup>
+
   <!--
     If we have authentication, keep the templating internal feed (if one exists) to acquire the
     text-only prebuilt. The source-build repo as a whole should depend on the same internal feed as
diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index e4259a9038e0..0be191d7fb0e 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -11,7 +11,10 @@
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj
index 896dc622e871..b29f0595eaa9 100644
--- a/src/SourceBuild/content/repo-projects/nuget-client.proj
+++ b/src/SourceBuild/content/repo-projects/nuget-client.proj
@@ -8,10 +8,10 @@
     <BuildScript>$([MSBuild]::NormalizePath('$(ProjectDirectory)', 'eng', 'source-build', 'build$(ShellExtension)'))</BuildScript>
   </PropertyGroup>
 
-  <ItemGroup>
-    <RepositoryReference Include="msbuild" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="xdt" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="xdt" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj
index 7dd9f0435467..99eca651e3bc 100644
--- a/src/SourceBuild/content/repo-projects/razor.proj
+++ b/src/SourceBuild/content/repo-projects/razor.proj
@@ -2,8 +2,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="aspnetcore" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="aspnetcore" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
index 4de42e5956fc..eee275a054be 100644
--- a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
@@ -8,9 +8,12 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj
index 15b3f16147c5..dfbeb7102904 100644
--- a/src/SourceBuild/content/repo-projects/roslyn.proj
+++ b/src/SourceBuild/content/repo-projects/roslyn.proj
@@ -28,9 +28,12 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index c911d46aa5e8..25fb5a079163 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -34,8 +34,11 @@
     <RepositoryReference Include="arcade" />  
     <RepositoryReference Include="cecil" />
     <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index b71f89c20748..6d9422b61f06 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -3,8 +3,11 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index b22bcb759378..3d0fa1d44ee0 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -26,8 +26,6 @@
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="roslyn-analyzers" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
     <RepositoryReference Include="sourcelink" />
     <RepositoryReference Include="symreader" />
     <RepositoryReference Include="templating" />
@@ -36,4 +34,9 @@
     <RepositoryReference Include="xdt" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj
index 1eb75e01a1be..3f0451a3867a 100644
--- a/src/SourceBuild/content/repo-projects/sourcelink.proj
+++ b/src/SourceBuild/content/repo-projects/sourcelink.proj
@@ -10,7 +10,10 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj
index 563e7998b4b3..9cb33b7c4fa7 100644
--- a/src/SourceBuild/content/repo-projects/symreader.proj
+++ b/src/SourceBuild/content/repo-projects/symreader.proj
@@ -2,7 +2,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj
index a3fa0bcbd112..202d3baec614 100644
--- a/src/SourceBuild/content/repo-projects/templating.proj
+++ b/src/SourceBuild/content/repo-projects/templating.proj
@@ -9,8 +9,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj
index f3957fa25f92..3013d77fdb4a 100644
--- a/src/SourceBuild/content/repo-projects/test-templates.proj
+++ b/src/SourceBuild/content/repo-projects/test-templates.proj
@@ -6,7 +6,10 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj
index 4a7faf4e4098..327d8aea1bdf 100644
--- a/src/SourceBuild/content/repo-projects/vstest.proj
+++ b/src/SourceBuild/content/repo-projects/vstest.proj
@@ -9,9 +9,12 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="diagnostics" />
-    <RepositoryReference Include="runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-externals" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-    <RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="runtime" />
+    <RepositoryReference Include="source-build-externals" />
+    <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
 </Project>

From 4d7ac80f5ef401c4d2cab7e7bcd339811db760c6 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 13:32:08 -0600
Subject: [PATCH 21/40] dependency adjustments

---
 src/SourceBuild/content/repo-projects/fsharp.proj  | 2 +-
 src/SourceBuild/content/repo-projects/msbuild.proj | 2 +-
 src/SourceBuild/content/repo-projects/runtime.proj | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index 6453af9136ba..2d37b25c3baa 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -20,11 +20,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />  
-    <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index 0be191d7fb0e..9e21231ad38d 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index 25fb5a079163..5441abc41691 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -34,6 +34,7 @@
     <RepositoryReference Include="arcade" />  
     <RepositoryReference Include="cecil" />
     <RepositoryReference Include="command-line-api" />
+    <RepositoryReference Include="emsdk" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">

From 2be9e44f2dc0ba2294896a61795c5481fd92ef6c Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 21 Feb 2024 13:46:32 -0600
Subject: [PATCH 22/40] Renames to remove "SourceBuild"

---
 .../content/repo-projects/Directory.Build.targets  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 639fb31555ab..575e85353a5f 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -94,15 +94,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <_CommonSourceBuildSources Include="@(DependentRepoSourceName)" />
-      <_CommonSourceBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" />
+      <_CommonBuildSources Include="@(DependentRepoSourceName)" />
+      <_CommonBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" />
     </ItemGroup>
 
     <ItemGroup>
-      <SourceBuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'"
-                          Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName);@(_CommonSourceBuildSources)" />
-      <SourceBuildSources Condition="'$(DotNetBuildSourceOnly)' != 'true'"
-                          Include="@(_CommonSourceBuildSources)" />
+      <_BuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'"
+                          Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName);@(_CommonBuildSources)" />
+      <_BuildSources Condition="'$(DotNetBuildSourceOnly)' != 'true'"
+                          Include="@(_CommonBuildSources)" />
     </ItemGroup>
     
     <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
@@ -166,7 +166,7 @@
     <UpdateNuGetConfigPackageSourcesMappings
       NuGetConfigFile="$(NuGetConfigFile)"
       BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
-      SourceBuildSources="@(SourceBuildSources)" />
+      SourceBuildSources="@(_BuildSources)" />
 
     <MakeDir Directories="$(BaseIntermediateOutputPath)" />
     <Touch Files="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete" AlwaysCreate="true">

From a0117ac75d9ea8a2a65d52800c4735b7dc08b0e8 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:39:12 -0600
Subject: [PATCH 23/40] Reclassify fsharp dep on runtime

---
 src/SourceBuild/content/repo-projects/fsharp.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index 2d37b25c3baa..5b3831680bff 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -20,11 +20,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />  
-    <RepositoryReference Include="runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <RepositoryReference Include="msbuild" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 

From afb34ead902a951c4e69ac2448a92ef919301328 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:39:38 -0600
Subject: [PATCH 24/40] Reclassify msbuild dep on runtime

---
 src/SourceBuild/content/repo-projects/msbuild.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
index 9e21231ad38d..a9219d82cb8d 100644
--- a/src/SourceBuild/content/repo-projects/msbuild.proj
+++ b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <RepositoryReference Include="runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <RepositoryReference Include="roslyn" />
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 

From bb5af848117833334b3756fa481aa6fbb077723f Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:41:05 -0600
Subject: [PATCH 25/40] Add runtime dep to templating

---
 src/SourceBuild/content/repo-projects/templating.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj
index 202d3baec614..9677f1100ce1 100644
--- a/src/SourceBuild/content/repo-projects/templating.proj
+++ b/src/SourceBuild/content/repo-projects/templating.proj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
+    <RepositoryReference Include="runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">

From fe469d75864e961b831d3793e1a3683372f692ad Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:41:36 -0600
Subject: [PATCH 26/40] Remove whitespace

---
 src/SourceBuild/content/repo-projects/runtime.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj
index 5441abc41691..9ad2c103588c 100644
--- a/src/SourceBuild/content/repo-projects/runtime.proj
+++ b/src/SourceBuild/content/repo-projects/runtime.proj
@@ -31,7 +31,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />  
+    <RepositoryReference Include="arcade" />
     <RepositoryReference Include="cecil" />
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="emsdk" />

From 308159fcda50b3fb5ae529ea2c96bcedf63aecc7 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:42:44 -0600
Subject: [PATCH 27/40] Remove psb dep on scenario-tests

---
 src/SourceBuild/content/repo-projects/package-source-build.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 706599794a06..0f5bd2700b4c 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <RepositoryReference Include="installer" />
-    <RepositoryReference Include="scenario-tests" />
   </ItemGroup>
 
   <Target Name="CustomRepoBuild"

From 19bc3f3db2d22938fd444d2423fa4e3f57029d7c Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:43:14 -0600
Subject: [PATCH 28/40] Remove whitespace

---
 src/SourceBuild/content/repo-projects/fsharp.proj    | 2 +-
 src/SourceBuild/content/repo-projects/installer.proj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj
index 5b3831680bff..2749c6f02bb1 100644
--- a/src/SourceBuild/content/repo-projects/fsharp.proj
+++ b/src/SourceBuild/content/repo-projects/fsharp.proj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="arcade" />  
+    <RepositoryReference Include="arcade" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index 0e52f7ec59c7..e8132c0d28c4 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -10,7 +10,7 @@
 
     <!-- Restore and Build actions are already passed in by the root script. -->
     <BuildActions>$(FlagParameterPrefix)pack $(FlagParameterPrefix)publish</BuildActions>
-    
+
     <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)runtime-id $(TargetRid)</BuildArgs>
 
     <!--

From 5f14aa31ff1c07afde45b82fc5f5e9e9848231d5 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 07:45:38 -0600
Subject: [PATCH 29/40] Reclassify format dep on symreader

---
 src/SourceBuild/content/repo-projects/format.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/format.proj b/src/SourceBuild/content/repo-projects/format.proj
index 70f47a2e1168..91744a768953 100644
--- a/src/SourceBuild/content/repo-projects/format.proj
+++ b/src/SourceBuild/content/repo-projects/format.proj
@@ -5,7 +5,6 @@
     <RepositoryReference Include="command-line-api" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="symreader" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
@@ -13,6 +12,7 @@
     <RepositoryReference Include="roslyn-analyzers" />
     <RepositoryReference Include="source-build-externals" />
     <RepositoryReference Include="source-build-reference-packages" />
+    <RepositoryReference Include="symreader" />
   </ItemGroup>
 
 </Project>

From 80ba49348ba3fcb28921d8f8fd0165a34838b59a Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:21:39 -0600
Subject: [PATCH 30/40] Use directory normalization

---
 .../content/repo-projects/package-source-build.proj      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 0f5bd2700b4c..fed6a42df335 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -39,21 +39,20 @@
     <!-- Create a layout directory for the files that are to be included in the artifacts tarball. Since there are a large number of files, this will use symlinks
          instead of copying files to make this execute quickly. -->
     <PropertyGroup>
-      <_SourceBuiltLayoutDir>$(BaseIntermediateOutputPath)artifacts-layout/</_SourceBuiltLayoutDir>
+      <_SourceBuiltLayoutDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'artifacts-layout'))</_SourceBuiltLayoutDir>
       <SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
     </PropertyGroup>
-    <MakeDir Directories="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
     <Copy SourceFiles="@(_AllRepoFiles)"
           DestinationFolder="$(_SourceBuiltLayoutDir)"
           UseSymbolicLinksIfPossible="true" />
-    <Copy SourceFiles="$(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName)"
+    <Copy SourceFiles="$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(SourceBuiltVersionFileName)'))"
           DestinationFolder="$(_SourceBuiltLayoutDir)"
           UseSymbolicLinksIfPossible="true" />
     <Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)"
-          DestinationFiles="$(_SourceBuiltLayoutDir)PackageVersions.props"
+          DestinationFiles="$([MSBuild]::NormalizeDirectory('$(_SourceBuiltLayoutDir)', 'PackageVersions.props'))"
           UseSymbolicLinksIfPossible="true" />
     <Copy SourceFiles="@(_ReferencePackageFiles)"
-          DestinationFolder="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)"
+          DestinationFolder="$([MSBuild]::NormalizeDirectory('$(_SourceBuiltLayoutDir)', '$(SourceBuildReferencePackagesDestinationDirName)'))"
           UseSymbolicLinksIfPossible="true" />
 
     <Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"

From 7d574e29b2d486bc05645bd5f2bccbdcb1dbe4d3 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:22:05 -0600
Subject: [PATCH 31/40] Simplify package file collection

---
 .../content/repo-projects/package-source-build.proj          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index fed6a42df335..77798b1b1d66 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -30,9 +30,8 @@
       Overwrite="true" />
 
     <ItemGroup>
-      <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsShippingPackagesDir)))" />
-      <_AllRepoDirs Include="$([System.IO.Directory]::GetDirectories($(ArtifactsNonShippingPackagesDir)))" />
-      <_AllRepoFiles Include="%(_AllRepoDirs.Identity)/**" />
+      <_AllRepoFiles Include="$(ArtifactsShippingPackagesDir)/**" />
+      <_AllRepoFiles Include="$(ArtifactsNonShippingPackagesDir)/**" />
       <_ReferencePackageFiles Include="$(ReferencePackagesDir)**" />
     </ItemGroup>
 

From a0599e10e5c3a47a687e84668ecb239e7f27a8cc Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:24:29 -0600
Subject: [PATCH 32/40] Add whitespace

---
 src/SourceBuild/content/repo-projects/package-source-build.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 77798b1b1d66..8baae7fc8b31 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -41,6 +41,7 @@
       <_SourceBuiltLayoutDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'artifacts-layout'))</_SourceBuiltLayoutDir>
       <SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
     </PropertyGroup>
+    
     <Copy SourceFiles="@(_AllRepoFiles)"
           DestinationFolder="$(_SourceBuiltLayoutDir)"
           UseSymbolicLinksIfPossible="true" />

From 6e800d70a7451ebf467b75a28e3f34c1f151acda Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:25:15 -0600
Subject: [PATCH 33/40] Simplify _BuildSources

---
 .../content/repo-projects/Directory.Build.targets            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 575e85353a5f..1b6ec61a1c13 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -100,9 +100,8 @@
 
     <ItemGroup>
       <_BuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'"
-                          Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName);@(_CommonBuildSources)" />
-      <_BuildSources Condition="'$(DotNetBuildSourceOnly)' != 'true'"
-                          Include="@(_CommonBuildSources)" />
+                     Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName)" />
+      <_BuildSources Include="@(_CommonBuildSources)" />
     </ItemGroup>
     
     <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">

From 59013c60f57ca8d8278bee5167d4fdd107f06055 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:30:26 -0600
Subject: [PATCH 34/40] Get repo refs in parallel

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 1b6ec61a1c13..2677db09128c 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -718,7 +718,8 @@
     </ItemGroup>
 
     <MSBuild Projects="@(RepositoryReference->'%(Identity).proj')"
-             Targets="GetTransitiveRepositoryReferences">
+             Targets="GetTransitiveRepositoryReferences"
+             BuildInParallel="true">
       <Output TaskParameter="TargetOutputs" ItemName="_DependencyTransitiveRepositoryReference" />
     </MSBuild>
 

From 28f645a9fff9494de5b69df18b50434c39297c96 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:30:36 -0600
Subject: [PATCH 35/40] Use Distinct

---
 .../content/repo-projects/Directory.Build.targets          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 2677db09128c..df5ce45b942e 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -726,11 +726,10 @@
     <!-- When items are transferred between projects, they get metadata indicating their source (e.g. MSBuildSourceProjectFile).
          This is problematic because it causes introduces distinctness on the items. For example, an arcade RepositoryReference
          that comes from both msbuild and source-build-externals will be treated as two separate items. But we only want one arcade
-         reference. To prevent this from happening, we need to remove the extra metadata so the two references can be seen as duplicates. -->
+         reference. To prevent this from happening, use the Distinct method which operates on just the Identity to get a unique set
+         of values. -->
     <ItemGroup>
-      <_TransitiveRepositoryReference Include="@(_DependencyTransitiveRepositoryReference)"
-                                      RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" />
-      <TransitiveRepositoryReference Include="@(_TransitiveRepositoryReference)" KeepDuplicates="false" />
+      <TransitiveRepositoryReference Include="@(_DependencyTransitiveRepositoryReference->Distinct())" />
     </ItemGroup>
 
     <!-- Exclude repositories that currently don't build when not building source-only. -->

From 0dfac72c7bc1373fa7352b8c29c230ce06b67975 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:31:01 -0600
Subject: [PATCH 36/40] whitespace

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index df5ce45b942e..bda2d117a2a4 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -784,4 +784,5 @@
       <DependencyGraphString>$(DependencyGraphIndent)-_$(RepositoryName)$(_LineBreak)$(_DependencyGraphString)</DependencyGraphString>
     </PropertyGroup>
   </Target>
+
 </Project>

From 2c3836bbf7060f2963ff9deb690d1804dafcc7c9 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 08:35:31 -0600
Subject: [PATCH 37/40] Move windowsdesktop dep from sdk to installer

---
 src/SourceBuild/content/repo-projects/installer.proj | 1 +
 src/SourceBuild/content/repo-projects/sdk.proj       | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index f38b40fc29eb..cb5fcc0512aa 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -51,6 +51,7 @@
     <RepositoryReference Include="symreader" />
     <RepositoryReference Include="test-templates" />
     <RepositoryReference Include="vstest" />
+    <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 3d0fa1d44ee0..d307692ac8c1 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -30,7 +30,6 @@
     <RepositoryReference Include="symreader" />
     <RepositoryReference Include="templating" />
     <RepositoryReference Include="vstest" />
-    <RepositoryReference Include="windowsdesktop" Condition="'$(TargetOS)' == 'windows'" />
     <RepositoryReference Include="xdt" />
   </ItemGroup>
 

From 9a25ae6e4819d9f9d1a327871fcf01745f665501 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 09:10:06 -0600
Subject: [PATCH 38/40] Revert "Use Distinct"

This reverts commit 28f645a9fff9494de5b69df18b50434c39297c96.
---
 .../content/repo-projects/Directory.Build.targets          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 24ba3bfd91a2..bfa4fc5945dc 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -726,10 +726,11 @@
     <!-- When items are transferred between projects, they get metadata indicating their source (e.g. MSBuildSourceProjectFile).
          This is problematic because it causes introduces distinctness on the items. For example, an arcade RepositoryReference
          that comes from both msbuild and source-build-externals will be treated as two separate items. But we only want one arcade
-         reference. To prevent this from happening, use the Distinct method which operates on just the Identity to get a unique set
-         of values. -->
+         reference. To prevent this from happening, we need to remove the extra metadata so the two references can be seen as duplicates. -->
     <ItemGroup>
-      <TransitiveRepositoryReference Include="@(_DependencyTransitiveRepositoryReference->Distinct())" />
+      <_TransitiveRepositoryReference Include="@(_DependencyTransitiveRepositoryReference)"
+                                      RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" />
+      <TransitiveRepositoryReference Include="@(_TransitiveRepositoryReference)" KeepDuplicates="false" />
     </ItemGroup>
 
     <!-- Exclude repositories that currently don't build when not building source-only. -->

From 542099329f345589ab149c1e20eb61d862003b22 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 09:11:59 -0600
Subject: [PATCH 39/40] Remove unnecessary normalize calls

---
 .../content/repo-projects/package-source-build.proj         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 8baae7fc8b31..6949e69e1af8 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -45,14 +45,14 @@
     <Copy SourceFiles="@(_AllRepoFiles)"
           DestinationFolder="$(_SourceBuiltLayoutDir)"
           UseSymbolicLinksIfPossible="true" />
-    <Copy SourceFiles="$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(SourceBuiltVersionFileName)'))"
+    <Copy SourceFiles="$(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName)"
           DestinationFolder="$(_SourceBuiltLayoutDir)"
           UseSymbolicLinksIfPossible="true" />
     <Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)"
-          DestinationFiles="$([MSBuild]::NormalizeDirectory('$(_SourceBuiltLayoutDir)', 'PackageVersions.props'))"
+          DestinationFiles="$(_SourceBuiltLayoutDir)/PackageVersions.props"
           UseSymbolicLinksIfPossible="true" />
     <Copy SourceFiles="@(_ReferencePackageFiles)"
-          DestinationFolder="$([MSBuild]::NormalizeDirectory('$(_SourceBuiltLayoutDir)', '$(SourceBuildReferencePackagesDestinationDirName)'))"
+          DestinationFolder="$(_SourceBuiltLayoutDir)/$(SourceBuildReferencePackagesDestinationDirName)"
           UseSymbolicLinksIfPossible="true" />
 
     <Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"

From 230361029d7125660a63d191989baf67298b8a68 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 22 Feb 2024 09:17:01 -0600
Subject: [PATCH 40/40] Update
 src/SourceBuild/content/repo-projects/package-source-build.proj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 .../content/repo-projects/package-source-build.proj           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj
index 6949e69e1af8..dc2858da4d2c 100644
--- a/src/SourceBuild/content/repo-projects/package-source-build.proj
+++ b/src/SourceBuild/content/repo-projects/package-source-build.proj
@@ -49,10 +49,10 @@
           DestinationFolder="$(_SourceBuiltLayoutDir)"
           UseSymbolicLinksIfPossible="true" />
     <Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)"
-          DestinationFiles="$(_SourceBuiltLayoutDir)/PackageVersions.props"
+          DestinationFiles="$(_SourceBuiltLayoutDir)PackageVersions.props"
           UseSymbolicLinksIfPossible="true" />
     <Copy SourceFiles="@(_ReferencePackageFiles)"
-          DestinationFolder="$(_SourceBuiltLayoutDir)/$(SourceBuildReferencePackagesDestinationDirName)"
+          DestinationFolder="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)"
           UseSymbolicLinksIfPossible="true" />
 
     <Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"