From f8c9c4071f0f476f60601a4b40a49ec7384013b8 Mon Sep 17 00:00:00 2001
From: Travis Plunk <github@ez13.net>
Date: Tue, 11 Feb 2025 14:25:49 -0800
Subject: [PATCH 1/4] Add SDK search property

---
 PowerShell.Common.props | 25 ++++++++++++++++++++-----
 build.psm1              |  9 +++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 36e100811a6..b1188ee484e 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -171,15 +171,30 @@
     <DefineConstants>$(DefineConstants);UNIX</DefineConstants>
   </PropertyGroup>
 
-  <!-- Define all OS, debug configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>portable</DebugType>
+  <!-- Define non-windows, all configuration properties -->
+  <PropertyGroup Condition=" '$(IsWindows)' != 'true' ">
+    <DefineConstants>$(DefineConstants);UNIX</DefineConstants>
   </PropertyGroup>
 
-  <!-- Define all OS, release configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <!-- Define properties for Framework dependent deployments in Packages
+        Packages should not use DOTNET_ROOT so we set the search to Global
+  -->
+  <PropertyGroup Condition=" '$(AppDeployment)' == 'FddPackage' ">
+    <AppHostDotNetSearch>Global</AppHostDotNetSearch>
+  </PropertyGroup>
+
+  <!-- Define properties for releases except for Framework dependent deployments as tools
+        Including archives and dotnet tools.
+
+        These tools should use should not be Ready To Run because that will make them runtime specific
+  -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' and '$(AppDeployment)' != 'FddTool' ">
     <PublishReadyToRun>true</PublishReadyToRun>
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+  </PropertyGroup>
+
+  <!-- Define all OS, release configuration properties -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <Optimize>true</Optimize>
     <DebugType>portable</DebugType>
   </PropertyGroup>
diff --git a/build.psm1 b/build.psm1
index d03e763e4f5..1c309e884a3 100644
--- a/build.psm1
+++ b/build.psm1
@@ -490,11 +490,11 @@ Fix steps:
         $Arguments += "/property:IsWindows=false"
     }
 
-    # Framework Dependent builds do not support ReadyToRun as it needs a specific runtime to optimize for.
-    # The property is set in Powershell.Common.props file.
-    # We override the property through the build command line.
+    # Different deployment types build with different properties.
+    # We pass in the AppDeployment property to indicate which type of deployment we are doing.
+    # This allows the PowerShell.Common.props to set the correct properties for the build.
     if(($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) -and $Options.Runtime -notmatch $optimizedFddRegex) {
-        $Arguments += "/property:PublishReadyToRun=false"
+        $Arguments += "/property:AppDeployment=FddTool"
     }
 
     $Arguments += "--configuration", $Options.Configuration
@@ -511,6 +511,7 @@ Fix steps:
     } elseif ($Options.Runtime -match $optimizedFddRegex) {
         $runtime = $Options.Runtime -replace 'fxdependent-', ''
         $Arguments += "--runtime", $runtime
+        $Arguments += "/property:AppDeployment=FddPackage"
     }
 
     if ($ReleaseTag) {

From a84fe0dbd92b0b3eeca7f618702add0422569f1e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 11 Mar 2025 13:26:27 -0700
Subject: [PATCH 2/4] Update PowerShell.Common.props

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 PowerShell.Common.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index b1188ee484e..01e0204c0a2 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -183,8 +183,8 @@
     <AppHostDotNetSearch>Global</AppHostDotNetSearch>
   </PropertyGroup>
 
-  <!-- Define properties for releases except for Framework dependent deployments as tools
-        Including archives and dotnet tools.
+  <!-- Define properties for releases except for framework-dependent deployments as tools,
+        including archives and dotnet tools.
 
         These tools should use should not be Ready To Run because that will make them runtime specific
   -->

From deec47ff027a629d21c08ef51d88bd3414a55839 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 11 Mar 2025 13:26:44 -0700
Subject: [PATCH 3/4] Update PowerShell.Common.props

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 PowerShell.Common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 01e0204c0a2..43eec33a773 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -186,7 +186,7 @@
   <!-- Define properties for releases except for framework-dependent deployments as tools,
         including archives and dotnet tools.
 
-        These tools should use should not be Ready To Run because that will make them runtime specific
+        These tools should not be Ready-to-Run because that will make them runtime specific.
   -->
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' and '$(AppDeployment)' != 'FddTool' ">
     <PublishReadyToRun>true</PublishReadyToRun>

From 8148e34d60b3ebec74b831a8e15fc583b511615f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 11 Mar 2025 13:30:39 -0700
Subject: [PATCH 4/4] Update PowerShell.Common.props

---
 PowerShell.Common.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 43eec33a773..113a48c66a9 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -171,10 +171,10 @@
     <DefineConstants>$(DefineConstants);UNIX</DefineConstants>
   </PropertyGroup>
 
-  <!-- Define non-windows, all configuration properties -->
-  <PropertyGroup Condition=" '$(IsWindows)' != 'true' ">
-    <DefineConstants>$(DefineConstants);UNIX</DefineConstants>
-  </PropertyGroup>
+  <!-- Define all OS, debug configuration properties -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>```
 
   <!-- Define properties for Framework dependent deployments in Packages
         Packages should not use DOTNET_ROOT so we set the search to Global