Merge remote-tracking branch 'refs/remotes/upstream/master' into MoveToOras

Author: adityapatwardhan

.ci/ci.yml

@@ -19,6 +19,7 @@ resources:
 
 variables:
   - group: GithubTestingFeedCreds
+  - group: InstallDSC
 
 stages:
 - stage: Build

.ci/test.yml

@@ -11,6 +11,8 @@ jobs:
   pool:
     vmImage: ${{ parameters.imageName }}
   displayName: ${{ parameters.displayName }}
+  variables:
+  - group: InstallDSC
   steps:
   - ${{ parameters.powershellExecutable }}: |
         Install-Module -Name 'Microsoft.PowerShell.SecretManagement' -force -SkipPublisherCheck -AllowClobber
@@ -95,6 +97,83 @@ jobs:
     displayName: 'Setup Azure Artifacts Credential Provider secret'
     condition: eq(${{ parameters.useAzAuth }}, false)
 
+  - pwsh: |
+      $repo = "PowerShell/DSC"
+      $api  = "https://api.github.com/repos/$repo/releases"
+
+      $headers = @{
+          "User-Agent" = "pwsh"
+          "Accept"     = "application/vnd.github+json"
+          "Authorization" = "Bearer $env:GITHUB_TOKEN"
+      }
+
+      # Get releases
+      $releases = Invoke-RestMethod -Uri $api -Headers $headers -RetryIntervalSec 30 -MaximumRetryCount 10
+
+      # Pick latest by publish date (handles prerelease vs stable automatically)
+      $latest = $releases |
+          Sort-Object published_at -Descending |
+          Select-Object -First 1
+
+      Write-Host "Latest version: $($latest.tag_name) (prerelease=$($latest.prerelease))"
+
+      if ($IsWindows) {
+          $assetFilter = "x86_64-pc-windows-msvc"
+      }
+      elseif ($IsMacOs) {
+          $assetFilter = "x86_64-apple-darwin"
+      }
+      else {
+          $assetFilter = "x86_64-linux"
+      }
+
+      $assets = $latest.assets |
+          Where-Object { $_.name -match $assetFilter }
+
+      Write-Host "Filtered assets: $($assets.Count)"
+
+      $selectedAsset = $assets | Select-Object -First 1
+
+      Write-Host "Selected asset: $($selectedAsset.name)"
+
+      $outFile = Join-Path $PWD $selectedAsset.name
+
+      Write-Host "Downloading $($selectedAsset.name)"
+
+      Invoke-WebRequest `
+          -Uri $selectedAsset.browser_download_url `
+          -Headers @{ "User-Agent"="pwsh" } `
+          -OutFile $outFile
+
+
+      if ($IsWindows) {
+        Expand-Archive -Path $outFile -DestinationPath $env:AGENT_TEMPDIRECTORY -Force -Verbose
+      }
+      else {
+        tar -xzf $outFile -C $env:AGENT_TEMPDIRECTORY
+      }
+
+      $executableName = 'dsc'
+      $executableExt = if ($IsWindows) { '.exe' } else { '' }
+
+      $executableFileName = $executableName + $executableExt
+
+      $executable = Get-ChildItem -Path $env:AGENT_TEMPDIRECTORY -File -Recurse -Verbose | Where-Object { $_.Name -eq $executableFileName } | Select-Object -First 1
+
+      if (-not $executable) {
+        throw "Could not find dsc executable in the downloaded package"
+      }
+
+      $dscRoot = Split-Path -Path $executable.FullName -Parent
+
+      $vstsCommandString = "vso[task.setvariable variable=DSC_ROOT]$dscRoot"
+      Write-Host "sending " + $vstsCommandString
+      Write-Host "##$vstsCommandString"
+
+    displayName: 'Install latest DSC v3'
+    env:
+      GITHUB_TOKEN: $(GITHUB_TOKEN)
+
   - pwsh: |
       Get-ChildItem -Path env: | Out-String -width 9999 -Stream | Write-Verbose -Verbose
     displayName: Capture environment

CHANGELOG/preview.md

@@ -1,5 +1,19 @@
 # Preview Changelog
 
+## [1.3.0-preview1](https://github.com/PowerShell/PSResourceGet/compare/v1.2.0..v1.3.0-preview1) - 2026-05-19
+
+### New Features
+- Add `MAR` as default registered repository (#1955)
+- Add concurrent (parallel) execution for `Install-PSResource` workflows (#1950)
+- Add DSC V3 resource for PSResourceGet (#1852)
+
+## Bug fix
+- Bump `Azure.Identity` from `1.17.1` to `1.17.2`(#1994)
+- Bump `Azure.Identity` from `1.14.2` to `1.17.1` and remove deprecated DefaultAzureCredentialOptions from constructor (#1987)
+- Make flaky CI tests more lenient (#1976)
+- Fixing the logic to determine if the current PowerShell session is Windows PowerShell or PowerShell Core (#1974 Thanks @Borgquite!)
+- Include local-copy prerelease string when deciding update applicability in `Update-PSResource` (#1954 Thanks @sean-r-williams!)
+
 ## [1.2.0-rc3](https://github.com/PowerShell/PSResourceGet/compare/v1.2.0-rc2..v1.2.0-rc3) - 2026-02-06
 
 ## Bug fix

doBuild.ps1

@@ -47,6 +47,12 @@ function DoBuild
     Write-Verbose -Verbose -Message "Copying PSResourceRepository.admx to '$BuildOutPath'"
     Copy-Item -Path "${SrcPath}/PSResourceRepository.admx" -Dest "$BuildOutPath" -Force
 
+    Write-Verbose -Verbose -Message "Copying psresourceget.ps1 to '$BuildOutPath'"
+    Copy-Item -Path "${SrcPath}/dsc/psresourceget.ps1" -Dest "$BuildOutPath" -Force
+
+    Write-Verbose -Verbose -Message "Copying resource manifests to '$BuildOutPath'"
+    Copy-Item -Path "${SrcPath}/dsc/*.resource.json" -Dest "$BuildOutPath" -Force
+
     # Build and place binaries
     if ( Test-Path "${SrcPath}/code" ) {
         Write-Verbose -Verbose -Message "Building assembly and copying to '$BuildOutPath'"
@@ -112,6 +118,10 @@ function DoBuild
                 'NuGet.Protocol'
                 'NuGet.Versioning'
                 'OrasProject.Oras'
+                'System.Buffers'
+                'System.ClientModel'
+                'System.Diagnostics.DiagnosticSource'
+                'System.IO.FileSystem.AccessControl'
                 'System.Memory.Data'
                 'System.Security.Cryptography.ProtectedData'
             )

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.419"
+        "version": "8.0.421"
     }
 }

src/Microsoft.PowerShell.PSResourceGet.psd1

@@ -4,7 +4,7 @@
 @{
     RootModule             = './Microsoft.PowerShell.PSResourceGet.dll'
     NestedModules          = @('./Microsoft.PowerShell.PSResourceGet.psm1')
-    ModuleVersion          = '1.2.0'
+    ModuleVersion          = '1.3.0'
     CompatiblePSEditions   = @('Core', 'Desktop')
     GUID                   = 'e4e0bda1-0703-44a5-b70d-8fe704cd0643'
     Author                 = 'Microsoft Corporation'
@@ -50,7 +50,7 @@
         'usres')
     PrivateData = @{
         PSData = @{
-            # Prerelease   = ''
+            Prerelease   = 'preview1'
             Tags         = @('PackageManagement',
                 'PSEdition_Desktop',
                 'PSEdition_Core',
@@ -60,84 +60,19 @@
             ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
             LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
             ReleaseNotes = @'
-## 1.2.0
-
-## 1.2.0-rc3
-
-## Bug fix
-- Packages that depend on a specific version should search for the dependency with NormalizedVersion (#1941)
-
-## 1.2.0-rc2
-
-## Bug fix
-- For packages with dependency on a specific version use specific version instead of version range (#1937)
-
-## 1.2.0-rc1
-
-## Bug fix
-- `WhatIf` parameter should respect provided value instead of simply checking presence (#1925)
-
-## 1.2.0-preview5
+## 1.3.0-preview1
 
 ### New Features
-- Add `Reset-PSResourceRepository` cmdlet to recover from corrupted repository store (#1895)
-- Improve performance of `ContainerRegistry` repositories by caching token (#1920)
-
-## Bug fix
-- Ensure `Update-PSResource` does not re-install dependency packages which already satisfy dependency criteria (#1919)
-- Retrieve non-anonymous access token when publishing to ACR (#1918)
-- Filter out path separators when passing in package names as a parameter for any cmdlet (#1916)
-- Respect `TrustRepository` parameter when using `-RequiredResource` with `Install-PSResource` (#1910)
-- Fix bug with 'PSModuleInfo' property deserialization when validating module manifest (#1909) 
-- Prevent users from setting ApiVersion to 'Unknown' in `Set-PSResourceRepository` and `Register-PSResourceRepository` (#1892)
-
-## 1.2.0-preview4
+- Add `MAR` as default registered repository (#1955)
+- Add concurrent (parallel) execution for `Install-PSResource` workflows (#1950)
+- Add DSC V3 resource for PSResourceGet (#1852)
 
 ## Bug fix
-
-- Fix typos in numerous files (#1875 Thanks @SamErde!)
-- MAR fails to parse RequiredVersion for dependencies (#1876 Thanks @o-l-a-v!)
-- Get-InstalledPSResource -Path don't throw if no subdirectories were found (#1877 Thanks @o-l-a-v!)
-- Handle boolean correctly in RequiredResourceFile for prerelease key (#1843 Thanks @o-l-a-v!)
-- Fix CodeQL configuration (#1886)
-- Add cmdlet aliases: gres, usres, and svres (#1888)
-- Add warning when AuthenticodeCheck is used on non-Windows platforms (#1891)
-- Fix Compress-PSResource ignoring .gitkeep and other dotfiles (#1889)
-- Add CodeQL suppression for ContainerRegistryServerAPICalls (#1897)
-- Fix broken Install-PSResource test with warning condition incorrect (#1899)
-- Uninstall-PSResource should not fail silently when resource was not found or prerelease criteria not met (#1898)
-- Uninstall-PSResource should delete subdirectories without Access Denied error on OneDrive (#1860)
-
-## 1.2.0-preview3
-
-### New Features
-- Pagination for MCR catalog items (#1870)
-
-### Bug Fix
-- Bug fix for CLM issues (#1869)
-- Update `-ModulePrefix` to be a static parameter (#1868)
-- Bug fix for populating all `#Requires` fields in `Update-PSScriptFileInfo` (#1863)
-- Bug fix for populating `Includes` metadata for packages from container registry repositories (#1861)
-- Bug fix for `Find-PSResource` and `Install-PSResource` not retrieving unlisted package versions (#1859)
-
-## 1.2.0-preview2
-
-### New Features
-- Integration of the Azure Artifacts Credential Provider for ADO feeds (#1765)
-
-### Bug Fix
-- Bug fixes for NuGet v3 dependencies (#1841 Thanks @o-l-a-v!)
-- Bug fix for temporary installation path failure when installing PSResources on Linux machines (#1842 Thanks @o-l-a-v!)
-
-## 1.2.0-preview1
-
-### New Features
-- Dependency support for PSResources in v3 repositories (#1778 Thanks @o-l-a-v!)
-
-### Bug Fix
-- Updated dependencies and added connection timeout to improve CI tests reliability (#1829)
-- Improvements in `ContainerRegistry` repositories in listing repository catalog  (#1831)
-- Wildcard attribute added to `-Repository` parameter of `Install-PSResource` (#1808)
+- Bump `Azure.Identity` from `1.17.1` to `1.17.2`(#1994)
+- Bump `Azure.Identity` from `1.14.2` to `1.17.1` and remove deprecated DefaultAzureCredentialOptions from constructor (#1987)
+- Make flaky CI tests more lenient (#1976)
+- Fixing the logic to determine if the current PowerShell session is Windows PowerShell or PowerShell Core (#1974 Thanks @Borgquite!)
+- Include local-copy prerelease string when deciding update applicability in `Update-PSResource` (#1954 Thanks @sean-r-williams!)
 
 See change log (CHANGELOG) at https://github.com/PowerShell/PSResourceGet
 '@

src/code/ContainerRegistryServerAPICalls.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -71,6 +72,16 @@ public ContainerRegistryServerAPICalls(PSRepositoryInfo repository, PSCmdlet cmd
 
         #region Overridden Methods
 
+        public override Task<FindResults> FindVersionAsync(string packageName, string version, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> warningMsgs, ConcurrentQueue<string> debugMsgs, ConcurrentQueue<string> verboseMsgs)
+        {
+            throw new NotImplementedException("FindVersionAsync is not implemented for ContainerRegistryServerAPICalls.");
+        }
+
+        public override Task<FindResults> FindVersionGlobbingAsync(string packageName, VersionRange versionRange, bool includePrerelease, ResourceType type, bool getOnlyLatest, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> warningMsgs, ConcurrentQueue<string> debugMsgs, ConcurrentQueue<string> verboseMsgs)
+        {
+            throw new NotImplementedException("FindVersionGlobbingAsync is not implemented for ContainerRegistryServerAPICalls.");   
+        }
+
         /// <summary>
         /// Find method which allows for searching for all packages from a repository and returns latest version for each.
         /// </summary>
@@ -136,6 +147,12 @@ public override FindResults FindName(string packageName, bool includePrerelease,
             return new FindResults(stringResponse: new string[] { }, hashtableResponse: pkgResult.ToArray(), responseType: containerRegistryFindResponseType);
         }
 
+
+        public override Task<FindResults> FindNameAsync(string packageName, bool includePrerelease, ResourceType type, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> warningMsgs, ConcurrentQueue<string> debugMsgs, ConcurrentQueue<string> verboseMsgs)
+        {
+            throw new NotImplementedException("FindNameAsync is not implemented for ContainerRegistryServerAPICalls.");
+        }
+
         /// <summary>
         /// Find method which allows for searching for single name and tag and returns latest version.
         /// Name: no wildcard support
@@ -292,6 +309,19 @@ public override Stream InstallPackage(string packageName, string packageVersion,
             return results;
         }
 
+        /// <summary>
+        /// Installs a specific package asynchronously.
+        /// User may request to install package with or without providing version (as seen in examples below), but prior to calling this method the package is located and package version determined.
+        /// Therefore, package version should not be null in this method.
+        /// Name: no wildcard support.
+        /// Examples: Install "PowerShellGet" -Version "3.5.0-alpha"
+        ///           Install "PowerShellGet" -Version "3.0.0"
+        /// </summary>
+        public override Task<Stream> InstallPackageAsync(string packageName, string packageVersion, bool includePrerelease, ConcurrentQueue<ErrorRecord> errorMsgs, ConcurrentQueue<string> warningMsgs, ConcurrentQueue<string> debugMsgs, ConcurrentQueue<string> verboseMsgs)
+        {
+            throw new NotImplementedException("FindNameAsync is not implemented for ContainerRegistryServerAPICalls.");
+        }
+
         /// <summary>
         /// Installs a package with version specified.
         /// Version can be prerelease or stable.