Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
                    {
                        destination = MakePath(destination, dir.Name);
                    }
                    else if (!ItemExists(destination))
                    {
                        // When destination doesn't exist, check if its parent exists.
                        // If so, treat destination as a container to preserve the source directory name.
                        // This ensures consistent behavior when moving multiple items with wildcards.
                        string parentPath = GetParentPath(destination, null);
                        if (!string.IsNullOrEmpty(parentPath) && ItemExists(parentPath))
                        {
                            // Create the destination directory first
                            CreateDirectory(destination, false);
                            destination = MakePath(destination, dir.Name);
                        }
                    }

                    // Don't allow moving a directory into itself or its sub-directory.
                    string pathWithoutEndingSeparator = Path.TrimEndingDirectorySeparator(path);
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Move-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Move-Item.Tests.ps1
            $renameToPath | Should -FileContentMatchExactly $booContent
        }
    }

    Context "Move-Item with wildcard source and non-existent destination" {
        BeforeEach {
            $sourcePath = "$TESTDRIVE/install"
            $destPath = "$TESTDRIVE/copy"

            # Setup directory structure
            New-Item -ItemType Directory -Path "$sourcePath/bin" -Force | Out-Null
            New-Item -ItemType File -Path "$sourcePath/bin/test.dll" | Out-Null
            New-Item -ItemType Directory -Path "$sourcePath/lib" | Out-Null
            New-Item -ItemType File -Path "$sourcePath/ReadMe.md" -Value "readme content" | Out-Null
            New-Item -ItemType Directory -Path $destPath | Out-Null
        }

        AfterEach {
            Remove-Item "$TESTDRIVE/install" -Recurse -Force -ErrorAction SilentlyContinue
            Remove-Item "$TESTDRIVE/copy" -Recurse -Force -ErrorAction SilentlyContinue
        }

        It "Should preserve directory structure when moving with wildcard to non-existent destination" {
            Move-Item -Path "$sourcePath/*" -Destination "$destPath/app"

            # Verify all items were moved
            "$sourcePath/bin" | Should -Not -Exist
            "$sourcePath/lib" | Should -Not -Exist
            "$sourcePath/ReadMe.md" | Should -Not -Exist

            # Verify directory structure is preserved (bin should not be flattened)
            "$destPath/app/bin" | Should -Exist
            "$destPath/app/bin/test.dll" | Should -Exist
            "$destPath/app/lib" | Should -Exist
            "$destPath/app/ReadMe.md" | Should -Exist
            "$destPath/app/ReadMe.md" | Should -FileContentMatchExactly "readme content"
        }
    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5843,6 +5843,19 @@ protected override void MoveItem(
		{
		destination = MakePath(destination, dir.Name);
		}
		else if (!ItemExists(destination))
iSazonov marked this conversation as resolved. OutdatedShow resolvedHide resolved iSazonov marked this conversation as resolved. OutdatedShow resolvedHide resolved
		{
		// When destination doesn't exist, check if its parent exists.
		// If so, treat destination as a container to preserve the source directory name.
		// This ensures consistent behavior when moving multiple items with wildcards.
iSazonov marked this conversation as resolved. OutdatedShow resolvedHide resolved
		string parentPath = GetParentPath(destination, null);
		if (!string.IsNullOrEmpty(parentPath) && ItemExists(parentPath))
iSazonov marked this conversation as resolved. OutdatedShow resolvedHide resolved
		{
		// Create the destination directory first
		CreateDirectory(destination, false);
		destination = MakePath(destination, dir.Name);
		}
		}

		// Don't allow moving a directory into itself or its sub-directory.
		string pathWithoutEndingSeparator = Path.TrimEndingDirectorySeparator(path);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -110,4 +110,39 @@ Describe "Move-Item tests" -Tag "CI" {
		$renameToPath \| Should -FileContentMatchExactly $booContent
		}
		}

		Context "Move-Item with wildcard source and non-existent destination" {
		BeforeEach {
		$sourcePath = "$TESTDRIVE/install"
		$destPath = "$TESTDRIVE/copy"

		# Setup directory structure
		New-Item -ItemType Directory -Path "$sourcePath/bin" -Force \| Out-Null
		New-Item -ItemType File -Path "$sourcePath/bin/test.dll" \| Out-Null
		New-Item -ItemType Directory -Path "$sourcePath/lib" \| Out-Null
		New-Item -ItemType File -Path "$sourcePath/ReadMe.md" -Value "readme content" \| Out-Null
		New-Item -ItemType Directory -Path $destPath \| Out-Null
		}

		AfterEach {
		Remove-Item "$TESTDRIVE/install" -Recurse -Force -ErrorAction SilentlyContinue
		Remove-Item "$TESTDRIVE/copy" -Recurse -Force -ErrorAction SilentlyContinue
		}

		It "Should preserve directory structure when moving with wildcard to non-existent destination" {
		Move-Item -Path "$sourcePath/*" -Destination "$destPath/app"

		# Verify all items were moved
		"$sourcePath/bin" \| Should -Not -Exist
		"$sourcePath/lib" \| Should -Not -Exist
		"$sourcePath/ReadMe.md" \| Should -Not -Exist

		# Verify directory structure is preserved (bin should not be flattened)
		"$destPath/app/bin" \| Should -Exist
		"$destPath/app/bin/test.dll" \| Should -Exist
		"$destPath/app/lib" \| Should -Exist
		"$destPath/app/ReadMe.md" \| Should -Exist
		"$destPath/app/ReadMe.md" \| Should -FileContentMatchExactly "readme content"
		}
		}
		}