Skip to content

Fix helperildll build race in Crossgen2 determinism test #135878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agocke merged 2 commits into from
Oct 15, 2026
Merged

Fix helperildll build race in Crossgen2 determinism test #135878

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f97c55
Initial plan
Copilot Oct 15, 2026
c225f16
Fix helperildll build race by sharing the Crossgen2 smoke build
Copilot Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/tests/readytorun/determinism/crossgen2determinism.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
Loading