mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add support for s390x architecture

Browse source 
* Add linux-s390x RIDs for net6.0 to GenerateBundledVersions

* Add s390x platform in Directory.Build.props

* Disable crossgen2 for the s390x target
This commit is contained in:
Ulrich Weigand 2021-09-03 19:37:57 +02:00
parent 4ee8c9997f
commit f1c05e42af
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Directory.Build.props
View file

@ -10,6 +10,7 @@
<PropertyGroup> <PropertyGroup>
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture> <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Architecture> <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture> <Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(PgoInstrument)' == 'true'"> <PropertyGroup Condition="'$(PgoInstrument)' == 'true'">

1
src/SourceBuild/tarball/content/Directory.Build.props
View file

@ -18,6 +18,7 @@
<Platform Condition="'$(Platform)' == 'AnyCPU'"></Platform> <Platform Condition="'$(Platform)' == 'AnyCPU'"></Platform>
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture> <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
<Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform> <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
<Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Platform>
<Platform Condition="'$(Platform)' == ''">x64</Platform> <Platform Condition="'$(Platform)' == ''">x64</Platform>
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions> <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>

3
src/redist/targets/Crossgen.targets
View file

@ -1,6 +1,7 @@
<Project> <Project>
<!-- Crossgen is currently not supported on the s390x architecture. -->
<Target Name="CrossgenLayout" <Target Name="CrossgenLayout"
Condition="'$(DISABLE_CROSSGEN)' == ''" Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x'"
DependsOnTargets="SetSdkBrandingInfo"> DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup> <PropertyGroup>

2
src/redist/targets/GenerateBundledVersions.targets
View file

@ -105,6 +105,7 @@
<Net60AppHostRids Include=" <Net60AppHostRids Include="
@(Net50AppHostRids); @(Net50AppHostRids);
osx-arm64; osx-arm64;
linux-s390x;
"/> "/>
<Net60RuntimePackRids Include=" <Net60RuntimePackRids Include="
@ -112,6 +113,7 @@
osx-arm64; osx-arm64;
maccatalyst-x64; maccatalyst-x64;
maccatalyst-arm64; maccatalyst-arm64;
linux-s390x;
" /> " />
<!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern --> <!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern -->