Merge master into copilot/add-reset-functionality-to-repository-store

Author: Copilot

.github/CODEOWNERS

@@ -4,4 +4,4 @@
 # the repo. Unless a later match takes precedence,
 # the following owners will be requested for
 # review when someone opens a pull request.
-*       @anamnavi @alerickson @adityapatwardhan @SydneyhSmith
+*       @anamnavi @alerickson @adityapatwardhan @SydneyhSmith @shammu1

CHANGELOG/preview.md

@@ -1,5 +1,22 @@
 # Preview Changelog
 
+## [1.2.0-preview4](https://github.com/PowerShell/PSResourceGet/compare/v1.2.0-preview3..v1.2.0-preview4) - 2025-11-04
+
+## 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](https://github.com/PowerShell/PSResourceGet/compare/v1.2.0-preview2..v1.2.0-preview3) - 2025-09-12
 
 ### New Features

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.414"
+        "version": "8.0.415"
     }
 }

src/Microsoft.PowerShell.PSResourceGet.psd1

@@ -42,12 +42,15 @@
     AliasesToExport = @(
         'Get-PSResource',
         'fdres',
+        'gres',
         'isres',
         'pbres',
-        'udres')
+        'svres',
+        'udres',
+        'usres')
     PrivateData = @{
         PSData = @{
-            Prerelease   = 'preview3'
+            Prerelease   = 'preview4'
             Tags         = @('PackageManagement',
                 'PSEdition_Desktop',
                 'PSEdition_Core',
@@ -57,6 +60,23 @@
             ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
             LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
             ReleaseNotes = @'
+## 1.2.0-preview4
+
+## 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

src/code/ContainerRegistryServerAPICalls.cs

@@ -54,6 +54,8 @@ internal class ContainerRegistryServerAPICalls : ServerApiCall
 
         const string containerRegistryRepositoryListTemplate = "https://{0}/v2/_catalog"; // 0 - registry
 
+        private string _cachedContainterRegistryToken = null;
+
         #endregion
 
         #region Constructor
@@ -68,6 +70,8 @@ public ContainerRegistryServerAPICalls(PSRepositoryInfo repository, PSCmdlet cmd
                 Credentials = networkCredential
             };
 
+            _cachedContainterRegistryToken = null;
+
             _sessionClient = new HttpClient(handler);
             _sessionClient.Timeout = TimeSpan.FromMinutes(10);
             _sessionClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", userAgentString);
@@ -384,6 +388,12 @@ internal string GetContainerRegistryAccessToken(bool needCatalogAccess, out Erro
             string tenantID = string.Empty;
             errRecord = null;
 
+            if (!string.IsNullOrEmpty(_cachedContainterRegistryToken))
+            {
+                _cmdletPassedIn.WriteVerbose("Using cached container registry access token.");
+                return _cachedContainterRegistryToken;
+            }
+
             var repositoryCredentialInfo = Repository.CredentialInfo;
             if (repositoryCredentialInfo != null)
             {
@@ -445,6 +455,9 @@ internal string GetContainerRegistryAccessToken(bool needCatalogAccess, out Erro
                 return null;
             }
 
+            _cmdletPassedIn.WriteVerbose("Container registry access token retrieved.");
+            _cachedContainterRegistryToken = containerRegistryAccessToken;
+
             return containerRegistryAccessToken;
         }
 
@@ -739,7 +752,7 @@ internal Hashtable GetContainerRegistryMetadata(string packageName, string exact
             {
                 using (JsonDocument metadataJSONDoc = JsonDocument.Parse(serverPkgInfo.Metadata))
                 {
-                    string pkgVersionString = String.Empty; 
+                    string pkgVersionString = String.Empty;
                     JsonElement rootDom = metadataJSONDoc.RootElement;
 
                     if (rootDom.TryGetProperty("ModuleVersion", out JsonElement pkgVersionElement))
@@ -1014,6 +1027,7 @@ internal JObject GetHttpResponseJObjectUsingContentHeaders(string url, HttpMetho
                         return null;
                     }
 
+                    // codeql[cs/sensitive-data-transmission] This is expected PSResourceGet behavior to create the content of the request which is only transmitted to the server, not the user. This information is also not exposed back to the user via error or verbose messaging.
                     request.Content = new StringContent(content);
                     request.Content.Headers.Clear();
                     if (contentHeaders != null)

src/code/GetInstalledPSResource.cs

@@ -15,7 +15,7 @@ namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
     /// Returns a single resource or multiple resource.
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "InstalledPSResource")]
-    [Alias("Get-PSResource")]
+    [Alias("Get-PSResource", "gres")]
     [OutputType(typeof(PSResourceInfo))]
     public sealed class GetInstalledPSResourceCommand : PSCmdlet
     {

src/code/InstallHelper.cs

@@ -587,6 +587,16 @@ private List<PSResourceInfo> InstallPackages(
                                     }
                                 }
 
+                                string depPkgNameVersion = $"{depPkg.Name}{depPkg.Version.ToString()}";
+                                if (_packagesOnMachine.Contains(depPkgNameVersion) && !depPkg.IsPrerelease)
+                                {
+                                    // if a dependency package is already installed, do not install it again.
+                                    // to determine if the package version is already installed, _packagesOnMachine is used but it only contains name, version info, not version with prerelease info
+                                    // if the dependency package is found to be prerelease, it is safer to install it (and worse case it reinstalls)
+                                    _cmdletPassedIn.WriteVerbose($"Dependency '{depPkg.Name}' with version '{depPkg.Version}' is already installed.");
+                                    continue;
+                                }
+
                                 packagesHash = BeginPackageInstall(
                                             searchVersionType: VersionType.SpecificVersion,
                                             specificVersion: depVersion,

src/code/InstallPSResource.cs

@@ -487,9 +487,9 @@ private void RequiredResourceHelper(Hashtable reqResourceHash)
                         }
                     }
 
-                    if (pkgParams.Scope == ScopeType.AllUsers)
+                    if (pkgParams.Scope.HasValue && pkgParams.Scope.Value == ScopeType.AllUsers)
                     {
-                        _pathsToInstallPkg = Utils.GetAllInstallationPaths(this, pkgParams.Scope);
+                        _pathsToInstallPkg = Utils.GetAllInstallationPaths(this, pkgParams.Scope.Value);
                     }
 
                     pkgVersion = pkgInstallInfo["version"] == null ? String.Empty : pkgInstallInfo["version"].ToString();
@@ -565,6 +565,16 @@ private void ProcessInstallHelper(string[] pkgNames, string pkgVersion, bool pkg
                     this));
             }
 
+            // When reqResourceParams is provided (via -RequiredResource), use its properties
+            // instead of the cmdlet-level parameters. Only use the property if it was explicitly set (not null).
+            bool acceptLicense = reqResourceParams?.AcceptLicense ?? AcceptLicense;
+            bool quiet = reqResourceParams?.Quiet ?? Quiet;
+            bool reinstall = reqResourceParams?.Reinstall ?? Reinstall;
+            bool trustRepository = reqResourceParams?.TrustRepository ?? TrustRepository;
+            bool noClobber = reqResourceParams?.NoClobber ?? NoClobber;
+            bool skipDependencyCheck = reqResourceParams?.SkipDependencyCheck ?? SkipDependencyCheck;
+            ScopeType scope = reqResourceParams?.Scope ?? Scope;
+
             IEnumerable<PSResourceInfo> installedPkgs = _installHelper.BeginInstallPackages(
                 names: pkgNames,
                 versionRange: versionRange,
@@ -573,19 +583,19 @@ private void ProcessInstallHelper(string[] pkgNames, string pkgVersion, bool pkg
                 versionString: Version,
                 prerelease: pkgPrerelease,
                 repository: pkgRepository,
-                acceptLicense: AcceptLicense,
-                quiet: Quiet,
-                reinstall: Reinstall,
+                acceptLicense: acceptLicense,
+                quiet: quiet,
+                reinstall: reinstall,
                 force: false,
-                trustRepository: TrustRepository,
-                noClobber: NoClobber,
+                trustRepository: trustRepository,
+                noClobber: noClobber,
                 asNupkg: false,
                 includeXml: true,
-                skipDependencyCheck: SkipDependencyCheck,
+                skipDependencyCheck: skipDependencyCheck,
                 authenticodeCheck: AuthenticodeCheck,
                 savePkg: false,
                 pathsToInstallPkg: _pathsToInstallPkg,
-                scope: Scope,
+                scope: scope,
                 tmpPath: _tmpPath,
                 pkgsInstalled: _packagesOnMachine);
 

src/code/InstallPkgParams.cs

@@ -11,15 +11,15 @@ public class InstallPkgParams
     public string Name { get; set; }
     public VersionRange Version { get; set; }
     public string Repository { get; set; }
-    public bool AcceptLicense { get; set; } 
+    public bool? AcceptLicense { get; set; } 
     public bool Prerelease { get; set; }
-    public ScopeType Scope { get; set; }
-    public bool Quiet { get; set; }
-    public bool Reinstall { get; set; }
+    public ScopeType? Scope { get; set; }
+    public bool? Quiet { get; set; }
+    public bool? Reinstall { get; set; }
     public bool Force { get; set; }
-    public bool TrustRepository { get; set; }
-    public bool NoClobber { get; set; }
-    public bool SkipDependencyCheck { get; set; }
+    public bool? TrustRepository { get; set; }
+    public bool? NoClobber { get; set; }
+    public bool? SkipDependencyCheck { get; set; }
 
 
 
@@ -67,8 +67,10 @@ public void SetProperty(string propertyName, string propertyValue, out ErrorReco
                 break;
 
             case "acceptlicense":
-                bool.TryParse(propertyValue, out bool acceptLicenseTmp);
-                AcceptLicense = acceptLicenseTmp;
+                if (!string.IsNullOrWhiteSpace(propertyValue) && bool.TryParse(propertyValue, out bool acceptLicenseTmp))
+                {
+                    AcceptLicense = acceptLicenseTmp;
+                }
                 break;
 
             case "prerelease":
@@ -82,28 +84,38 @@ public void SetProperty(string propertyName, string propertyValue, out ErrorReco
                 break;
 
             case "quiet":
-                bool.TryParse(propertyValue, out bool quietTmp);
-                Quiet = quietTmp;
+                if (!string.IsNullOrWhiteSpace(propertyValue) && bool.TryParse(propertyValue, out bool quietTmp))
+                {
+                    Quiet = quietTmp;
+                }
                 break;
 
             case "reinstall":
-                bool.TryParse(propertyValue, out bool reinstallTmp);
-                Reinstall = reinstallTmp;
+                if (!string.IsNullOrWhiteSpace(propertyValue) && bool.TryParse(propertyValue, out bool reinstallTmp))
+                {
+                    Reinstall = reinstallTmp;
+                }
                 break;
 
             case "trustrepository":
-                bool.TryParse(propertyValue, out bool trustRepositoryTmp);
-                TrustRepository = trustRepositoryTmp;
+                if (!string.IsNullOrWhiteSpace(propertyValue) && bool.TryParse(propertyValue, out bool trustRepositoryTmp))
+                {
+                    TrustRepository = trustRepositoryTmp;
+                }
                 break;
 
             case "noclobber":
-                bool.TryParse(propertyValue, out bool noClobberTmp);
-                NoClobber = noClobberTmp;
+                if (!string.IsNullOrWhiteSpace(propertyValue) && bool.TryParse(propertyValue, out bool noClobberTmp))
+                {
+                    NoClobber = noClobberTmp;
+                }
                 break;
 
             case "skipdependencycheck":
-                bool.TryParse(propertyValue, out bool skipDependencyCheckTmp);
-                SkipDependencyCheck = skipDependencyCheckTmp;
+                if (!string.IsNullOrWhiteSpace(propertyValue) && bool.TryParse(propertyValue, out bool skipDependencyCheckTmp))
+                {
+                    SkipDependencyCheck = skipDependencyCheckTmp;
+                }
                 break;
 
             default:

src/code/Microsoft.PowerShell.PSResourceGet.csproj

@@ -22,9 +22,9 @@
     <PackageReference Include="NuGet.Protocol" Version="6.9.1" />
     <PackageReference Include="PowerShellStandard.Library" Version="7.0.0-preview.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="8.0.6" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Azure.Identity" Version="1.14.0" />
+    <PackageReference Include="Azure.Identity" Version="1.14.2" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
     <Reference Include="System.Web" />
   </ItemGroup>