From bfce1086fb4a11fd9111dfc37edaca8cc493a286 Mon Sep 17 00:00:00 2001
From: Sapana Khemkar <sapana.khemkar@ibm.com>
Date: Thu, 2 Jun 2022 09:21:47 +0000
Subject: [PATCH 1/2] add support to ppc64le platform

---
 Directory.Build.props                            |  1 +
 .../tarball/content/Directory.Build.props        |  1 +
 src/redist/targets/Crossgen.targets              |  2 +-
 .../targets/GenerateBundledVersions.targets      | 16 +++++++++++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 15c9d27b7340..b87eeccca0df 100644
--- a/Directory.Build.props
+++ b/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/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
index 61cc6ff6746a..860785575f7a 100644
--- a/src/SourceBuild/tarball/content/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/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/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index 284b2a593c0a..2eb13111ebaa 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -1,7 +1,7 @@
 <Project>
   <!-- Crossgen is currently not supported on the s390x architecture. -->
   <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/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 81e1600441fb..9a13f57d3a1a 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -159,6 +159,20 @@
           linux-s390x;
           " />
 
+      <Net60AppHostRids Include="
+          @(Net50AppHostRids);
+          osx-arm64;
+          linux-ppc64le;
+          "/>
+
+      <Net60RuntimePackRids Include="
+          @(Net50RuntimePackRids);
+          osx-arm64;
+          maccatalyst-x64;
+          maccatalyst-arm64;
+          linux-ppc64le;
+          " />
+
       <!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern -->
       <Net60RuntimePackRids Remove="browser-wasm" />
 
@@ -232,7 +246,7 @@
 
       <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
       <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);linux-musl-arm;win-arm64" />
-      <AspNetCoreRuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x" />
+      <AspNetCoreRuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x;linux-ppc64le" />
 
       <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
       <WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />

From b089129df09780d13ce59f354f696a66e1b66e30 Mon Sep 17 00:00:00 2001
From: Sapana Khemkar <sapana.khemkar@ibm.com>
Date: Thu, 2 Jun 2022 09:43:35 +0000
Subject: [PATCH 2/2] add linux-ppc64le RID in already present Net60AppHostRids
 and Net60AppHostRids instead adding new tags

---
 src/redist/targets/GenerateBundledVersions.targets | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 9a13f57d3a1a..ea4e0c52641c 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -149,19 +149,6 @@
           @(Net50AppHostRids);
           osx-arm64;
           linux-s390x;
-          "/>
-
-      <Net60RuntimePackRids Include="
-          @(Net50RuntimePackRids);
-          osx-arm64;
-          maccatalyst-x64;
-          maccatalyst-arm64;
-          linux-s390x;
-          " />
-
-      <Net60AppHostRids Include="
-          @(Net50AppHostRids);
-          osx-arm64;
           linux-ppc64le;
           "/>
 
@@ -170,6 +157,7 @@
           osx-arm64;
           maccatalyst-x64;
           maccatalyst-arm64;
+          linux-s390x;
           linux-ppc64le;
           " />