Skip to content

Commit 6a7ac2c

Browse files
[release/10.0.1xx-preview2] Fix GenerateLayout target dependencies when skipping crossgen (#46982)
Co-authored-by: Viktor Hofer <[email protected]>
1 parent 19af8d1 commit 6a7ac2c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
<Import Project="targets\BundledManifests.targets" />
2424
<Import Project="targets\BundledDotnetTools.targets" />
2525
<Import Project="targets\GenerateBundledVersions.targets" />
26-
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
27-
<Import Project="targets\Crossgen.targets"
28-
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le'" />
26+
<Import Project="targets\Crossgen.targets" />
2927
<Import Project="targets\GenerateLayout.targets" />
3028
<Import Project="targets\GenerateArchives.targets" Condition="'$(PackInstaller)' != 'false'"/>
3129
<Import Project="targets\GenerateMSIs.targets" />

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<Project>
22

33
<PropertyGroup>
4+
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
5+
<IsCrossgenSupported Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le'">true</IsCrossgenSupported>
6+
47
<Crossgen2Rid>$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid>
58
<Crossgen2Rid Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SharedFrameworkRid)</Crossgen2Rid>
69

710
<RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(Crossgen2Rid)</RuntimeNETCrossgenPackageName>
811
</PropertyGroup>
912

1013
<!-- Download the runtime package with the crossgen executable in it -->
11-
<ItemGroup>
14+
<ItemGroup Condition="'$(IsCrossgenSupported)' == 'true'">
1215
<PackageDownload Include="$(RuntimeNETCrossgenPackageName)" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
1316
</ItemGroup>
1417

15-
<Target Name="CrossgenLayout">
18+
<Target Name="CrossgenLayout" Condition="'$(IsCrossgenSupported)' == 'true'">
1619
<PropertyGroup>
1720
<CrossgenPath>$(NuGetPackageRoot)$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
1821
<CreateCrossgenSymbols Condition="'$(CreateCrossgenSymbols)' == ''">true</CreateCrossgenSymbols>

0 commit comments

Comments
 (0)