File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
src/Installer/redist-installer Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 23
23
<Import Project =" targets\BundledManifests.targets" />
24
24
<Import Project =" targets\BundledDotnetTools.targets" />
25
25
<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" />
29
27
<Import Project =" targets\GenerateLayout.targets" />
30
28
<Import Project =" targets\GenerateArchives.targets" Condition =" '$(PackInstaller)' != 'false'" />
31
29
<Import Project =" targets\GenerateMSIs.targets" />
Original file line number Diff line number Diff line change 1
1
<Project >
2
2
3
3
<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
+
4
7
<Crossgen2Rid >$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid >
5
8
<Crossgen2Rid Condition =" '$(DotNetBuildSourceOnly)' == 'true'" >$(SharedFrameworkRid)</Crossgen2Rid >
6
9
7
10
<RuntimeNETCrossgenPackageName >microsoft.netcore.app.crossgen2.$(Crossgen2Rid)</RuntimeNETCrossgenPackageName >
8
11
</PropertyGroup >
9
12
10
13
<!-- Download the runtime package with the crossgen executable in it -->
11
- <ItemGroup >
14
+ <ItemGroup Condition = " '$(IsCrossgenSupported)' == 'true' " >
12
15
<PackageDownload Include =" $(RuntimeNETCrossgenPackageName)" Version =" [$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
13
16
</ItemGroup >
14
17
15
- <Target Name =" CrossgenLayout" >
18
+ <Target Name =" CrossgenLayout" Condition = " '$(IsCrossgenSupported)' == 'true' " >
16
19
<PropertyGroup >
17
20
<CrossgenPath >$(NuGetPackageRoot)$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath >
18
21
<CreateCrossgenSymbols Condition =" '$(CreateCrossgenSymbols)' == ''" >true</CreateCrossgenSymbols >
You can’t perform that action at this time.
0 commit comments