-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Fix macOS preview package identifier detection to use version string #26690
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9f2c29a
Initial plan
Copilot dfa58a3
Fix macOS preview package identifier detection
Copilot e8ce89c
Add unit tests for macOS package identifier detection
Copilot 409217b
Add integration tests for New-MacOSPackage function
Copilot 0d1af8e
Refactor New-MacOSPackage logic into testable function
Copilot 808ffb2
Inline Get-MacOSPackageId into Get-MacOSPackageIdentifierInfo
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| # Copyright (c) Microsoft Corporation. | ||
| # Licensed under the MIT License. | ||
|
|
||
| Describe "Packaging Module Functions" { | ||
| BeforeAll { | ||
| Import-Module $PSScriptRoot/../../build.psm1 -Force | ||
| Import-Module $PSScriptRoot/../../tools/packaging/packaging.psm1 -Force | ||
| } | ||
|
|
||
| Context "Test-IsPreview function" { | ||
| It "Should return True for preview versions" { | ||
| Test-IsPreview -Version "7.6.0-preview.6" | Should -Be $true | ||
| Test-IsPreview -Version "7.5.0-rc.1" | Should -Be $true | ||
| Test-IsPreview -Version "7.4.0-preview.1" | Should -Be $true | ||
| } | ||
|
|
||
| It "Should return False for stable versions" { | ||
| Test-IsPreview -Version "7.6.0" | Should -Be $false | ||
| Test-IsPreview -Version "7.5.0" | Should -Be $false | ||
| Test-IsPreview -Version "7.4.13" | Should -Be $false | ||
| } | ||
|
|
||
| It "Should return False for LTS builds regardless of version string" { | ||
| Test-IsPreview -Version "7.6.0-preview.6" -IsLTS | Should -Be $false | ||
| Test-IsPreview -Version "7.4.0-rc.1" -IsLTS | Should -Be $false | ||
| Test-IsPreview -Version "7.5.0" -IsLTS | Should -Be $false | ||
| } | ||
| } | ||
|
|
||
| Context "Get-MacOSPackageId function" { | ||
| It "Should return preview identifier when -IsPreview is specified" { | ||
| $result = Get-MacOSPackageId -IsPreview | ||
| $result | Should -Be "com.microsoft.powershell-preview" | ||
| } | ||
|
|
||
| It "Should return stable identifier when -IsPreview is not specified" { | ||
| $result = Get-MacOSPackageId | ||
| $result | Should -Be "com.microsoft.powershell" | ||
| } | ||
| } | ||
|
|
||
| Context "macOS preview package identifier detection" { | ||
| It "Should correctly detect preview from version string for preview builds" { | ||
| # Simulate the logic used in New-MacOSPackage | ||
| $Version = "7.6.0-preview.6" | ||
| $LTS = $false | ||
| $Name = "powershell" # Preview builds use "powershell" not "powershell-preview" | ||
|
|
||
| $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS | ||
| $pkgIdentifier = Get-MacOSPackageId -IsPreview:$IsPreview | ||
|
|
||
| $IsPreview | Should -Be $true -Because "Version string contains preview marker" | ||
| $pkgIdentifier | Should -Be "com.microsoft.powershell-preview" -Because "Preview builds should use preview identifier" | ||
| } | ||
|
|
||
| It "Should correctly detect stable from version string for stable builds" { | ||
| # Simulate the logic used in New-MacOSPackage | ||
| $Version = "7.6.0" | ||
| $LTS = $false | ||
| $Name = "powershell" | ||
|
|
||
| $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS | ||
| $pkgIdentifier = Get-MacOSPackageId -IsPreview:$IsPreview | ||
|
|
||
| $IsPreview | Should -Be $false -Because "Version string does not contain preview marker" | ||
| $pkgIdentifier | Should -Be "com.microsoft.powershell" -Because "Stable builds should use stable identifier" | ||
| } | ||
|
|
||
| It "Should treat LTS builds as stable even with preview version string" { | ||
| # Simulate the logic used in New-MacOSPackage | ||
| $Version = "7.4.0-preview.1" | ||
| $LTS = $true | ||
| $Name = "powershell-lts" | ||
|
|
||
| $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS | ||
| $pkgIdentifier = Get-MacOSPackageId -IsPreview:$IsPreview | ||
|
|
||
| $IsPreview | Should -Be $false -Because "LTS flag takes precedence over version string" | ||
| $pkgIdentifier | Should -Be "com.microsoft.powershell" -Because "LTS builds should use stable identifier" | ||
| } | ||
|
|
||
| It "Should NOT use package name for preview detection" { | ||
| # This test verifies the fix for issue #26673 | ||
| # The bug was using ($Name -like '*-preview') which always returned false | ||
| # because preview builds use Name="powershell" not "powershell-preview" | ||
|
|
||
| $Version = "7.6.0-preview.6" | ||
| $LTS = $false | ||
| $Name = "powershell" # This is what preview builds actually use | ||
|
|
||
| # The INCORRECT logic would have been: $Name -like '*-preview' | ||
| $incorrectCheck = $Name -like '*-preview' | ||
| $incorrectCheck | Should -Be $false -Because "Preview package names are 'powershell' not 'powershell-preview'" | ||
|
|
||
| # The CORRECT logic uses Test-IsPreview with Version | ||
| $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS | ||
| $IsPreview | Should -Be $true -Because "Version string correctly identifies preview builds" | ||
|
|
||
| # Verify the correct identifier is generated | ||
| $pkgIdentifier = Get-MacOSPackageId -IsPreview:$IsPreview | ||
| $pkgIdentifier | Should -Be "com.microsoft.powershell-preview" -Because "Preview builds must use preview identifier" | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.