From 6f97c5562fcfc2f9ea21463307c113e1c3531b48 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 15 Oct 2026 18:28:30 +0000
Subject: [PATCH 1/2] Initial plan


From c225f16e49a8e0f36dfa86f26ce19bac90a5eb30 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 15 Oct 2026 18:53:14 +0000
Subject: [PATCH 2/2] Fix helperildll build race by sharing the Crossgen2 smoke
 build

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../determinism/crossgen2determinism.csproj      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/tests/readytorun/determinism/crossgen2determinism.csproj b/src/tests/readytorun/determinism/crossgen2determinism.csproj
index 44c07855703f35..21f5bc03d3210d 100644
--- a/src/tests/readytorun/determinism/crossgen2determinism.csproj
+++ b/src/tests/readytorun/determinism/crossgen2determinism.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current" InitialTargets="PrepareDLLs">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
     <!-- Needed for CLRTestTargetUnsupported, GCStressIncompatible, CrossGenTest -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
@@ -15,12 +15,20 @@
     <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\crossgen2\crossgen2smoke.csproj" ReferenceOutputAssembly="false" Private="false" />
     <ProjectReference Include="$(TestLibraryProjectPath)" />
   </ItemGroup>
 
-  <Target Name="PrepareDLLs">
-    <MSBuild Projects="..\crossgen2\crossgen2smoke.csproj" Properties="OutputPath=$(OutputPath)\crossgen2smoke" />
-    <Delete Files="$(OutputPath)\crossgen2smoke\crossgen2smoke.sh" />
+  <Target Name="PrepareDLLs" AfterTargets="Build" Condition="'$(CLRTestTargetUnsupported)' != 'true'">
+    <PropertyGroup>
+      <SmokeTestOutputPath>$(BaseOutputPathWithConfig)readytorun/crossgen2/crossgen2smoke</SmokeTestOutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+      <SmokeTestAssemblies Include="$(SmokeTestOutputPath)/crossgen2smoke.dll" />
+      <SmokeTestAssemblies Include="$(SmokeTestOutputPath)/helperdll.dll" />
+      <SmokeTestAssemblies Include="$(SmokeTestOutputPath)/helperildll.dll" />
+    </ItemGroup>
+    <Copy SourceFiles="@(SmokeTestAssemblies)" DestinationFolder="$(OutputPath)/crossgen2smoke" />
   </Target>
 
   <PropertyGroup>