Merge branch 'web-rdp' into mes/rdp-glitch-repro

windows-rdp/powershell-installation-script.tftpl

@@ -23,9 +23,19 @@ function Install-DevolutionsGateway {
 $moduleName = "DevolutionsGateway"
 $moduleVersion = "2024.1.5"
 
-# This should always fail on GCP
+# Install the module with the specified version for all users
-Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force -ErrorAction Stop
+# This requires administrator privileges
-Install-Module -Name $moduleName -RequiredVersion $moduleVersion -Force
+try {
+    # Install-PackageProvider is required for AWS. Need to set command to
+    # terminate on failure so that try/catch actually triggers
+    Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force -ErrorAction Stop
+    Install-Module -Name $moduleName -RequiredVersion $moduleVersion -Force
+}
+catch {
+    # If the first command failed, assume that we're on GCP and run
+    # Install-Module only
+    Install-Module -Name $moduleName -RequiredVersion $moduleVersion -Force
+}
 
 # Construct the module path for system-wide installation
 $moduleBasePath = "C:\Windows\system32\config\systemprofile\Documents\PowerShell\Modules\$moduleName\$moduleVersion"