Fix TraceEvent.props to respect ProcessorArchitecture when RuntimeIdentifier isn't specified (#2249)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: brianrob <[email protected]>
Co-authored-by: Brian Robbins <[email protected]>

Author: Copilot

src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props

@@ -1,37 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'x86' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.dll">
+    <!--
+      These are native dependencies that need to be copied for consumption via pinvoke.
+      They should be copied as follows:
+      - For platform-neutral builds, copy all binaries.
+      - If we know the target architecture but not the runtime identifier, copy the architecture specific binaries.
+      - If we know the target architecture and the runtime identifier, only copy the matching architecture's binaries on Windows.  These binaries are not consumed on non-Windows platforms.
+    -->
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'x86' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.dll">
       <Link>x86\KernelTraceControl.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.Win61.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'x86' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.Win61.dll">
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.Win61.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'x86' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.Win61.dll">
       <Link>x86\KernelTraceControl.Win61.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\msdia140.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'x86' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\x86\msdia140.dll">
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\msdia140.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'x86' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\x86\msdia140.dll">
       <Link>x86\msdia140.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\amd64\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'amd64' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\amd64\KernelTraceControl.dll">
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\amd64\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'amd64' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\amd64\KernelTraceControl.dll">
       <Link>amd64\KernelTraceControl.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\amd64\msdia140.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'amd64' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\amd64\msdia140.dll">
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\amd64\msdia140.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'amd64' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\amd64\msdia140.dll">
       <Link>amd64\msdia140.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\arm64\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'arm64' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\arm64\KernelTraceControl.dll">
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\arm64\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'arm64' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\arm64\KernelTraceControl.dll">
       <Link>arm64\KernelTraceControl.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
-    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\arm64\msdia140.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'arm64' And '$(RuntimeIdentifier)' != '' And $(RuntimeIdentifier.StartsWith('win-'))))" Include="$(MSBuildThisFileDirectory)..\build\native\arm64\msdia140.dll">
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\arm64\msdia140.dll') And ('$(ProcessorArchitecture)' == 'msil' Or ('$(ProcessorArchitecture)' == 'arm64' And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win-')))))" Include="$(MSBuildThisFileDirectory)..\build\native\arm64\msdia140.dll">
       <Link>arm64\msdia140.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>