Attempt to copy userevents assets for CI

Author: mdh1418

src/tests/build.proj

@@ -39,8 +39,7 @@
     <RestoreProjects Include="Common\XHarnessRunnerLibrary\XHarnessRunnerLibrary.csproj" />
     <RestoreProjects Include="Common\external\external.csproj" />
     <RestoreProjects Include="Common\ilasm\ilasm.ilproj" />
-    <RestoreProjects Include="tracing\eventpipe\userevents\userevents.csproj"
-                     Condition="'$(TargetOS)' == 'linux'"/>
+    <RestoreProjects Include="tracing\eventpipe\userevents\userevents.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/tests/tracing/eventpipe/userevents/userevents.cs

@@ -65,11 +65,6 @@ public static int TestEntryPoint()
             recordTraceProcess.BeginOutputReadLine();
             recordTraceProcess.ErrorDataReceived += (_, args) => Console.Error.WriteLine($"[record-trace] {args.Data}");
             recordTraceProcess.BeginErrorReadLine();
-            if (recordTraceProcess.HasExited && recordTraceProcess.ExitCode != 0)
-            {
-                Console.Error.WriteLine($"record-trace exited prematurely with code {recordTraceProcess.ExitCode}");
-                return -1;
-            }
             Console.WriteLine($"record-trace started with PID: {recordTraceProcess.Id}");
 
             ProcessStartInfo traceeStartInfo = new();

src/tests/tracing/eventpipe/userevents/userevents.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.OneCollect.RecordTrace" Version="$(MicrosoftOneCollectRecordTraceVersion)" PrivateAssets="All" Condition="'$(TargetOS)' == 'linux'" />
+    <PackageReference Include="Microsoft.OneCollect.RecordTrace" Version="$(MicrosoftOneCollectRecordTraceVersion)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -16,14 +16,49 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="dotnet-common.script" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="dotnet-common.script">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>dotnet-common.script</TargetPath>
+    </Content>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetOS)' == 'linux'">
-    <None Include="$(NuGetPackageRoot)microsoft.onecollect.recordtrace/$(MicrosoftOneCollectRecordTraceVersion)/runtimes/$(TargetOS)-$(TargetArchitecture)/native/record-trace">
-      <Link>record-trace</Link>
-      <Visible>false</Visible>
+  <ItemGroup Condition="'$(TargetOS)' != 'AnyOS'">
+    <Content Include="$(NuGetPackageRoot)microsoft.onecollect.recordtrace/$(MicrosoftOneCollectRecordTraceVersion)/runtimes/$(TargetOS)-$(TargetArchitecture)/native/record-trace">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+      <TargetPath>record-trace</TargetPath>
+    </Content>
   </ItemGroup>
+
+  <!-- CI Build Include all record-trace variants in building the managed test components -->
+  <!-- Afterwards, when copying the native project binaries, try to copy the specific one when we have a TargetOS -->
+  <ItemGroup Condition="'$(TargetOS)' == 'AnyOS'">
+    <Content Include="$(NuGetPackageRoot)microsoft.onecollect.recordtrace/$(MicrosoftOneCollectRecordTraceVersion)/runtimes/linux-x64/native/record-trace">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>linux-x64/record-trace</TargetPath>
+    </Content>
+    <Content Include="$(NuGetPackageRoot)microsoft.onecollect.recordtrace/$(MicrosoftOneCollectRecordTraceVersion)/runtimes/linux-arm64/native/record-trace">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>linux-arm64/record-trace</TargetPath>
+    </Content>
+  </ItemGroup>
+
+  <Target Name="CopyRidSpecificRecordTrace" AfterTargets="CopyAllNativeTestProjectBinaries">
+    <PropertyGroup>
+      <RecordTraceRidSubdir Condition="'$(TargetArchitecture)' == 'x64'">linux-x64</RecordTraceRidSubdir>
+      <RecordTraceRidSubdir Condition="'$(TargetArchitecture)' == 'arm64'">linux-arm64</RecordTraceRidSubdir>
+      <RecordTraceSource>$(OutputPath)$(RecordTraceRidSubdir)/record-trace</RecordTraceSource>
+      <RecordTraceDest>$(OutputPath)record-trace</RecordTraceDest>
+    </PropertyGroup>
+
+    <Copy
+      SourceFiles="$(RecordTraceSource)"
+      DestinationFiles="$(RecordTraceDest)"
+      Condition="Exists('$(RecordTraceSource)')"
+      SkipUnchangedFiles="true" />
+
+    <Exec Command="chmod +x '$(RecordTraceDest)'" Condition="Exists('$(RecordTraceDest)')" />
+
+    <Message Text="Copied RID-specific record-trace from $(RecordTraceSource) to $(RecordTraceDest)" Importance="High" Condition="Exists('$(RecordTraceSource)')" />
+    <Warning Text="record-trace not found at $(RecordTraceSource) for RID $(RecordTraceRidSubdir)" Condition="!Exists('$(RecordTraceSource)')" />
+  </Target>
 </Project>