Skip to content

Commit d818766

Browse files
authored
Don't restore crossgen packs on unsupported envs (#46944)
1 parent b8c2660 commit d818766

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Installer/redist-installer/Directory.Build.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
<Import Project="targets\BundledManifests.targets" />
1515
<Import Project="targets\BundledDotnetTools.targets" />
1616
<Import Project="targets\GenerateBundledVersions.targets" />
17-
<Import Project="targets\Crossgen.targets" />
17+
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
18+
<Import Project="targets\Crossgen.targets"
19+
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le'" />
1820
<Import Project="targets\GenerateLayout.targets" />
1921
<Import Project="targets\GenerateArchives.targets" Condition="'$(PackInstaller)' != 'false'"/>
2022
<Import Project="targets\GenerateMSIs.targets" />

src/Installer/redist-installer/targets/Crossgen.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<PackageDownload Include="$(RuntimeNETCrossgenPackageName)" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
1313
</ItemGroup>
1414

15-
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
16-
<Target Name="CrossgenLayout"
17-
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le'">
15+
<Target Name="CrossgenLayout">
1816
<PropertyGroup>
1917
<CrossgenPath>$(NuGetPackageRoot)$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
2018
<CreateCrossgenSymbols Condition="'$(CreateCrossgenSymbols)' == ''">true</CreateCrossgenSymbols>

0 commit comments

Comments
 (0)