Merge pull request #8 from Bernd-Loehlein/patch-1

Update Run-WVDHostOperations.ps1

Author: cocallaw

VMScripts/Run-WVDHostOperations.ps1

@@ -21,14 +21,18 @@ if ($PreStageOnly -eq "T") {
     }
     $AssetstartDTM = (Get-Date)
     #Download Current Version of WVD Agent 
-    #Invoke-WebRequest -Uri $infraURI -OutFile "$WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi"
-    Start-BitsTransfer -Source $infraURI -Destination "$WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi"
+    try {
+	    Start-BitsTransfer -Source $infraURI -Destination "$WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi"
+    }
+    catch{
+	    Invoke-WebRequest -Uri $infraURI -OutFile "$WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi"
+    }
     Write-Host "Downloaded RDInfra Agent"
     $AssetendDTM = (Get-Date)
     Write-Host "Agent Download Time: $(($AssetendDTM-$AssetstartDTM).totalseconds) seconds"
 }
 if ($UpdateOnly -eq "T") {
-    $tp = Test-Path -Path "C:\WVDMigrate\Microsoft.RDInfra.RDAgent.Installer-x64.msi" -PathType leaf
+    $tp = Test-Path -Path "$WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi" -PathType leaf
     if ($tp -eq $true) {
         Write-Host "WVD Infra Agent Found at" $WVDMigrateInfraPath 
     }
@@ -41,13 +45,16 @@ if ($UpdateOnly -eq "T") {
     Write-Host "Uninstalling any previous versions of RDInfra Agent on VM"
     $RDInfraApps = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -eq "Remote Desktop Services Infrastructure Agent" }
     foreach ($app in $RDInfraApps) {
-        Write-Host "Uninstalling Infra Agent $app.Version"
+        Write-Host "Uninstalling Infra Agent" $app.Version
         $app.Uninstall()
     }
-    $AgentInstaller = (Get-ChildItem $WVDMigrateInfraPath\ -Filter *.msi | Select-Object).FullName
-    $RegistrationToken = $HostPoolToken
-    Write-Host "Starting install of $AgentInstaller"
-    $agent_deploy_status = Start-Process -FilePath "msiexec.exe" -ArgumentList "/i $AgentInstaller", "/quiet", "/qn", "/norestart", "/passive", "REGISTRATIONTOKEN=$RegistrationToken", "/l* $WVDMigrateInfraPath\AgentInstall.txt" -Wait -Passthru
+    $RDInfraApps = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -eq "Remote Desktop Services Infrastructure Agent" }
+    if ($RDInfraApps.Count) {
+        Write-Host "Couldn't uninstall all Infra Agent Versions"
+        break
+    }
+    Write-Host "Starting install of $WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi"
+    $agent_deploy_status = Start-Process -FilePath "msiexec.exe" -ArgumentList "/i $WVDMigrateInfraPath\Microsoft.RDInfra.RDAgent.Installer-x64.msi", "/quiet", "/qn", "/norestart", "/passive", "REGISTRATIONTOKEN=$HostPoolToken", "/l* $WVDMigrateInfraPath\AgentInstall.txt" -Wait -Passthru
     $sts = $agent_deploy_status.ExitCode
     Write-Host "Installing RD Infra Agent on VM Complete. Exit code=$sts"
-}
+}