From 47927a24e03bb27bd218e4dade81b073796d18c6 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 2 Dec 2025 15:57:34 -0800
Subject: [PATCH] [release/v7.6] Update the macos package name for preview
 releases to match the previous pattern (#26562)

---
 .../release-validate-packagenames.yml         |  2 +-
 tools/packaging/packaging.psm1                |  9 +++----
 .../releaseTests/macOSPackage.tests.ps1       | 25 +++++++++++++++++--
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.pipelines/templates/release-validate-packagenames.yml b/.pipelines/templates/release-validate-packagenames.yml
index c717b50f28..6344418cd8 100644
--- 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/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index a55af6a83c..f27ce3acf0 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1147,15 +1147,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"
         }
diff --git a/tools/packaging/releaseTests/macOSPackage.tests.ps1 b/tools/packaging/releaseTests/macOSPackage.tests.ps1
index c1de109156..6e027f8faa 100644
--- a/tools/packaging/releaseTests/macOSPackage.tests.ps1
+++ b/tools/packaging/releaseTests/macOSPackage.tests.ps1
@@ -74,7 +74,28 @@ Describe "Verify macOS Package" {
             $script:package | Should -Not -BeNullOrEmpty -Because "A .pkg file should be created"
             $script:package.Extension | Should -Be ".pkg"
         }
-        
+
+        It "Package name should follow correct naming convention" {
+            $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 (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"
+        }
+
+        It "Package name should NOT use x86_64 with underscores" {
+            $script:package | Should -Not -BeNullOrEmpty
+
+            $script:package.Name | Should -Not -Match 'x86_64' -Because "Package should use 'x64' not 'x86_64' (with underscores) for compatibility"
+        }
+
         It "Package should expand successfully" {
             $script:expandDir | Should -Exist
             Get-ChildItem -Path $script:expandDir | Should -Not -BeNullOrEmpty
@@ -159,4 +180,4 @@ Describe "Verify macOS Package" {
             }
         }
     }
-}
+}
\ No newline at end of file