Skip to content

Commit bd61977

Browse files
Copilotbrianrob
andauthored
Fix TraceEvent NuGet package to exclude Windows-specific native DLLs for non-Windows platforms (#2215)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: brianrob <[email protected]> Co-authored-by: Brian Robbins <[email protected]>
1 parent 9a3d9ae commit bd61977

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'x86' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.dll">
4+
<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">
55
<Link>x86\KernelTraceControl.dll</Link>
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
<Visible>False</Visible>
88
</None>
9-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.Win61.dll') And ('$(ProcessorArchitecture)' == 'x86' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\x86\KernelTraceControl.Win61.dll">
9+
<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">
1010
<Link>x86\KernelTraceControl.Win61.dll</Link>
1111
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1212
<Visible>False</Visible>
1313
</None>
14-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\x86\msdia140.dll') And ('$(ProcessorArchitecture)' == 'x86' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\x86\msdia140.dll">
14+
<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">
1515
<Link>x86\msdia140.dll</Link>
1616
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1717
<Visible>False</Visible>
1818
</None>
19-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\amd64\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'amd64' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\amd64\KernelTraceControl.dll">
19+
<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">
2020
<Link>amd64\KernelTraceControl.dll</Link>
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2222
<Visible>False</Visible>
2323
</None>
24-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\amd64\msdia140.dll') And ('$(ProcessorArchitecture)' == 'amd64' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\amd64\msdia140.dll">
24+
<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">
2525
<Link>amd64\msdia140.dll</Link>
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2727
<Visible>False</Visible>
2828
</None>
29-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\arm64\KernelTraceControl.dll') And ('$(ProcessorArchitecture)' == 'arm64' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\arm64\KernelTraceControl.dll">
29+
<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">
3030
<Link>arm64\KernelTraceControl.dll</Link>
3131
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3232
<Visible>False</Visible>
3333
</None>
34-
<None Condition="Exists('$(MSBuildThisFileDirectory)..\build\native\arm64\msdia140.dll') And ('$(ProcessorArchitecture)' == 'arm64' Or '$(ProcessorArchitecture)' == 'msil')" Include="$(MSBuildThisFileDirectory)..\build\native\arm64\msdia140.dll">
34+
<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">
3535
<Link>arm64\msdia140.dll</Link>
3636
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3737
<Visible>False</Visible>

0 commit comments

Comments
 (0)