Update the macos package name for preview releases to match the previous pattern (#26429)

TravisEz13 · Copilot · web-flow · commit 4aa65a77be93 · 2025-11-12T09:36:50.000-08:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/.pipelines/templates/release-validate-packagenames.yml b/.pipelines/templates/release-validate-packagenames.yml
@@ -82,7 +82,7 @@ jobs:
   - pwsh: |
       $message = @()
       Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.pkg | ForEach-Object {
-          if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64|arm64)\.pkg')
+          if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64|arm64)\.pkg')
           {
               $messageInstance = "$($_.Name) is not a valid package name"
               $message += $messageInstance
diff --git a/test/packaging/macos/package-validation.tests.ps1 b/test/packaging/macos/package-validation.tests.ps1
@@ -82,12 +82,13 @@ Describe "Verify macOS Package" {
             $script:package | Should -Not -BeNullOrEmpty
 
             # Regex pattern for valid macOS PKG package names.
+            # This pattern matches the validation used in release-validate-packagenames.yml
             # Valid examples:
-            # - powershell-7.4.13-osx-x64.pkg (Intel x64 - note: x64 with hyphens for compatibility)
-            # - powershell-7.4.13-osx-arm64.pkg (Apple Silicon)
-            # - powershell-preview-7.6.0-preview.6-osx-x64.pkg
-            # - powershell-lts-7.4.13-osx-arm64.pkg
-            $pkgPackageNamePattern = '^powershell(-preview|-lts)?-\d+\.\d+\.\d+(-[a-z]+\.\d+)?-osx-(x64|arm64)\.pkg$'
+            # - powershell-7.4.13-osx-x64.pkg (Stable release)
+            # - powershell-7.6.0-preview.6-osx-x64.pkg (Preview version string)
+            # - powershell-7.4.13-rebuild.5-osx-arm64.pkg (Rebuild version)
+            # - powershell-lts-7.4.13-osx-arm64.pkg (LTS package)
+            $pkgPackageNamePattern = '^powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64|arm64)\.pkg$'
 
             $script:package.Name | Should -Match $pkgPackageNamePattern -Because "Package name should follow the standard naming convention"
         }
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
@@ -1159,15 +1159,12 @@ function New-UnixPackage {
         }
 
         # Determine if the version is a preview version
-        $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS
-
-        # Preview versions have preview in the name
+        # Only LTS packages get a prefix in the name
+        # Preview versions are identified by the version string itself (e.g., 7.6.0-preview.6)
+        # Rebuild versions are also identified by the version string (e.g., 7.4.13-rebuild.5)
         $Name = if($LTS) {
             "powershell-lts"
         }
-        elseif ($IsPreview) {
-            "powershell-preview"
-        }
         else {
             "powershell"
         }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ jobs:`
`82`	`82`	`- pwsh: \|`
`83`	`83`	`$message = @()`
`84`	`84`	`Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.pkg \| ForEach-Object {`
`85`		`- if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64\|arm64)\.pkg')`
	`85`	`+ if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx\-(x64\|arm64)\.pkg')`
`86`	`86`	`{`
`87`	`87`	`$messageInstance = "$($_.Name) is not a valid package name"`
`88`	`88`	`$message += $messageInstance`
Original file line number	Diff line number	Diff line change
`@@ -1159,15 +1159,12 @@ function New-UnixPackage {`
`1159`	`1159`	`}`
`1160`	`1160`
`1161`	`1161`	`# Determine if the version is a preview version`
`1162`		`- $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS`
`1163`		`-`
`1164`		`- # Preview versions have preview in the name`
	`1162`	`+ # Only LTS packages get a prefix in the name`
	`1163`	`+ # Preview versions are identified by the version string itself (e.g., 7.6.0-preview.6)`
	`1164`	`+ # Rebuild versions are also identified by the version string (e.g., 7.4.13-rebuild.5)`
`1165`	`1165`	`$Name = if($LTS) {`
`1166`	`1166`	`"powershell-lts"`
`1167`	`1167`	`}`
`1168`		`- elseif ($IsPreview) {`
`1169`		`- "powershell-preview"`
`1170`		`- }`
`1171`	`1168`	`else {`
`1172`	`1169`	`"powershell"`
`1173`	`1170`	`}`