Merge branch 'master' into research-nuget-v3-dependency-resolution

PowerShell · Jan 23, 2025 · 9df89d9 · 9df89d9
2 parents ffb9975 + 28d241e
commit 9df89d9
Show file tree

Hide file tree

Showing 32 changed files with 792 additions and 181 deletions.
diff --git a/.ci/test.yml b/.ci/test.yml
@@ -48,7 +48,7 @@ jobs:
   - ${{ parameters.powershellExecutable }}: |
       $modulePath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'TempModules'
       Write-Verbose -Verbose "Install Microsoft.PowerShell.PSResourceGet to temp module path"
-      Save-Module -Name Microsoft.PowerShell.PSResourceGet -MinimumVersion 0.9.0-rc1 -Path $modulePath -AllowPrerelease -Force
+      Save-Module -Name Microsoft.PowerShell.PSResourceGet -Path $modulePath -Force -Verbose
       Write-Verbose -Verbose "Install Pester 4.X to temp module path"
       Save-Module -Name "Pester" -MaximumVersion 4.99 -Path $modulePath -Force
     displayName: Install Microsoft.PowerShell.PSResourceGet and Pester
@@ -59,7 +59,7 @@ jobs:
       Write-Verbose -Verbose "Importing build utilities (buildtools.psd1)"
       Import-Module -Name (Join-Path -Path '${{ parameters.buildDirectory }}' -ChildPath 'buildtools.psd1') -Force
       #
-      Install-ModulePackageForTest -PackagePath "$(System.ArtifactsDirectory)"
+      Install-ModulePackageForTest -PackagePath "$(System.ArtifactsDirectory)" -ErrorAction stop -Verbose
     displayName: Install module for test from downloaded artifact
     workingDirectory: ${{ parameters.buildDirectory }}
 

diff --git a/.pipelines/PSResourceGet-Official.yml b/.pipelines/PSResourceGet-Official.yml
@@ -152,7 +152,7 @@ extends:
           inputs:
             command: 'sign'
             signing_profile: external_distribution
-            files_to_sign: '**\*.psd1;**\*.psm1;**\*.ps1xml;**\Microsoft*.dll'
+            files_to_sign: '**\*.ps1;**\*.psd1;**\*.psm1;**\*.ps1xml;**\Microsoft*.dll'
             search_root: $(signSrcPath)
 
         - pwsh: |

diff --git a/CHANGELOG/1.0.md b/CHANGELOG/1.0.md
@@ -7,6 +7,7 @@
 ## [1.0.5](https://github.com/PowerShell/PSResourceGet/compare/v1.0.4.1...v1.0.5) - 2024-05-13
 
 ### Bug Fixes
+
 - Update `nuget.config` to use PowerShell packages feed (#1649)
 - Refactor V2ServerAPICalls and NuGetServerAPICalls to use object-oriented query/filter builder (#1645 Thanks @sean-r-williams!)
 - Fix unnecessary `and` for version globbing in V2ServerAPICalls (#1644 Thanks again @sean-r-williams!)
@@ -422,7 +423,7 @@ All tests have been reviewed and rewritten as needed.
 
 ## 3.0.0-beta8
 
-### New Features 
+### New Features
 
 - Add `-Type` parameter to `Install-PSResource`
 - Add 'sudo' check for admin privileges in Unix in `Install-PSResource`
@@ -436,7 +437,7 @@ All tests have been reviewed and rewritten as needed.
 
 ## 3.0.0-beta7
 
-### New Features 
+### New Features
 
 - Completed functionality for `Update-PSResource`
 - `Input-Object` parameter for `Install-PSResource`
@@ -499,4 +500,5 @@ All tests have been reviewed and rewritten as needed.
 ## 3.0.0-beta1
 
 ### BREAKING CHANGE
-- Preview version of PowerShellGet. Many features are not fully implemented yet. Please see https://devblogs.microsoft.com/powershell/powershellget-3-0-preview1 for more details.
+
+- Preview version of PowerShellGet. Many features are not fully implemented yet. Please see <https://devblogs.microsoft.com/powershell/powershellget-3-0-preview1> for more details.
diff --git a/CHANGELOG/1.1.md b/CHANGELOG/1.1.md
@@ -0,0 +1,12 @@
+## [1.1.0](https://github.com/PowerShell/PSResourceGet/compare/v1.1.0-rc3...v1.1.0) - 2025-01-09
+
+### Bug Fixes
+
+- Bugfix for publishing .nupkg file to ContainerRegistry repository (#1763)
+- Bugfix for PMPs like Artifactory needing modified filter query parameter to proxy upstream (#1761)
+- Bugfix for ContainerRegistry repository to parse out dependencies from metadata (#1766)
+- Bugfix for Install-PSResource Null pointer occurring when package is present only in upstream feed in ADO (#1760)
+- Bugfix for local repository casing issue on Linux (#1750)
+- Update README.md (#1759)
+- Bug fix for case sensitive License.txt when RequireLicense is specified (#1757)
+- Bug fix for broken -Quiet parameter for Save-PSResource (#1745)
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
@@ -1,4 +1,23 @@
-## [1.1.0-RC1](https://github.com/PowerShell/PSResourceGet/compare/v1.1.0-preview2...v1.1.0-RC1) - 2024-09-13
+## ## [1.1.0-rc3](https://github.com/PowerShell/PSResourceGet/compare/v1.1.0-RC2...v1.1.0-rc3) - 2024-11-15
+
+### Bug Fix
+- Include missing commits
+
+
+## [1.1.0-RC2](https://github.com/PowerShell/PSResourceGet/compare/v1.1.0-RC1...v1.1.0-RC2) - 2024-10-30
+
+### New Features
+- Full Microsoft Artifact Registry integration (#1741)
+
+### Bug Fixes
+
+- Update to use OCI v2 APIs for Container Registry (#1737)
+- Bug fixes for finding and installing from local repositories on Linux machines (#1738)
+- Bug fix for finding package name with 4 part version from local repositories (#1739) 
+
+# Preview Changelog
+
+## [1.1.0-RC1](https://github.com/PowerShell/PSResourceGet/compare/v1.1.0-preview2...v1.1.0-RC1) - 2024-10-22
 
 ### New Features
 
@@ -8,9 +27,9 @@
 
 - Fix packaging name matching when searching in local repositories (#1731)
 - `Compress-PSResource` `-PassThru` now passes `FileInfo` instead of string (#1720)
-- Fix for `Compress-PSResource` not properly compressing scripts  (#1719) 
+- Fix for `Compress-PSResource` not properly compressing scripts  (#1719)
 - Add `AcceptLicense` to Save-PSResource (#1718 Thanks @o-l-a-v!)
-- Better support for NuGet v2 feeds (#1713 Thanks @o-l-a-v!)
+- Better support for Azure DevOps Artifacts NuGet v2 feeds (#1713 Thanks @o-l-a-v!)
 - Better handling of `-WhatIf` support in `Install-PSResource` (#1531 Thanks @o-l-a-v!)
 - Fix for some nupkgs failing to extract due to empty directories (#1707 Thanks @o-l-a-v!)
 - Fix for searching for `-Name *` in `Find-PSResource` (#1706 Thanks @o-l-a-v!)
@@ -34,8 +53,7 @@
 
 ### New Features
 
-- Support for Azure Container Registries (#1495, #1497-#1499, #1501, #1502, #1505, #1522, #1545, #1548, #1550, #1554, #1560, #1567, 
-#1573, #1576, #1587, #1588, #1589, #1594, #1598, #1600, #1602, #1604, #1615)
+- Support for Azure Container Registries (#1495, #1497-#1499, #1501, #1502, #1505, #1522, #1545, #1548, #1550, #1554, #1560, #1567, #1573, #1576, #1587, #1588, #1589, #1594, #1598, #1600, #1602, #1604, #1615)
 
 ### Bug Fixes
 

diff --git a/README.md b/README.md
@@ -83,6 +83,11 @@ C:\> Import-Module C:\Repos\PSResourceGet\out\PSResourceGet
 c:\> PowerShell
 C:\> Import-Module C:\Repos\PSResourceGet\out\PSResourceGet\PSResourceGet.psd1
 ```
+## Module Support Lifecycle 
+Microsoft.PowerShell.PSResourceGet follows the support lifecycle of the version of PowerShell that it ships in. 
+For example, PSResourceGet 1.0.x shipped in PowerShell 7.4 which is an LTS release so it will be supported for 3 years.
+Preview versions of the module, or versions that ship in preview versions of PowerShell are not supported.
+Versions of PSResourceGet that do not ship in a version of PowerShell will be fixed forward.
 
 ## Code of Conduct
 

diff --git a/buildtools.psm1 b/buildtools.psm1
@@ -120,7 +120,23 @@ function Install-ModulePackageForTest {
     }
 
     Write-Verbose -Verbose -Message "Installing module $($config.ModuleName) to build output path $installationPath"
-    Save-PSResource -Name $config.ModuleName -Repository $localRepoName -Path $installationPath -SkipDependencyCheck -Prerelease -Confirm:$false -TrustRepository
+    $psgetModuleBase = (get-command save-psresource).Module.ModuleBase
+    $psgetVersion = (get-command save-psresource).Module.Version.ToString()
+    $psgetPrerelease = (get-command find-psresource).module.PrivateData.PSData.Prerelease
+    Write-Verbose -Verbose -Message "PSResourceGet module base imported: $psgetModuleBase"
+    Write-Verbose -Verbose -Message "PSResourceGet version base imported: $psgetVersion"
+    Write-Verbose -Verbose -Message "PSResourceGet prerelease base imported: $psgetPrerelease"
+    #Save-PSResource -Name $config.ModuleName -Repository $localRepoName -Path $installationPath -SkipDependencyCheck -Prerelease -Confirm:$false -TrustRepository
+
+    Register-PSRepository -Name $localRepoName -SourceLocation $packagePathWithNupkg -InstallationPolicy Trusted -Verbose
+    $psgetv2ModuleBase = (get-command save-module).Module.ModuleBase
+    $psgetv2Version = (get-command save-module).Module.Version.ToString()
+    $psgetv2Prerelease = (get-command save-module).module.PrivateData.PSData.Prerelease
+    Write-Verbose -Verbose -Message "PowerShellGet module base imported: $psgetv2ModuleBase"
+    Write-Verbose -Verbose -Message "PowerShellGet version base imported: $psgetv2Version"
+    Write-Verbose -Verbose -Message "PowerShellGet prerelease base imported: $psgetv2Prerelease"
+    Save-Module -Name $config.ModuleName -Repository $localRepoName -Path $installationPath -Force -Verbose -AllowPrerelease -Confirm:$false
+    Unregister-PSRepository -Name $localRepoName
 
     Write-Verbose -Verbose -Message "Unregistering local package repo: $localRepoName"
     Unregister-PSResourceRepository -Name $localRepoName -Confirm:$false

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.403"
+        "version": "8.0.404"
     }
 }
diff --git a/src/Microsoft.PowerShell.PSResourceGet.psd1 b/src/Microsoft.PowerShell.PSResourceGet.psd1
@@ -46,7 +46,7 @@
         'udres')
     PrivateData = @{
         PSData = @{
-            Prerelease   = 'RC1'
+            # Prerelease   = ''
             Tags         = @('PackageManagement',
                 'PSEdition_Desktop',
                 'PSEdition_Core',
@@ -56,6 +56,34 @@
             ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
             LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
             ReleaseNotes = @'
+## 1.1.0
+
+### Bug Fix
+- Bugfix for publishing .nupkg file to ContainerRegistry repository (#1763)
+- Bugfix for PMPs like Artifactory needing modified filter query parameter to proxy upstream (#1761)
+- Bugfix for ContainerRegistry repository to parse out dependencies from metadata (#1766)
+- Bugfix for Install-PSResource Null pointer occurring when package is present only in upstream feed in ADO (#1760)
+- Bugfix for local repository casing issue on Linux (#1750)
+- Update README.md (#1759)
+- Bug fix for case sensitive License.txt when RequireLicense is specified (#1757)
+- Bug fix for broken -Quiet parameter for Save-PSResource (#1745)
+
+## 1.1.0-rc3
+
+### Bug Fix
+- Include missing commits
+
+## 1.1.0-RC2
+
+### New Features
+- Full Microsoft Artifact Registry integration (#1741)
+
+### Bug Fixes
+
+- Update to use OCI v2 APIs for Container Registry (#1737)
+- Bug fixes for finding and installing from local repositories on Linux machines (#1738)
+- Bug fix for finding package name with 4 part version from local repositories (#1739) 
+
 ## 1.1.0-RC1
 
 ### New Features