diff --git a/PowerShell.Common.props b/PowerShell.Common.props index 36e100811a6..113a48c66a9 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -174,12 +174,27 @@ portable + ``` + + + + Global - - + + true true + + + + true portable 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) {