From df5f3514096945ebdcfd543bb387ce8777cba21b Mon Sep 17 00:00:00 2001 From: Roy Cornelissen Date: Wed, 15 Jun 2022 09:02:22 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20reference=20to=20main?= =?UTF-8?q?=20branch=20in=20Virtual-Desktop-Optimization-Tool?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since `The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool` changed their branch name to `main`, the references and file/folder names in `1_Optimize_OS_for_WVD.ps1` were invalid and didn't work. This PR fixes that. --- .../14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 b/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 index 0af8395..c439164 100644 --- a/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 +++ b/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 @@ -5,17 +5,17 @@ New-Item -Path $drive -Name $appName -ItemType Directory -ErrorAction SilentlyContinue $LocalPath = $drive + '\' + $appName set-Location $LocalPath - $osOptURL = 'https://github.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool/archive/master.zip' - $osOptURLexe = 'Windows_10_VDI_Optimize-master.zip' + $osOptURL = 'https://github.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool/archive/main.zip' + $osOptURLexe = 'Windows_10_VDI_Optimize-main.zip' $outputPath = $LocalPath + '\' + $osOptURLexe Invoke-WebRequest -Uri $osOptURL -OutFile $outputPath write-host 'AIB Customization: Starting OS Optimizations script' - Expand-Archive -LiteralPath 'C:\\Optimize\\Windows_10_VDI_Optimize-master.zip' -DestinationPath $Localpath -Force -Verbose + Expand-Archive -LiteralPath 'C:\\Optimize\\Windows_10_VDI_Optimize-main.zip' -DestinationPath $Localpath -Force -Verbose Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force -Verbose - Set-Location -Path C:\\Optimize\\Virtual-Desktop-Optimization-Tool-master + Set-Location -Path C:\\Optimize\\Virtual-Desktop-Optimization-Tool-main # instrumentation - $osOptURL = 'https://raw.githubusercontent.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool/master/Win10_VirtualDesktop_Optimize.ps1' + $osOptURL = 'https://raw.githubusercontent.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool/main/Win10_VirtualDesktop_Optimize.ps1' $osOptURLexe = 'optimize.ps1' Invoke-WebRequest -Uri $osOptURL -OutFile $osOptURLexe @@ -23,7 +23,7 @@ # Patch: overide the Win10_VirtualDesktop_Optimize.ps1 - setting 'Set-NetAdapterAdvancedProperty'(see readme.md) Write-Host 'Patch: Disabling Set-NetAdapterAdvancedProperty' - $updatePath= "C:\optimize\Virtual-Desktop-Optimization-Tool-master\Win10_VirtualDesktop_Optimize.ps1" + $updatePath= "C:\optimize\Virtual-Desktop-Optimization-Tool-main\Win10_VirtualDesktop_Optimize.ps1" ((Get-Content -path $updatePath -Raw) -replace 'Set-NetAdapterAdvancedProperty -DisplayName "Send Buffer Size" -DisplayValue 4MB','#Set-NetAdapterAdvancedProperty -DisplayName "Send Buffer Size" -DisplayValue 4MB') | Set-Content -Path $updatePath # Patch: overide the REG UNLOAD, needs GC before, otherwise will Access Deny unload(see readme.md) From 0235ff2dc96a8df99f0228b84c035f9008901182 Mon Sep 17 00:00:00 2001 From: Roy Cornelissen Date: Wed, 15 Jun 2022 09:27:22 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=91=BD=20Change=20script=20to=20use?= =?UTF-8?q?=20Windows=5FVDOT.ps1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Win10_VirtualDesktop_Optimize.ps1` has been deprecated and replaced with `Windows_VDOT.ps1` --- .../1_Optimize_OS_for_WVD.ps1 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 b/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 index c439164..cc80ae1 100644 --- a/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 +++ b/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 @@ -15,15 +15,13 @@ Set-Location -Path C:\\Optimize\\Virtual-Desktop-Optimization-Tool-main # instrumentation - $osOptURL = 'https://raw.githubusercontent.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool/main/Win10_VirtualDesktop_Optimize.ps1' + $osOptURL = 'https://raw.githubusercontent.com/The-Virtual-Desktop-Team/Virtual-Desktop-Optimization-Tool/main/Windows_VDOT.ps1' $osOptURLexe = 'optimize.ps1' Invoke-WebRequest -Uri $osOptURL -OutFile $osOptURLexe - - - # Patch: overide the Win10_VirtualDesktop_Optimize.ps1 - setting 'Set-NetAdapterAdvancedProperty'(see readme.md) + # Patch: overide the Windows_VDOT.ps1 - setting 'Set-NetAdapterAdvancedProperty'(see readme.md) Write-Host 'Patch: Disabling Set-NetAdapterAdvancedProperty' - $updatePath= "C:\optimize\Virtual-Desktop-Optimization-Tool-main\Win10_VirtualDesktop_Optimize.ps1" + $updatePath= "C:\optimize\Virtual-Desktop-Optimization-Tool-main\Windows_VDOT.ps1" ((Get-Content -path $updatePath -Raw) -replace 'Set-NetAdapterAdvancedProperty -DisplayName "Send Buffer Size" -DisplayValue 4MB','#Set-NetAdapterAdvancedProperty -DisplayName "Send Buffer Size" -DisplayValue 4MB') | Set-Content -Path $updatePath # Patch: overide the REG UNLOAD, needs GC before, otherwise will Access Deny unload(see readme.md) @@ -39,14 +37,9 @@ #add gc and sleep $insert | ForEach-Object { $file.insert($_," Write-Host 'Patch closing handles and runnng GC before reg unload' `n `$newKey.Handle.close()` `n [gc]::collect() `n Start-Sleep -Seconds 15 ") } Set-Content $updatePath $file - - # run script # .\optimize -WindowsVersion 2004 -Verbose - .\Win10_VirtualDesktop_Optimize.ps1 -WindowsVersion 2004 -Verbose + .\Windows_VDOT.ps1 -WindowsVersion 2004 -Verbose write-host 'AIB Customization: Finished OS Optimizations script' - - - \ No newline at end of file From 5b6de30fecad75d002abfcd74d4193b6070ed23e Mon Sep 17 00:00:00 2001 From: Roy Cornelissen Date: Wed, 15 Jun 2022 10:08:38 +0200 Subject: [PATCH 3/3] Add -AcceptEULA --- solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 b/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 index cc80ae1..04320a4 100644 --- a/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 +++ b/solutions/14_Building_Images_WVD/1_Optimize_OS_for_WVD.ps1 @@ -40,6 +40,6 @@ # run script # .\optimize -WindowsVersion 2004 -Verbose - .\Windows_VDOT.ps1 -WindowsVersion 2004 -Verbose + .\Windows_VDOT.ps1 -WindowsVersion 2004 -Verbose -AcceptEULA write-host 'AIB Customization: Finished OS Optimizations script' \ No newline at end of file