Merge branch 'dev' into 'master'

Release v.2.10.0

See merge request fozzy-winadmins/AutomaticMaintenance!20

Author: jeefo93

AutomaticMaintenance.psd1

@@ -1,6 +1,6 @@
 @{
     RootModule        = 'AutomaticMaintenance.psm1'
-    ModuleVersion     = '2.9.1'
+    ModuleVersion     = '2.10.0'
     GUID              = '8e34abf8-40ba-4c68-8bf8-f235cd001d82'
     Author            = 'Kirill Nikolaev'
     CompanyName       = 'Fozzy Inc.'

AutomaticMaintenance.psm1

@@ -44,6 +44,7 @@ $ModuleName = ($MyInvocation.MyCommand.Name).Substring(0, ($MyInvocation.MyComma
 [string]$ModuleWideUpdateSearchCriteria = 'IsInstalled=0 and IsHidden=0'
 
 [bool]$ModuleWideHVVanillaPutInASubfolder = $true
+[bool]$ModuleWideHVVanillaPreserveSourceVhdPathDriveLetter = $false
 
 foreach ($FunctionType in @('Private', 'Public')) {
     $Path = Join-Path -Path $ModulePath -ChildPath ('{0}\*.ps1' -f $FunctionType)

Private/HV-Vanilla/Clear-ComputerWorkloadHVVanilla.ps1

@@ -15,6 +15,7 @@ function Clear-ComputerWorkloadHVVanilla {
         [scriptblock]$DestinationFilter,
         [int]$MaxParallelMigrations,
         [switch]$PutInASubfolder = $ModuleWideHVVanillaPutInASubfolder,
+        [switch]$PreserveSourceVhdPathDriveLetter = $ModuleWideHVVanillaPreserveSourceVhdPathDriveLetter,
         [ref]$DestinationVMHostLock
     )
 
@@ -32,6 +33,7 @@ function Clear-ComputerWorkloadHVVanilla {
         Write-Debug -Message ('$DestinationFilter = {{{0}}}' -f $DestinationFilter)
         Write-Debug -Message ('$MaxParallelMigrations = {0}' -f $MaxParallelMigrations)
         Write-Debug -Message ('$PutInASubfolder = ${0}' -f $PutInASubfolder)
+        Write-Debug -Message ('$PreserveSourceVhdPathDriveLetter = ${0}' -f $PreserveSourceVhdPathDriveLetter)
         Write-Debug -Message ('$DestinationVMHostLock: ''{0}''' -f $DestinationVMHostLock)
         Write-Debug -Message ('$DestinationVMHostLock.Value: ''{0}''' -f $DestinationVMHostLock.Value)
 
@@ -91,8 +93,8 @@ function Clear-ComputerWorkloadHVVanilla {
             Write-Debug -Message ('$DestinationVMHost = Get-VMHost -ComputerName ''{0}''' -f $DestinationVMHostName)
             $DestinationVMHost = Get-VMHost -ComputerName $DestinationVMHostName
             Write-Debug -Message ('$DestinationVMHost: ''{0}''' -f $DestinationVMHost)
-            Write-Debug -Message ('$UnmigratableVMs = Move-VMReliably -DestinationVMHost $DestinationVMHost -Path ''{0}'' -VM $SourceVMs -MaxParallelMigrations {1} -PutInASubfolder:${2}' -f $DestinationVMHostPath, $MaxParallelMigrations, $PutInASubfolder)
-            $UnmigratableVMs = Move-VMReliably -DestinationVMHost $DestinationVMHost -Path $DestinationVMHostPath -VM $SourceVMs -MaxParallelMigrations $MaxParallelMigrations -PutInASubfolder:$PutInASubfolder
+            Write-Debug -Message ('$UnmigratableVMs = Move-VMReliably -DestinationVMHost $DestinationVMHost -Path ''{0}'' -VM $SourceVMs -MaxParallelMigrations {1} -PutInASubfolder:${2} -PreserveSourceVhdPathDriveLetter:${3}' -f $DestinationVMHostPath, $MaxParallelMigrations, $PutInASubfolder, $PreserveSourceVhdPathDriveLetter)
+            $UnmigratableVMs = Move-VMReliably -DestinationVMHost $DestinationVMHost -Path $DestinationVMHostPath -VM $SourceVMs -MaxParallelMigrations $MaxParallelMigrations -PutInASubfolder:$PutInASubfolder -PreserveSourceVhdPathDriveLetter:$PreserveSourceVhdPathDriveLetter
             Write-Debug -Message ('$UnmigratableVMs: ''{0}''' -f [string]$UnmigratableVMs.Name)
             Write-Debug -Message 'if ($UnmigratableVMs)'
             if ($UnmigratableVMs) {

README.md

@@ -125,6 +125,7 @@ There are several variables defined in the .psm1-file, which are used by the mod
 * `[string]$ModuleWideUpdateSearchCriteria` - Criteria for the IUpdateSearcher::Search method (<https://docs.microsoft.com/en-us/windows/desktop/api/wuapi/nf-wuapi-iupdatesearcher-search>)
 
 * `[bool]$ModuleWideHVVanillaPutInASubfolder` - When set to `$true` (default), places vanilla Hyper-V virtual machines in subfolders, named as VMs themselves, therefore mimicking SCVMM behavior. Requires access to WinRM on the target computer and access to the Win32_Directory WMI class.
+* `[bool]$ModuleWideHVVanillaPreserveSourceVhdPathDriveLetter` - When set to `$false` (default), VHDs attached to virtual machines will be placed to the destination directory defined in the "workload" configuration block. When set to `$true`, virtual hard disks of the migrated virtual machines will be placed to the partitions with the same drive letters as on the source host, if such partitions exist.
 
 ## Loading variables from an external source