From 3862da466d16c71f453a28277566e4d7b9b31eee Mon Sep 17 00:00:00 2001
From: Max Charlamb <maxcharlamb@microsoft.com>
Date: Thu, 27 Feb 2025 15:32:37 -0500
Subject: [PATCH 1/4] fix condition to only link in native unwinders on Windows
 x64

---
 src/native/managed/cdacreader/src/cdacreader.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/native/managed/cdacreader/src/cdacreader.csproj b/src/native/managed/cdacreader/src/cdacreader.csproj
index f2e86840cd13fd..bcda0fdd338cbe 100644
--- a/src/native/managed/cdacreader/src/cdacreader.csproj
+++ b/src/native/managed/cdacreader/src/cdacreader.csproj
@@ -35,9 +35,9 @@
     <!-- TODO: Link libraries on non-windows platforms. -->
     <!-- https://github.com/dotnet/runtime/issues/112416 -->
     <DirectPInvoke Include="unwinder_cdac_amd64" />
-    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true'" />
+    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'" />
     <DirectPInvoke Include="unwinder_cdac_arm64" />
-    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true'" />
+    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'" />
   </ItemGroup>
 
   <ItemGroup>

From a10ad2d094d3066d6005b887bd5ba07b23f7bdc4 Mon Sep 17 00:00:00 2001
From: Max Charlamb <maxcharlamb@microsoft.com>
Date: Thu, 27 Feb 2025 16:37:25 -0500
Subject: [PATCH 2/4] disable DirectPInvoke except on windows x64

---
 src/native/managed/cdacreader/src/cdacreader.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/native/managed/cdacreader/src/cdacreader.csproj b/src/native/managed/cdacreader/src/cdacreader.csproj
index bcda0fdd338cbe..22bc45de80a245 100644
--- a/src/native/managed/cdacreader/src/cdacreader.csproj
+++ b/src/native/managed/cdacreader/src/cdacreader.csproj
@@ -34,9 +34,9 @@
   <ItemGroup>
     <!-- TODO: Link libraries on non-windows platforms. -->
     <!-- https://github.com/dotnet/runtime/issues/112416 -->
-    <DirectPInvoke Include="unwinder_cdac_amd64" />
+    <DirectPInvoke Include="unwinder_cdac_amd64" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'"/>
     <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'" />
-    <DirectPInvoke Include="unwinder_cdac_arm64" />
+    <DirectPInvoke Include="unwinder_cdac_arm64" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'"/>
     <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'" />
   </ItemGroup>
 

From 3b966f752fe399bda2ba4c22488f84e03f0dd6ac Mon Sep 17 00:00:00 2001
From: Max Charlamb <maxcharlamb@microsoft.com>
Date: Thu, 27 Feb 2025 16:53:42 -0500
Subject: [PATCH 3/4] use TargetArchitecture instead of Platform

---
 src/native/managed/cdacreader/src/cdacreader.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/native/managed/cdacreader/src/cdacreader.csproj b/src/native/managed/cdacreader/src/cdacreader.csproj
index 22bc45de80a245..6339e1a5716a88 100644
--- a/src/native/managed/cdacreader/src/cdacreader.csproj
+++ b/src/native/managed/cdacreader/src/cdacreader.csproj
@@ -34,10 +34,10 @@
   <ItemGroup>
     <!-- TODO: Link libraries on non-windows platforms. -->
     <!-- https://github.com/dotnet/runtime/issues/112416 -->
-    <DirectPInvoke Include="unwinder_cdac_amd64" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'"/>
-    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'" />
-    <DirectPInvoke Include="unwinder_cdac_arm64" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'"/>
-    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'" />
+    <DirectPInvoke Include="unwinder_cdac_amd64" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'"/>
+    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'" />
+    <DirectPInvoke Include="unwinder_cdac_arm64" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'"/>
+    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'" />
   </ItemGroup>
 
   <ItemGroup>

From 875f1a90b6494d8a7019530b050b1356ede9bd38 Mon Sep 17 00:00:00 2001
From: Max Charlamb <maxcharlamb@microsoft.com>
Date: Thu, 27 Feb 2025 17:04:07 -0500
Subject: [PATCH 4/4] fix formatting

---
 src/native/managed/cdacreader/src/cdacreader.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/native/managed/cdacreader/src/cdacreader.csproj b/src/native/managed/cdacreader/src/cdacreader.csproj
index 6339e1a5716a88..a388a2b870eca3 100644
--- a/src/native/managed/cdacreader/src/cdacreader.csproj
+++ b/src/native/managed/cdacreader/src/cdacreader.csproj
@@ -34,10 +34,10 @@
   <ItemGroup>
     <!-- TODO: Link libraries on non-windows platforms. -->
     <!-- https://github.com/dotnet/runtime/issues/112416 -->
-    <DirectPInvoke Include="unwinder_cdac_amd64" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'"/>
-    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'" />
-    <DirectPInvoke Include="unwinder_cdac_arm64" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'"/>
-    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and $(TargetArchitecture) == 'x64'" />
+    <DirectPInvoke Include="unwinder_cdac_amd64" Condition="'$(TargetsWindows)' == 'true' and '$(TargetArchitecture)' == 'x64'"/>
+    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_amd64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(TargetArchitecture)' == 'x64'" />
+    <DirectPInvoke Include="unwinder_cdac_arm64" Condition="'$(TargetsWindows)' == 'true' and '$(TargetArchitecture)' == 'x64'"/>
+    <NativeLibrary Include="$(CoreCLRArtifactsPath)cdaclibs\unwinder_cdac_arm64.lib" Condition="'$(TargetsWindows)' == 'true' and '$(TargetArchitecture)' == 'x64'" />
   </ItemGroup>
 
   <ItemGroup>