[dotnet-trace] Include librecordtrace.so for local and CI Build (#5631)

#5619 didn't work. This time I
tested these changes on the official build pipeline, and the
BundledTools + .nupkg both worked on my linux-x64 WSL instance.

---------

Co-authored-by: Juan Sebastian Hoyos Ayala <[email protected]>

Author: mdh1418

eng/Versions.props

@@ -36,6 +36,7 @@
     <MicrosoftExtensionsConfigurationVersion>8.0.0</MicrosoftExtensionsConfigurationVersion>
     <MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
     <MicrosoftExtensionsLoggingConfigurationVersion>8.0.1</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftOneCollectRecordTraceVersions>0.1.32221</MicrosoftOneCollectRecordTraceVersions>
     <!-- Need version that understands UseAppFilters sentinel. -->
     <MicrosoftExtensionsLoggingEventSourceVersion>5.0.1</MicrosoftExtensionsLoggingEventSourceVersion>
     <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>

src/Tools/dotnet-trace/dotnet-trace.csproj

@@ -14,8 +14,7 @@
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.OneCollect.RecordTrace" Version="0.1.32221" PrivateAssets="All" GeneratePathProperty="true"
-                      Condition="'$(TargetRid)' != '' and $([System.String]::Copy('$(TargetRid)').StartsWith('linux'))" />
+    <PackageReference Include="Microsoft.OneCollect.RecordTrace" Version="$(MicrosoftOneCollectRecordTraceVersions)" PrivateAssets="All" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
@@ -31,12 +30,18 @@
     <InternalsVisibleTo Include="DotnetTrace.UnitTests" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetRid)' != '' and $([System.String]::Copy('$(TargetRid)').StartsWith('linux'))">
-    <None Include="$(PkgMicrosoft_OneCollect_RecordTrace)/runtimes/$(TargetRid)/native/librecordtrace.so"
-          Pack="true"
-          Visible="false"
-          CopyToOutputDirectory="PreserveNewest"
-          CopyToPublishDirectory="PreserveNewest"
-          Condition="Exists('$(PkgMicrosoft_OneCollect_RecordTrace)/runtimes/$(TargetRid)/native/librecordtrace.so')" />
+  <ItemGroup>
+    <None Include="$(PkgMicrosoft_OneCollect_RecordTrace)/runtimes/linux-x64/native/librecordtrace.so">
+      <Visible>false</Visible>
+      <Link Condition="'$(PublishSingleFile)' != 'true'">runtimes/linux-x64/native/librecordtrace.so</Link>
+      <CopyToOutputDirectory Condition="'$(PublishSingleFile)' != 'true'">PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory Condition="'$(PublishSingleFile)' == 'true' and 'linux-x64' == '$(RuntimeIdentifier)'">PreserveNewest</CopyToPublishDirectory>
+    </None>
+    <None Include="$(PkgMicrosoft_OneCollect_RecordTrace)/runtimes/linux-arm64/native/librecordtrace.so">
+      <Visible>false</Visible>
+      <Link Condition="'$(PublishSingleFile)' != 'true'">runtimes/linux-arm64/native/librecordtrace.so</Link>
+      <CopyToOutputDirectory Condition="'$(PublishSingleFile)' != 'true'">PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory Condition="'$(PublishSingleFile)' == 'true' and 'linux-arm64' == '$(RuntimeIdentifier)'">PreserveNewest</CopyToPublishDirectory>
+    </None>
   </ItemGroup>
 </Project>