Add merging for when same module, same version exists but different TFM or RID is specified

Justin Chung · Justin Chung · commit 19da4cbfa6c9 · 2026-03-26T13:53:32.000-05:00
diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs
@@ -51,6 +51,7 @@ internal class InstallHelper
         private bool _savePkg;
         private string _runtimeIdentifier;
         private string _targetFramework;
+        private bool _mergeFilteredContent;
         List<string> _pathsToSearch;
         List<string> _pkgNamesToInstall;
         private string _tmpPath;
@@ -424,6 +425,13 @@ private void MoveFilesIntoInstallPath(
                     Directory.CreateDirectory(newPathParent);
                     Utils.MoveDirectory(tempModuleVersionDir, 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}'");
+                    Utils.MergeDirContents(tempModuleVersionDir, finalModuleVersionDir);
+                    Utils.DeleteDirectory(tempModuleVersionDir);
+                }
                 else
                 {
                     _cmdletPassedIn.WriteVerbose($"Temporary module version directory is: '{tempModuleVersionDir}'");
@@ -801,12 +809,24 @@ private Hashtable BeginPackageInstall(
                 string currPkgNameVersion = $"{pkgToInstall.Name}{pkgToInstall.Version}";
                 if (_packagesOnMachine.Contains(currPkgNameVersion))
                 {
-                    _cmdletPassedIn.WriteWarning($"Resource '{pkgToInstall.Name}' with version '{pkgVersion}' is already installed.  If you would like to reinstall, please run the cmdlet again with the -Reinstall parameter");
+                    // When -TargetFramework or -RuntimeIdentifier is explicitly specified, allow re-download
+                    // to merge the additional TFM/RID content into the existing install directory.
+                    bool hasExplicitOverride = !string.IsNullOrEmpty(_targetFramework) || !string.IsNullOrEmpty(_runtimeIdentifier);
+                    if (hasExplicitOverride)
+                    {
+                        _cmdletPassedIn.WriteVerbose($"Resource '{pkgToInstall.Name}' with version '{pkgVersion}' is already installed. " +
+                            $"Proceeding to merge additional platform content (TargetFramework='{_targetFramework}', RuntimeIdentifier='{_runtimeIdentifier}').");
+                        _mergeFilteredContent = true;
+                    }
+                    else
+                    {
+                        _cmdletPassedIn.WriteWarning($"Resource '{pkgToInstall.Name}' with version '{pkgVersion}' is already installed.  If you would like to reinstall, please run the cmdlet again with the -Reinstall parameter");
 
-                    // Remove from tracking list of packages to install.
-                    _pkgNamesToInstall.RemoveAll(x => x.Equals(pkgToInstall.Name, StringComparison.InvariantCultureIgnoreCase));
+                        // Remove from tracking list of packages to install.
+                        _pkgNamesToInstall.RemoveAll(x => x.Equals(pkgToInstall.Name, StringComparison.InvariantCultureIgnoreCase));
 
-                    return packagesHash;
+                        return packagesHash;
+                    }
                 }
             }
 
@@ -1267,6 +1287,54 @@ private bool TryExtractToDirectory(string zipPath, string extractPath, out Error
                             entry.ExtractToFile(destinationPath, overwrite: true);
                         }
                     }
+
+                    // Warn if an explicitly specified TFM or RID had no matching entries in the package
+                    if (!string.IsNullOrEmpty(_targetFramework) && bestLibFramework != null)
+                    {
+                        bool hasMatchingLib = archive.Entries.Any(e =>
+                        {
+                            string n = e.FullName.Replace('\\', '/');
+                            if (!n.StartsWith("lib/", StringComparison.OrdinalIgnoreCase)) return false;
+                            string[] s = n.Split('/');
+                            if (s.Length < 3 || string.IsNullOrEmpty(s[1])) return false;
+                            NuGetFramework fw = NuGetFramework.ParseFolder(s[1]);
+                            return fw != null && !fw.IsUnsupported && fw.Equals(bestLibFramework);
+                        });
+
+                        if (!hasMatchingLib)
+                        {
+                            var availableTfms = archive.Entries
+                                .Select(e => e.FullName.Replace('\\', '/'))
+                                .Where(n => n.StartsWith("lib/", StringComparison.OrdinalIgnoreCase))
+                                .Select(n => n.Split('/'))
+                                .Where(s => s.Length >= 3 && !string.IsNullOrEmpty(s[1]))
+                                .Select(s => s[1])
+                                .Distinct(StringComparer.OrdinalIgnoreCase);
+                            string available = string.Join(", ", availableTfms);
+                            _cmdletPassedIn.WriteWarning(
+                                $"The specified TargetFramework '{_targetFramework}' was not found in this package. " +
+                                $"No lib/ assemblies were installed. Available TFMs: {(string.IsNullOrEmpty(available) ? "none" : available)}");
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(_runtimeIdentifier))
+                    {
+                        bool hasMatchingRid = archive.Entries.Any(e =>
+                            RuntimePackageHelper.IsRidFolder(e.FullName.Replace('\\', '/').Split('/')[0]) &&
+                            RuntimePackageHelper.ShouldIncludeEntry(e.FullName, _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. " +
+                                $"No platform-specific assets were installed. Available RIDs: {(string.IsNullOrEmpty(available) ? "none" : available)}");
+                        }
+                    }
                 }
             }
             catch (Exception e)
@@ -1487,10 +1555,11 @@ private void WarnIfCrossLineageTfmSkipped(ZipArchive archive, NuGetFramework bes
                 {
                     string skippedList = string.Join(", ", skippedLineageTfms);
                     string otherHost = bestIsNetCore ? "Windows PowerShell 5.1" : "PowerShell 7+";
+                    string skippedTfm = skippedLineageTfms.First();
                     _cmdletPassedIn.WriteWarning(
                         $"This package contains assemblies for {skippedList} which were not installed because " +
                         $"the current runtime selected {bestFramework.GetShortFolderName()}. " +
-                        $"If you also use this module on {otherHost}, install it separately from that host.");
+                        $"If you also use this module on {otherHost}, run: Install-PSResource -Name <ModuleName> -TargetFramework '{skippedTfm}'");
                 }
             }
             catch
diff --git a/src/code/Utils.cs b/src/code/Utils.cs
@@ -1760,6 +1760,34 @@ public static void MoveDirectory(
             DeleteDirectory(sourceDirPath);
         }
 
+        /// <summary>
+        /// Merges the contents of a source directory into an existing destination directory.
+        /// Only adds new files and subdirectories; does not delete or overwrite existing content.
+        /// Used when merging additional TFM or RID content into an already-installed module.
+        /// </summary>
+        public static void MergeDirContents(string sourceDirPath, string destDirPath)
+        {
+            if (!Directory.Exists(destDirPath))
+            {
+                Directory.CreateDirectory(destDirPath);
+            }
+
+            foreach (var filePath in Directory.GetFiles(sourceDirPath))
+            {
+                var destFilePath = Path.Combine(destDirPath, Path.GetFileName(filePath));
+                if (!File.Exists(destFilePath))
+                {
+                    File.Copy(filePath, destFilePath);
+                }
+            }
+
+            foreach (var srcSubDirPath in Directory.GetDirectories(sourceDirPath))
+            {
+                var destSubDirPath = Path.Combine(destDirPath, Path.GetFileName(srcSubDirPath));
+                MergeDirContents(srcSubDirPath, destSubDirPath);
+            }
+        }
+
         private static void CopyDirContents(
             string sourceDirPath,
             string destDirPath,
diff --git a/test/PlatformFilteringTests/PlatformAwareInstall.Tests.ps1 b/test/PlatformFilteringTests/PlatformAwareInstall.Tests.ps1
@@ -134,6 +134,12 @@ $depEntriesXml      </group>
         $script:localRepoDir = Join-Path $TestDrive 'platformFilterRepo'
         $null = New-Item $localRepoDir -ItemType Directory -Force
 
+        # Import the local build of the module (handles PS 7.6+ where it ships built-in)
+        $outModulePath = Join-Path $PSScriptRoot '../../out/Microsoft.PowerShell.PSResourceGet'
+        if (Test-Path $outModulePath) {
+            Import-Module $outModulePath -Force
+        }
+
         $script:localRepoName = 'PlatformFilterTestRepo'
         Register-PSResourceRepository -Name $localRepoName -Uri $localRepoDir -Trusted -Force -ErrorAction SilentlyContinue
 
@@ -396,4 +402,166 @@ $depEntriesXml      </group>
             }
         }
     }
+
+
+    Context 'TFM Merge Install (already installed, explicit -TargetFramework)' {
+
+        BeforeAll {
+            $script:tfmMergePkgName = 'TestTfmMergeModule'
+            $script:tfmMergePkgVersion = '1.0.0'
+
+            New-TestNupkg -Name $tfmMergePkgName -Version $tfmMergePkgVersion `
+                -OutputDir $localRepoDir `
+                -LibTfms @('net472', 'net8.0') `
+                -IncludeModuleManifest
+        }
+
+        AfterEach {
+            Uninstall-PSResource $tfmMergePkgName -Version "*" -ErrorAction SilentlyContinue
+        }
+
+        It "Should merge net472 into an existing net8.0 install" -Skip:($PSVersionTable.PSVersion.Major -le 5) {
+            # Step 1: Install normally — should select net8.0 on PS7+
+            Install-PSResource -Name $tfmMergePkgName -Repository $localRepoName -TrustRepository -Version $tfmMergePkgVersion
+            $installed = Get-InstalledPSResource -Name $tfmMergePkgName
+            $installed | Should -Not -BeNullOrEmpty
+
+            $installPath = Get-VersionInstallPath $installed
+            $libDir = Join-Path $installPath 'lib'
+
+            # Verify only net8.0 was installed
+            Test-Path (Join-Path $libDir 'net8.0') | Should -BeTrue
+            Test-Path (Join-Path $libDir 'net472') | Should -BeFalse
+
+            # Step 2: Merge net472 using -TargetFramework
+            Install-PSResource -Name $tfmMergePkgName -Repository $localRepoName -TrustRepository -Version $tfmMergePkgVersion -TargetFramework 'net472'
+
+            # Verify both TFMs are now present
+            Test-Path (Join-Path $libDir 'net8.0') | Should -BeTrue
+            Test-Path (Join-Path $libDir 'net472') | Should -BeTrue
+
+            # Verify the assembly file exists in the merged folder
+            Test-Path (Join-Path $libDir "net472/$tfmMergePkgName.dll") | Should -BeTrue
+        }
+
+        It "Should merge net8.0 into an existing net472 install" -Skip:($PSVersionTable.PSVersion.Major -gt 5) {
+            # Step 1: Install normally on WinPS — should select net472
+            Install-PSResource -Name $tfmMergePkgName -Repository $localRepoName -TrustRepository -Version $tfmMergePkgVersion
+            $installed = Get-InstalledPSResource -Name $tfmMergePkgName
+            $installed | Should -Not -BeNullOrEmpty
+
+            $installPath = Get-VersionInstallPath $installed
+            $libDir = Join-Path $installPath 'lib'
+
+            # Verify only net472 was installed
+            Test-Path (Join-Path $libDir 'net472') | Should -BeTrue
+            Test-Path (Join-Path $libDir 'net8.0') | Should -BeFalse
+
+            # Step 2: Merge net8.0 using -TargetFramework
+            Install-PSResource -Name $tfmMergePkgName -Repository $localRepoName -TrustRepository -Version $tfmMergePkgVersion -TargetFramework 'net8.0'
+
+            # Verify both TFMs are now present
+            Test-Path (Join-Path $libDir 'net472') | Should -BeTrue
+            Test-Path (Join-Path $libDir 'net8.0') | Should -BeTrue
+        }
+
+        It "Should not overwrite existing files during merge" -Skip:($PSVersionTable.PSVersion.Major -le 5) {
+            # Step 1: Install normally — gets net8.0
+            Install-PSResource -Name $tfmMergePkgName -Repository $localRepoName -TrustRepository -Version $tfmMergePkgVersion
+
+            $installed = Get-InstalledPSResource -Name $tfmMergePkgName
+            $installPath = Get-VersionInstallPath $installed
+            $psd1Path = Join-Path $installPath "$tfmMergePkgName.psd1"
+
+            # Record the original .psd1 write time
+            $originalWriteTime = (Get-Item $psd1Path).LastWriteTime
+
+            # Small delay to ensure timestamp difference
+            Start-Sleep -Milliseconds 100
+
+            # Step 2: Merge net472
+            Install-PSResource -Name $tfmMergePkgName -Repository $localRepoName -TrustRepository -Version $tfmMergePkgVersion -TargetFramework 'net472'
+
+            # The .psd1 should NOT have been overwritten
+            $newWriteTime = (Get-Item $psd1Path).LastWriteTime
+            $newWriteTime | Should -Be $originalWriteTime
+        }
+    }
+
+
+    Context 'RID Merge Install (already installed, explicit -RuntimeIdentifier)' {
+
+        BeforeAll {
+            $script:ridMergePkgName = 'TestRidMergeModule'
+            $script:ridMergePkgVersion = '1.0.0'
+
+            New-TestNupkg -Name $ridMergePkgName -Version $ridMergePkgVersion `
+                -OutputDir $localRepoDir `
+                -RuntimeIdentifiers @('win-x64', 'linux-x64', 'osx-arm64') `
+                -LibTfms @('netstandard2.0') `
+                -IncludeModuleManifest
+        }
+
+        AfterEach {
+            Uninstall-PSResource $ridMergePkgName -Version "*" -ErrorAction SilentlyContinue
+        }
+
+        It "Should merge a foreign RID into an existing install" {
+            # Step 1: Install normally — gets current platform RID
+            Install-PSResource -Name $ridMergePkgName -Repository $localRepoName -TrustRepository -Version $ridMergePkgVersion
+            $installed = Get-InstalledPSResource -Name $ridMergePkgName
+            $installed | Should -Not -BeNullOrEmpty
+
+            $installPath = Get-VersionInstallPath $installed
+
+            # Pick a foreign RID
+            $foreignRid = if ($IsWindows) { 'linux-x64' } elseif ($IsMacOS) { 'win-x64' } else { 'osx-arm64' }
+
+            # Verify foreign RID is not present yet
+            Test-Path (Join-Path $installPath $foreignRid) | Should -BeFalse
+
+            # Step 2: Merge foreign RID
+            Install-PSResource -Name $ridMergePkgName -Repository $localRepoName -TrustRepository -Version $ridMergePkgVersion -RuntimeIdentifier $foreignRid
+
+            # Verify both RIDs are now present
+            $currentRidDir = Join-Path $installPath $script:currentRid
+            $foreignRidDir = Join-Path $installPath $foreignRid
+            Test-Path $currentRidDir | Should -BeTrue
+            Test-Path $foreignRidDir | Should -BeTrue
+        }
+    }
+
+
+    Context 'Missing TFM/RID Validation Warnings' {
+
+        BeforeAll {
+            $script:warnPkgName = 'TestMissingTfmRidModule'
+            $script:warnPkgVersion = '1.0.0'
+
+            # Package only has net8.0 and win-x64
+            New-TestNupkg -Name $warnPkgName -Version $warnPkgVersion `
+                -OutputDir $localRepoDir `
+                -RuntimeIdentifiers @('win-x64') `
+                -LibTfms @('net8.0') `
+                -IncludeModuleManifest
+        }
+
+        AfterEach {
+            Uninstall-PSResource $warnPkgName -Version "*" -ErrorAction SilentlyContinue
+        }
+
+        It "Should warn when -TargetFramework does not exist in the package" {
+            $warnings = $null
+            Install-PSResource -Name $warnPkgName -Repository $localRepoName -TrustRepository -Version $warnPkgVersion -TargetFramework 'net472' -WarningVariable warnings
+            $warnings | Should -Not -BeNullOrEmpty
+            ($warnings | Out-String) | Should -BeLike "*net472*not found*"
+        }
+
+        It "Should warn when -RuntimeIdentifier does not exist in the package" {
+            $warnings = $null
+            Install-PSResource -Name $warnPkgName -Repository $localRepoName -TrustRepository -Version $warnPkgVersion -RuntimeIdentifier 'linux-arm64' -WarningVariable warnings
+            $warnings | Should -Not -BeNullOrEmpty
+            ($warnings | Out-String) | Should -BeLike "*linux-arm64*not found*"
+        }
+    }
 }
