Skip to content

Commit ce717ac

Browse files
authored
Fix TestReadyToRun to use the in-build crossgen (#120678)
1 parent fe17548 commit ce717ac

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

eng/liveBuilds.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<CoreCLRAotSdkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'aotsdk'))</CoreCLRAotSdkDir>
2929
<CoreCLRBuildIntegrationDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'build'))</CoreCLRBuildIntegrationDir>
3030

31-
<Crossgen2Dir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'crossgen2-published'))</Crossgen2Dir>
3231
<Crossgen2InBuildDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', '$(BuildArchitecture)', 'crossgen2'))</Crossgen2InBuildDir>
3332

3433
<ToolsILLinkDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLink.Tasks', '$(ToolsConfiguration)'))</ToolsILLinkDir>

eng/targetingpacks.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@
124124

125125
<!-- Use local Crossgen2 pack for NetCoreAppCurrent. -->
126126
<Target Name="UpdateLocalCrossgen2Pack"
127-
Condition="'$(UseLocalCrossgen2Pack)' == 'true' and '$(Crossgen2Dir)' != ''"
127+
Condition="'$(UseLocalCrossgen2Pack)' == 'true' and '$(Crossgen2InBuildDir)' != ''"
128128
AfterTargets="ResolveFrameworkReferences">
129129
<ItemGroup>
130-
<ResolvedCrossgen2Pack PackageDirectory="$(Crossgen2Dir)"
130+
<ResolvedCrossgen2Pack PackageDirectory="$(Crossgen2InBuildDir)"
131131
NuGetPackageVersion="$(ProductVersion)" />
132132
</ItemGroup>
133133
</Target>

src/tests/Common/Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
</ItemGroup>
143143

144144
<PropertyGroup>
145-
<Crossgen2Dir />
146145
<Crossgen2Dir Condition="('$(TargetArchitecture)' != 'x64' and '$(BuildArchitecture)' == 'x64') or '$(EnableNativeSanitizers)' != ''">$(CoreCLRArtifactsPath)x64/crossgen2</Crossgen2Dir>
147146
</PropertyGroup>
148147

0 commit comments

Comments
 (0)