From e8bb183dbda2e821561ee772c1a403a3c1bf3336 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Wed, 6 Nov 2024 16:09:10 -0800
Subject: [PATCH 1/4] Build the cdac as part of clr.tools instead of as a
 prereq to the runtime native build

Fixes https://github.com/dotnet/runtime/issues/104158

This will also allow us to take a dependency on native components from the cdacreader project when necessary without too much difficulty (ie. native unwinder)
---
 eng/Subsets.props                | 2 ++
 src/coreclr/runtime-prereqs.proj | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 393d13c0c5a77a..397dffd5d6d30a 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -369,6 +369,8 @@
     <ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\cdac-build-tool\cdac-build-tool.csproj" Category="clr" />
+
+    <ProjectToBuild Include="$(RepoRoot)\src\native\managed\compile-native.proj" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+clr.toolstests+'))">
diff --git a/src/coreclr/runtime-prereqs.proj b/src/coreclr/runtime-prereqs.proj
index 91e3f46d59d5fe..c44e1ad9c3b901 100644
--- a/src/coreclr/runtime-prereqs.proj
+++ b/src/coreclr/runtime-prereqs.proj
@@ -14,7 +14,6 @@
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\src\native\managed\compile-native.proj" ReferenceOutputAssembly="false"/>
     <ProjectReference Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 

From b43671aa9b36fc7f1ea2f151db7572d339c759e1 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 8 Nov 2024 13:18:17 -0800
Subject: [PATCH 2/4] Move cdac to build as part of the tools.cdacreader subset
 (included as part of the tools subset)

---
 eng/Subsets.props         | 9 ++++++---
 eng/pipelines/runtime.yml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 397dffd5d6d30a..fca306b9668048 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -87,7 +87,7 @@
     <!-- Respect the DotNetBuildTests product flag when building the product. -->
     <DefaultLibrariesSubsets Condition="'$(DotNetBuildTests)' == 'true'">$(DefaultLibrariesSubsets)+libs.tests</DefaultLibrariesSubsets>
 
-    <DefaultToolsSubsets>tools.illink</DefaultToolsSubsets>
+    <DefaultToolsSubsets>tools.illink+tools.cdacreader</DefaultToolsSubsets>
 
     <DefaultHostSubsets>host.native+host.tools+host.pkg</DefaultHostSubsets>
     <DefaultHostSubsets Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(DefaultHostSubsets)+host.pretest+host.tests</DefaultHostSubsets>
@@ -179,6 +179,7 @@
     <!-- Tools -->
     <SubsetName Include="Tools" Description="Additional runtime tools projects. Equivalent to: $(DefaultToolsSubsets)" />
     <SubsetName Include="Tools.ILLink" Description="The projects that produce illink and analyzer tools for trimming." />
+    <SubsetName Include="Tools.CdacReader" Description="The cDAC reader." />
     <SubsetName Include="Tools.ILLinkTests" OnDemand="true" Description="Unit tests for the tools.illink subset." />
 
     <SubsetName Include="Tools.CdacReaderTests" OnDemand="true" Description="Units tests for the cDAC reader." />
@@ -369,8 +370,6 @@
     <ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\cdac-build-tool\cdac-build-tool.csproj" Category="clr" />
-
-    <ProjectToBuild Include="$(RepoRoot)\src\native\managed\compile-native.proj" Category="clr" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+clr.toolstests+'))">
@@ -382,6 +381,10 @@
       Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(_subset.Contains('+tools.cdacreader+'))">
+    <ProjectToBuild Include="$(RepoRoot)\src\native\managed\compile-native.proj" Category="tools" />
+  </ItemGroup>
+
   <ItemGroup Condition="$(_subset.Contains('+tools.cdacreadertests+'))">
     <ProjectToBuild Include="$(SharedNativeRoot)managed\cdacreader\tests\Microsoft.Diagnostics.DataContractReader.Tests.csproj" Test="true" Category="tools"/>
   </ItemGroup>
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 2e68a43af682ef..15914b469d839e 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -692,7 +692,7 @@ extends:
           jobParameters:
             timeoutInMinutes: 120
             nameSuffix: CLR_Tools_Tests
-            buildArgs: -s clr.aot+clr.iltools+libs.sfx+clr.toolstests+tools.cdacreadertests -c $(_BuildConfig) -test
+            buildArgs: -s clr.aot+clr.iltools+libs.sfx+clr.toolstests+tools.cdacreader+tools.cdacreadertests -c $(_BuildConfig) -test
             enablePublishTestResults: true
             testResultsFormat: 'xunit'
             # We want to run AOT tests when illink changes because there's share code and tests from illink which are used by AOT

From 9789a53118e8a0dc83fbcabdce55a24d5ba884ef Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 11 Nov 2024 11:28:50 -0800
Subject: [PATCH 3/4] Remove stray quote

---
 eng/Subsets.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index fca306b9668048..435717677dbb6d 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -381,7 +381,7 @@
       Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(NativeAotSupported)' == 'true'"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(_subset.Contains('+tools.cdacreader+'))">
+  <ItemGroup Condition="$(_subset.Contains('+tools.cdacreader+'))">
     <ProjectToBuild Include="$(RepoRoot)\src\native\managed\compile-native.proj" Category="tools" />
   </ItemGroup>
 

From 04aba943eb1a9ef6e60c8872df71bfac241a5042 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 11 Nov 2024 12:50:45 -0800
Subject: [PATCH 4/4] Update Subsets.props

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---
 eng/Subsets.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 435717677dbb6d..0b0a282ba092f8 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -382,7 +382,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+tools.cdacreader+'))">
-    <ProjectToBuild Include="$(RepoRoot)\src\native\managed\compile-native.proj" Category="tools" />
+    <ProjectToBuild Include="$(SharedNativeRoot)managed\compile-native.proj" Category="tools" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+tools.cdacreadertests+'))">