From 028fe9c50bd98d926bbed5d612668d753aa09b24 Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:43:09 -0700 Subject: [PATCH] Build-Toolkit-Components.ps1 to not require PreviewVersion parameter (#207) * Build-Toolkit-Components.ps1 to not require PreviewVersion parameter This is blocking release where we don't have a PreviewVersion postfix to our build number. * Build-Toolkit-Components.ps1 ensure we don't add Postfix flag when not provided to msbuild * Revert "Build-Toolkit-Components.ps1 ensure we don't add Postfix flag when not provided to msbuild" This reverts commit ba0e00a668ccf2fb966df8912664b29ea1cd6027. --- Build-Toolkit-Components.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Build-Toolkit-Components.ps1 b/Build-Toolkit-Components.ps1 index d797d5df..5b3bd3cc 100644 --- a/Build-Toolkit-Components.ps1 +++ b/Build-Toolkit-Components.ps1 @@ -15,7 +15,7 @@ Specifies the date for versioning in 'YYMMDD' format. The default value is the current date. .PARAMETER PreviewVersion - Specifies the preview version to use if packaging is enabled. Appended with a dash after the version number (formatted Version-PreviewVersion). This parameter is required when NupkgOutput is supplied. + Specifies the preview version to use if packaging is enabled. Appended with a dash after the version number (formatted Version-PreviewVersion). This parameter is optional. .PARAMETER NupkgOutput Specifies the output directory for .nupkg files. This parameter is optional. When supplied, the components will also be packed and nupkg files will be output to the specified directory. @@ -114,11 +114,6 @@ if ($ExcludeComponents) { $Components = $Components | Where-Object { $_ -notin $ExcludeComponents } } -# Check if NupkgOutput is supplied without PreviewVersion -if ($NupkgOutput -and -not $PreviewVersion) { - throw "PreviewVersion is required when NupkgOutput is supplied." -} - # Use the specified MultiTarget TFM and WinUI version & $PSScriptRoot\MultiTarget\UseTargetFrameworks.ps1 $MultiTargets & $PSScriptRoot\MultiTarget\UseUnoWinUI.ps1 $WinUIMajorVersion