99 lines
5.6 KiB
Diff
99 lines
5.6 KiB
Diff
From 564e481e39511d214d0d26dd902022decd0d93ea Mon Sep 17 00:00:00 2001
|
|
From: Swapnali911 <Swapnali.Pawar1@ibm.com>
|
|
Date: Fri, 30 Sep 2022 05:07:55 -0400
|
|
Subject: [PATCH] Adding ppc64le arch for source build
|
|
|
|
---
|
|
Directory.Build.props | 1 +
|
|
src/SourceBuild/tarball/content/Directory.Build.props | 1 +
|
|
src/redist/targets/Crossgen.targets | 4 ++--
|
|
src/redist/targets/GenerateBundledVersions.targets | 9 ++++++---
|
|
4 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Directory.Build.props b/Directory.Build.props
|
|
index 61cc6ff6746..860785575f7 100644
|
|
--- a/Directory.Build.props
|
|
+++ b/Directory.Build.props
|
|
@@ -19,6 +19,7 @@
|
|
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
|
|
<Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
|
|
<Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Platform>
|
|
+ <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Platform>
|
|
<Platform Condition="'$(Platform)' == ''">x64</Platform>
|
|
|
|
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
|
|
diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
|
|
index 15c9d27b734..b87eeccca0d 100644
|
|
--- a/src/installer/Directory.Build.props
|
|
+++ b/src/installer/Directory.Build.props
|
|
@@ -11,6 +11,7 @@
|
|
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
|
|
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Architecture>
|
|
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
|
|
+ <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
|
|
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(PgoInstrument)' == 'true'">
|
|
diff --git a/src/installer/src/redist/targets/Crossgen.targets b/src/installer/src/redist/targets/Crossgen.targets
|
|
index c7a7642e4eb..da7d186a152 100644
|
|
--- a/src/installer/src/redist/targets/Crossgen.targets
|
|
+++ b/src/installer/src/redist/targets/Crossgen.targets
|
|
@@ -1,7 +1,7 @@
|
|
<Project>
|
|
- <!-- Crossgen is currently not supported on the s390x architecture. -->
|
|
+ <!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
|
|
<Target Name="CrossgenLayout"
|
|
- Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x'"
|
|
+ Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le'"
|
|
DependsOnTargets="SetSdkBrandingInfo">
|
|
|
|
<PropertyGroup>
|
|
diff --git a/src/installer/src/redist/targets/GenerateBundledVersions.targets b/src/installer/src/redist/targets/GenerateBundledVersions.targets
|
|
index d1bee676355..58d1abfa720 100644
|
|
--- a/src/installer/src/redist/targets/GenerateBundledVersions.targets
|
|
+++ b/src/installer/src/redist/targets/GenerateBundledVersions.targets
|
|
@@ -168,6 +168,7 @@
|
|
linux-bionic-arm64;
|
|
linux-bionic-x64;
|
|
linux-bionic-x86;
|
|
+ linux-ppc64le;
|
|
"/>
|
|
|
|
<Net70RuntimePackRids Include="
|
|
@@ -176,6 +177,7 @@
|
|
linux-bionic-arm64;
|
|
linux-bionic-x64;
|
|
linux-bionic-x86;
|
|
+ linux-ppc64le;
|
|
" />
|
|
|
|
<NetCoreAppHostRids Include="
|
|
@@ -254,7 +256,8 @@
|
|
|
|
<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
|
|
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);linux-musl-arm;win-arm64" />
|
|
- <AspNetCoreRuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x" />
|
|
+ <AspNetCore60RuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x" />
|
|
+ <AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" />
|
|
|
|
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
|
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
|
@@ -444,7 +447,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
|
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
|
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
|
- RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
|
|
+ RuntimePackRuntimeIdentifiers="@(AspNetCore70RuntimePackRids, '%3B')"
|
|
RuntimePackExcludedRuntimeIdentifiers="android"
|
|
/>
|
|
|
|
@@ -569,7 +572,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
|
TargetingPackVersion="$(_AspNet60TargetingPackVersion)"
|
|
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
|
- RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
|
|
+ RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')"
|
|
/>
|
|
|
|
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|