From eda2bd62794036c7ba83a2ff6c937206eafb478f Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Thu, 5 Jan 2023 16:34:55 -0800 Subject: [PATCH] Update build to include `WinForms` / `WPF` in all Windows builds (#18859) --- build.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.psm1 b/build.psm1 index 1b9bd8aef3..fd2858ba28 100644 --- a/build.psm1 +++ b/build.psm1 @@ -529,7 +529,7 @@ Fix steps: if ($Options.Runtime -notlike 'fxdependent*' -or $Options.Runtime -match $optimizedFddRegex) { Write-Verbose "Building without shim" -Verbose $sdkToUse = 'Microsoft.NET.Sdk' - if ($Options.Runtime -like 'win7-*' -and !$ForMinimalSize) { + if (($Options.Runtime -like 'win7-*' -or $Options.Runtime -eq 'win-arm64') -and !$ForMinimalSize) { ## WPF/WinForm and the PowerShell GraphicalHost assemblies are included ## when 'Microsoft.NET.Sdk.WindowsDesktop' is used. $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop' @@ -731,7 +731,7 @@ function Restore-PSPackage } else { $sdkToUse = 'Microsoft.NET.Sdk' - if ($Options.Runtime -like 'win7-*' -and !$Options.ForMinimalSize) { + if (($Options.Runtime -like 'win7-*' -or $Options.Runtime -eq 'win-arm64') -and !$Options.ForMinimalSize) { $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop' } }