Fix platform-aware install regressions

Support root and NuGet RID layouts, scope filtered-content merging per install work item, make the platform tests cross-edition and architecture-safe, and fall back to unauthenticated DSC release lookup for fork builds.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: Justin Chung

.ci/test.yml

@@ -107,6 +107,13 @@ jobs:
           "Authorization" = "Bearer $env:GITHUB_TOKEN"
       }
 
+      # Secret variables are not exposed to fork PR builds. Use the public API without
+      # authentication in that case instead of sending an invalid Authorization header.
+      if ([string]::IsNullOrWhiteSpace($env:GITHUB_TOKEN) -or
+          $env:GITHUB_TOKEN -match '^\$\([^)]+\)$') {
+          $null = $headers.Remove("Authorization")
+      }
+
       # Get releases
       $releases = Invoke-RestMethod -Uri $api -Headers $headers -RetryIntervalSec 30 -MaximumRetryCount 10
 

src/code/InstallHelper.cs

@@ -56,7 +56,6 @@ internal class InstallHelper
         private bool _savePkg;
         private string _runtimeIdentifier;
         private string _targetFramework;
-        private bool _mergeFilteredContent;
         List<string> _pathsToSearch;
         List<string> _pkgNamesToInstall;
         private string _tmpPath;
@@ -410,7 +409,8 @@ private void MoveFilesIntoInstallPath(
             string installPath,
             string newVersion,
             string moduleManifestVersion,
-            string scriptPath)
+            string scriptPath,
+            bool mergeFilteredContent)
         {
             _cmdletPassedIn.WriteDebug("In InstallHelper::MoveFilesIntoInstallPath()");
             // Creating the proper installation path depending on whether pkg is a module or script
@@ -433,7 +433,7 @@ private void MoveFilesIntoInstallPath(
                     Directory.CreateDirectory(newPathParent);
                     Utils.MoveDirectory(tempModuleVersionDir, finalModuleVersionDir);
                 }
-                else if (_mergeFilteredContent && Directory.Exists(finalModuleVersionDir))
+                else if (mergeFilteredContent && Directory.Exists(finalModuleVersionDir))
                 {
                     // Copy only new TFM/RID content into the existing install
                     _cmdletPassedIn.WriteVerbose($"Merging additional platform content from '{tempModuleVersionDir}' into '{finalModuleVersionDir}'");
@@ -570,6 +570,8 @@ private List<PSResourceInfo> InstallPackages(
                     continue;
                 }
 
+                bool mergeFilteredContent = false;
+
                 // Check to see if the pkg is already installed (unless -Reinstall was specified).
                 if (!_reinstall && _packagesOnMachine.Contains($"{pkgToInstall.Name}{pkgVersion}"))
                 {
@@ -580,7 +582,7 @@ private List<PSResourceInfo> InstallPackages(
                     {
                         _cmdletPassedIn.WriteVerbose($"Resource '{pkgToInstall.Name}' with version '{pkgVersion}' is already installed. " +
                             $"Proceeding to merge additional platform content (TargetFramework='{_targetFramework}', RuntimeIdentifier='{_runtimeIdentifier}').");
-                        _mergeFilteredContent = true;
+                        mergeFilteredContent = true;
                     }
                     else
                     {
@@ -606,7 +608,8 @@ private List<PSResourceInfo> InstallPackages(
                 {
                     PkgToInstall = pkgToInstall,
                     PkgVersion = pkgVersion,
-                    TempInstallPath = CreateInstallationTempPath()
+                    TempInstallPath = CreateInstallationTempPath(),
+                    MergeFilteredContent = mergeFilteredContent
                 });
             }
 
@@ -659,7 +662,11 @@ private List<PSResourceInfo> InstallPackages(
 
                     // Parent package and dependencies are now installed to temp directory.
                     // Try to move all package directories from temp directory to final destination.
-                    if (!TryMoveInstallContent(workItem.TempInstallPath, scope, workItem.PackagesHash))
+                    if (!TryMoveInstallContent(
+                        workItem.TempInstallPath,
+                        scope,
+                        workItem.PackagesHash,
+                        workItem.MergeFilteredContent))
                     {
                         _cmdletPassedIn.WriteError(new ErrorRecord(
                             new InvalidOperationException(),
@@ -710,6 +717,7 @@ private sealed class ParentInstallWorkItem
             public string TempInstallPath;
             public ConcurrentDictionary<string, Hashtable> PackagesHash;
             public bool Succeeded;
+            public bool MergeFilteredContent;
             public readonly ConcurrentQueue<ErrorRecord> ErrorMsgs = new();
             public readonly ConcurrentQueue<string> WarningMsgs = new();
             public readonly ConcurrentQueue<string> DebugMsgs = new();
@@ -1410,16 +1418,12 @@ private bool TryExtractToDirectory(string zipPath, string extractPath, out Error
 
                     if (!string.IsNullOrEmpty(_runtimeIdentifier))
                     {
-                        bool hasMatchingRid = archive.Entries.Any(e =>
-                            RuntimePackageHelper.IsRidFolder(e.FullName.Replace('\\', '/').Split('/')[0]) &&
-                            RuntimePackageHelper.ShouldIncludeEntry(e.FullName, _runtimeIdentifier));
+                        IReadOnlyList<string> availableRids = RuntimePackageHelper.GetAvailableRidsFromArchive(archive);
+                        bool hasMatchingRid = availableRids.Any(rid =>
+                            RuntimeIdentifierHelper.IsCompatibleRid(rid, _runtimeIdentifier));
 
                         if (!hasMatchingRid)
                         {
-                            var availableRids = archive.Entries
-                                .Select(e => e.FullName.Replace('\\', '/').Split('/')[0])
-                                .Where(f => RuntimePackageHelper.IsRidFolder(f))
-                                .Distinct(StringComparer.OrdinalIgnoreCase);
                             string available = string.Join(", ", availableRids);
                             _cmdletPassedIn.WriteWarning(
                                 $"The specified RuntimeIdentifier '{_runtimeIdentifier}' was not found in this package. " +
@@ -1662,7 +1666,11 @@ private void WarnIfCrossLineageTfmSkipped(ZipArchive archive, NuGetFramework bes
         /// <summary>
         /// Moves package files/directories from the temp install path into the final install path location.
         /// </summary>
-        private bool TryMoveInstallContent(string tempInstallPath, ScopeType scope, ConcurrentDictionary<string, Hashtable> packagesHash)
+        private bool TryMoveInstallContent(
+            string tempInstallPath,
+            ScopeType scope,
+            ConcurrentDictionary<string, Hashtable> packagesHash,
+            bool mergeFilteredContent)
         {
             _cmdletPassedIn.WriteDebug("In InstallHelper::TryMoveInstallContent()");
             foreach (string pkgName in packagesHash.Keys)
@@ -1687,7 +1695,8 @@ private bool TryMoveInstallContent(string tempInstallPath, ScopeType scope, Conc
                         installPath,
                         newVersion: pkgVersion, // would not have prerelease label in this string
                         moduleManifestVersion: pkgVersion,
-                        scriptPath);
+                        scriptPath,
+                        mergeFilteredContent);
 
                     _cmdletPassedIn.WriteVerbose($"Successfully installed package '{pkgName}' to location '{installPath}'");
 

src/code/RuntimePackageHelper.cs

@@ -13,7 +13,7 @@ namespace Microsoft.PowerShell.PSResourceGet.UtilClasses
     /// Helper class for parsing package runtime assets and filtering during extraction.
     /// Provides functionality to filter runtime-specific assets based on the current platform's RID.
     /// Detects root-level RID folders (e.g., win-x64/native.dll) used by PowerShell modules
-    /// with platform-specific native dependencies.
+    /// and standard NuGet runtime folders (e.g., runtimes/win-x64/native.dll).
     /// </summary>
     internal static class RuntimePackageHelper
     {
@@ -88,30 +88,21 @@ public static bool IsRidFolder(string folderName)
         }
 
         /// <summary>
-        /// Checks if a zip entry path is under a root-level RID folder.
-        /// Detects entries like win-x64/native.dll, linux-arm64/libfoo.so, etc.
+        /// Checks if a zip entry path is under a root-level RID folder or a standard NuGet runtimes folder.
+        /// Detects entries like win-x64/native.dll and runtimes/linux-arm64/native/libfoo.so.
         /// </summary>
         /// <param name="entryFullName">The full path of the zip entry.</param>
         /// <returns>True if the entry is under a RID folder; otherwise, false.</returns>
         public static bool IsRuntimesEntry(string entryFullName)
         {
-            if (string.IsNullOrEmpty(entryFullName))
-            {
-                return false;
-            }
-
-            string normalizedPath = entryFullName.Replace('\\', ZipPathSeparator);
-            string[] segments = normalizedPath.Split(ZipPathSeparator);
-
-            // Pattern: {rid}/... (root-level RID folders like win-x64/native.dll)
-            return segments.Length >= 2 && IsRidFolder(segments[0]);
+            return !string.IsNullOrEmpty(GetRidFromRuntimesEntry(entryFullName));
         }
 
         /// <summary>
-        /// Extracts the RID from a root-level RID folder entry path.
+        /// Extracts the RID from a root-level RID folder or standard NuGet runtimes folder entry path.
         /// </summary>
-        /// <param name="entryFullName">The full path of the zip entry (e.g., "win-x64/native.dll").</param>
-        /// <returns>The RID (e.g., "win-x64"), or null if not under a RID folder.</returns>
+        /// <param name="entryFullName">The full path of the zip entry (e.g., "win-x64/native.dll" or "runtimes/win-x64/native.dll").</param>
+        /// <returns>The RID (e.g., "win-x64"), or null if not under a supported RID folder layout.</returns>
         public static string GetRidFromRuntimesEntry(string entryFullName)
         {
             if (string.IsNullOrEmpty(entryFullName))
@@ -122,6 +113,15 @@ public static string GetRidFromRuntimesEntry(string entryFullName)
             string normalizedPath = entryFullName.Replace('\\', ZipPathSeparator);
             string[] parts = normalizedPath.Split(ZipPathSeparator);
 
+            // Pattern: runtimes/{rid}/... (standard NuGet runtime asset layout)
+            if (parts.Length >= 3 &&
+                string.Equals(parts[0], "runtimes", StringComparison.OrdinalIgnoreCase) &&
+                !string.IsNullOrEmpty(parts[1]))
+            {
+                return parts[1];
+            }
+
+            // Pattern: {rid}/... (root-level RID folders used by PowerShell modules)
             if (parts.Length >= 2 && IsRidFolder(parts[0]))
             {
                 return parts[0];

test/PlatformFilteringTests/PlatformAwareInstall.Tests.ps1

@@ -120,12 +120,13 @@ $depEntriesXml      </group>
         function Get-VersionInstallPath {
             param([object]$PkgInfo)
             $base = $PkgInfo.InstalledLocation
-            $versionPath = Join-Path $base $PkgInfo.Name $PkgInfo.Version.ToString()
+            $version = $PkgInfo.Version.ToString()
+            $namePath = Join-Path -Path $base -ChildPath $PkgInfo.Name
+            $versionPath = Join-Path -Path $namePath -ChildPath $version
             if (Test-Path $versionPath) { return $versionPath }
             # Maybe InstalledLocation already points to name/version
-            if ($base -match "$([regex]::Escape($PkgInfo.Name))[\\/]$([regex]::Escape($PkgInfo.Version.ToString()))$") { return $base }
+            if ($base -match "$([regex]::Escape($PkgInfo.Name))[\\/]$([regex]::Escape($version))$") { return $base }
             # Try name folder only
-            $namePath = Join-Path $base $PkgInfo.Name
             if (Test-Path $namePath) { return $namePath }
             return $base
         }
@@ -494,10 +495,19 @@ $depEntriesXml      </group>
         BeforeAll {
             $script:ridMergePkgName = 'TestRidMergeModule'
             $script:ridMergePkgVersion = '1.0.0'
+            $script:ridMergeForeignRid = if ($script:currentRid -match '^win') {
+                'linux-x64'
+            }
+            elseif ($script:currentRid -match '^osx') {
+                'win-x64'
+            }
+            else {
+                'osx-arm64'
+            }
 
             New-TestNupkg -Name $ridMergePkgName -Version $ridMergePkgVersion `
                 -OutputDir $localRepoDir `
-                -RuntimeIdentifiers @('win-x64', 'linux-x64', 'osx-arm64') `
+                -RuntimeIdentifiers @($script:currentRid, $script:ridMergeForeignRid) `
                 -LibTfms @('netstandard2.0') `
                 -IncludeModuleManifest
         }
@@ -514,8 +524,7 @@ $depEntriesXml      </group>
 
             $installPath = Get-VersionInstallPath $installed
 
-            # Pick a foreign RID
-            $foreignRid = if ($IsWindows) { 'linux-x64' } elseif ($IsMacOS) { 'win-x64' } else { 'osx-arm64' }
+            $foreignRid = $script:ridMergeForeignRid
 
             # Verify foreign RID is not present yet
             Test-Path (Join-Path $installPath $foreignRid) | Should -BeFalse

test/PlatformFilteringTests/RuntimePackageHelper.Tests.ps1

@@ -20,6 +20,10 @@ Describe 'RuntimePackageHelper Tests' -tags 'CI' {
             $InternalHooks::IsRuntimesEntry('runtimes/win-x64/native/file.dll') | Should -BeTrue
         }
 
+        It "Should return true for a root-level RID path" {
+            $InternalHooks::IsRuntimesEntry('win-x64/native/file.dll') | Should -BeTrue
+        }
+
         It "Should return true for runtimes/ path with backslashes" {
             $InternalHooks::IsRuntimesEntry('runtimes\win-x64\native\file.dll') | Should -BeTrue
         }
@@ -52,6 +56,10 @@ Describe 'RuntimePackageHelper Tests' -tags 'CI' {
             $InternalHooks::GetRidFromRuntimesEntry('runtimes/win-x64/native/file.dll') | Should -Be 'win-x64'
         }
 
+        It "Should extract RID from a root-level RID path" {
+            $InternalHooks::GetRidFromRuntimesEntry('win-x64/native/file.dll') | Should -Be 'win-x64'
+        }
+
         It "Should extract RID for linux-musl-x64" {
             $InternalHooks::GetRidFromRuntimesEntry('runtimes/linux-musl-x64/lib/file.dll') | Should -Be 'linux-musl-x64'
         }
@@ -80,6 +88,7 @@ Describe 'RuntimePackageHelper Tests' -tags 'CI' {
         It "Should include runtimes entry for current platform" {
             $currentRid = $InternalHooks::GetCurrentRuntimeIdentifier()
             $InternalHooks::ShouldIncludeEntry("runtimes/$currentRid/native/file.dll") | Should -BeTrue
+            $InternalHooks::ShouldIncludeEntry("$currentRid/native/file.dll") | Should -BeTrue
         }
 
         It "Should include runtimes entry for 'any' RID" {
@@ -119,6 +128,11 @@ Describe 'RuntimePackageHelper Tests' -tags 'CI' {
                 Set-Content -Path (Join-Path $ridNativeDir "test.dll") -Value "dummy"
             }
 
+            # Add a root-level RID folder to verify both supported layouts are discovered.
+            $rootRidDir = Join-Path $testZipDir 'linux-s390x'
+            $null = New-Item $rootRidDir -ItemType Directory -Force
+            Set-Content -Path (Join-Path $rootRidDir 'test.dll') -Value 'dummy'
+
             # Also create a non-runtimes file
             Set-Content -Path (Join-Path $testZipDir "MyModule.psd1") -Value "dummy"
 
@@ -129,10 +143,11 @@ Describe 'RuntimePackageHelper Tests' -tags 'CI' {
 
         It "Should list all RIDs present in the zip" {
             $availableRids = $InternalHooks::GetAvailableRidsFromZipFile($testZipPath)
-            $availableRids.Count | Should -Be 6
+            $availableRids.Count | Should -Be 7
             $availableRids | Should -Contain 'win-x64'
             $availableRids | Should -Contain 'linux-x64'
             $availableRids | Should -Contain 'osx-arm64'
+            $availableRids | Should -Contain 'linux-s390x'
         }
 
         It "Should throw for non-existent file" {