From e10427fb7d28ddcc03175ce1310f18476da1db28 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sat, 9 May 2020 20:48:16 -0700
Subject: [PATCH 01/21] Create appveyor-build-win-agent-v2.yml

---
 appveyor-build-win-agent-v2.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 appveyor-build-win-agent-v2.yml

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
new file mode 100644
index 000000000..9b0986f33
--- /dev/null
+++ b/appveyor-build-win-agent-v2.yml
@@ -0,0 +1,30 @@
+environment:    
+  matrix:
+
+# GCE
+# =======
+
+  - job_name: Bake image with Agent v2
+    APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
+    #APPVEYOR_BAKE_IMAGE: vs2019-temp-p1-gce-us-central1
+
+init:
+  - appveyor version
+  - ps: $ErrorActionPreference = 'Stop'
+  - ps: $env:cloud_type = (Get-ItemProperty "HKLM:\Software\AppVeyor\Build Agent").Mode
+  - ps: 'Write-Host "OS Build: $((Get-CimInstance Win32_OperatingSystem).BuildNumber)"'
+
+clone_folder: '%USERPROFILE%\image-bake-scripts'
+
+clone_script:
+- ps: Invoke-WebRequest "https://github.com/appveyor/build-images/archive/$($env:APPVEYOR_REPO_COMMIT).zip" -OutFile "$env:temp\scripts.zip"
+- ps: Expand-Archive -Path "$env:temp\scripts.zip" -DestinationPath "$env:temp\scripts" -Force
+- ps: Copy-Item -Path "$env:temp\scripts\build-images-$($env:APPVEYOR_REPO_COMMIT)\scripts\Windows\*" -Destination $env:APPVEYOR_BUILD_FOLDER -Recurse
+
+test: off
+
+# on_failure:
+# - ps: Get-EventLog AppVeyor -newest 10 | Format-List
+
+build_script:
+- ps: .\cleanup_windows.ps1
\ No newline at end of file

From 9cace5628269b1a6bcc31a14a57e6f1113c05615 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sat, 9 May 2020 20:53:35 -0700
Subject: [PATCH 02/21] Install agent v2

---
 appveyor-build-win-agent-v2.yml                       | 7 ++++++-
 scripts/Windows/install_appveyor_build_agent_core.ps1 | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 9b0986f33..67c04c66a 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -7,6 +7,9 @@ environment:
   - job_name: Bake image with Agent v2
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     #APPVEYOR_BAKE_IMAGE: vs2019-temp-p1-gce-us-central1
+  
+  AGENT_VERSION: 7.0.2866
+  AGENT_INSTALL_DIR: "%ProgramFiles%\AppVeyor\BuildAgentCore"
 
 init:
   - appveyor version
@@ -27,4 +30,6 @@ test: off
 # - ps: Get-EventLog AppVeyor -newest 10 | Format-List
 
 build_script:
-- ps: .\cleanup_windows.ps1
\ No newline at end of file
+- ps: Get-ItemProperty "HKLM:\Software\AppVeyor\BuildAgent"
+- ps: Get-ItemProperty "HKCU:\Software\AppVeyor\BuildAgent"
+- ps: .\install_appveyor_build_agent_core.ps1
\ No newline at end of file
diff --git a/scripts/Windows/install_appveyor_build_agent_core.ps1 b/scripts/Windows/install_appveyor_build_agent_core.ps1
index 6b796a720..fe3538b30 100644
--- a/scripts/Windows/install_appveyor_build_agent_core.ps1
+++ b/scripts/Windows/install_appveyor_build_agent_core.ps1
@@ -1,5 +1,9 @@
 $AGENT_VERSION = '7.0.2417'
 
+if ($env:AGENT_VERSION) {
+	$AGENT_VERSION = $env:AGENT_VERSION
+}
+
 Write-Host "Installing AppVeyor Build Agent Core"
 Write-Host "===================================="
 
@@ -11,6 +15,10 @@ if (Test-Path $destPath) {
 	Remove-Item $destPath -Recurse -Force
 }
 
+if ($env:AGENT_INSTALL_DIR) {
+	$destPath = $env:AGENT_INSTALL_DIR
+}
+
 Write-Host "Downloading..."
 $zipPath = "$env:TEMP\appveyor-build-agent.zip"
 (New-Object Net.WebClient).DownloadFile("https://appveyordownloads.blob.core.windows.net/appveyor/$AGENT_VERSION/appveyor-build-agent-$AGENT_VERSION-win-x64.zip", $zipPath)

From 6ff89ecb19f2bffcd16e4dcf26faf72784befe8b Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sat, 9 May 2020 20:54:15 -0700
Subject: [PATCH 03/21] Update appveyor-build-win-agent-v2.yml

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 67c04c66a..709b2513c 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -9,7 +9,7 @@ environment:
     #APPVEYOR_BAKE_IMAGE: vs2019-temp-p1-gce-us-central1
   
   AGENT_VERSION: 7.0.2866
-  AGENT_INSTALL_DIR: "%ProgramFiles%\AppVeyor\BuildAgentCore"
+  AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
 
 init:
   - appveyor version

From 0c824bb49642b3919cc824dcbc24b70b9552596a Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sat, 9 May 2020 20:58:10 -0700
Subject: [PATCH 04/21] Update appveyor-build-win-agent-v2.yml

---
 appveyor-build-win-agent-v2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 709b2513c..3a65a7424 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -30,6 +30,6 @@ test: off
 # - ps: Get-EventLog AppVeyor -newest 10 | Format-List
 
 build_script:
-- ps: Get-ItemProperty "HKLM:\Software\AppVeyor\BuildAgent"
-- ps: Get-ItemProperty "HKCU:\Software\AppVeyor\BuildAgent"
+- ps: Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion"
+- ps: Get-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion"
 - ps: .\install_appveyor_build_agent_core.ps1
\ No newline at end of file

From 353b46dfb859cd8919904feabe35d02694610d74 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sat, 9 May 2020 21:02:22 -0700
Subject: [PATCH 05/21] Fix script

---
 appveyor-build-win-agent-v2.yml                       |  4 ++--
 scripts/Windows/install_appveyor_build_agent_core.ps1 | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 3a65a7424..019ca7f91 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -30,6 +30,6 @@ test: off
 # - ps: Get-EventLog AppVeyor -newest 10 | Format-List
 
 build_script:
-- ps: Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion"
-- ps: Get-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion"
+- ps: Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run"
+- ps: Get-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run"
 - ps: .\install_appveyor_build_agent_core.ps1
\ No newline at end of file
diff --git a/scripts/Windows/install_appveyor_build_agent_core.ps1 b/scripts/Windows/install_appveyor_build_agent_core.ps1
index fe3538b30..f478aa5a7 100644
--- a/scripts/Windows/install_appveyor_build_agent_core.ps1
+++ b/scripts/Windows/install_appveyor_build_agent_core.ps1
@@ -11,14 +11,16 @@ Write-Host "===================================="
 
 $destPath = "$env:ProgramFiles\AppVeyor\BuildAgent"
 
-if (Test-Path $destPath) {
-	Remove-Item $destPath -Recurse -Force
-}
-
 if ($env:AGENT_INSTALL_DIR) {
 	$destPath = $env:AGENT_INSTALL_DIR
 }
 
+Write-Host "Installing Build Agent Core version $AGENT_VERSION to '$destPath'"
+
+if (Test-Path $destPath) {
+	Remove-Item $destPath -Recurse -Force
+}
+
 Write-Host "Downloading..."
 $zipPath = "$env:TEMP\appveyor-build-agent.zip"
 (New-Object Net.WebClient).DownloadFile("https://appveyordownloads.blob.core.windows.net/appveyor/$AGENT_VERSION/appveyor-build-agent-$AGENT_VERSION-win-x64.zip", $zipPath)

From fdea0f1ffab59dc929ed1efbe3b626bc057abd6c Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sat, 9 May 2020 21:06:11 -0700
Subject: [PATCH 06/21] Update appveyor-build-win-agent-v2.yml

---
 appveyor-build-win-agent-v2.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 019ca7f91..a4ce10ed9 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -6,10 +6,11 @@ environment:
 
   - job_name: Bake image with Agent v2
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
-    #APPVEYOR_BAKE_IMAGE: vs2019-temp-p1-gce-us-central1
+    APPVEYOR_BAKE_IMAGE: win-agentv2
   
   AGENT_VERSION: 7.0.2866
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
+  BUILD_AGENT_MODE: GCE
 
 init:
   - appveyor version
@@ -30,6 +31,6 @@ test: off
 # - ps: Get-EventLog AppVeyor -newest 10 | Format-List
 
 build_script:
+- ps: .\install_appveyor_build_agent_core.ps1
 - ps: Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run"
-- ps: Get-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run"
-- ps: .\install_appveyor_build_agent_core.ps1
\ No newline at end of file
+- ps: Get-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run"
\ No newline at end of file

From 496caba817f22829323143d4e7241c351b3652c5 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 12:21:29 -0700
Subject: [PATCH 07/21] Install agent, but not run

---
 appveyor-build-win-agent-v2.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index a4ce10ed9..7d2be5a8f 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -32,5 +32,6 @@ test: off
 
 build_script:
 - ps: .\install_appveyor_build_agent_core.ps1
-- ps: Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run"
-- ps: Get-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run"
\ No newline at end of file
+- ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -ErrorAction SilentlyContinue
+- ps: Remove-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -ErrorAction SilentlyContinue
+- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file

From 65b839c390a80524b7b1697e97affcd5607cd244 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 12:25:53 -0700
Subject: [PATCH 08/21] Force

---
 appveyor-build-win-agent-v2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 7d2be5a8f..1b5eeb400 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -32,6 +32,6 @@ test: off
 
 build_script:
 - ps: .\install_appveyor_build_agent_core.ps1
-- ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -ErrorAction SilentlyContinue
-- ps: Remove-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -ErrorAction SilentlyContinue
+- ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
+- ps: Remove-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
 - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file

From 9a1eb7ef0c74a08923608dad02b7820ec1c8ee49 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 12:28:04 -0700
Subject: [PATCH 09/21] Do not remove from HKLM

---
 appveyor-build-win-agent-v2.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 1b5eeb400..8503e42ef 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -33,5 +33,4 @@ test: off
 build_script:
 - ps: .\install_appveyor_build_agent_core.ps1
 - ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
-- ps: Remove-ItemProperty "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
 - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file

From 064519facb5afc0e97706303de46804221297ac8 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 13:07:56 -0700
Subject: [PATCH 10/21] Bake updated agent

---
 appveyor-build-win-agent-v2.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 8503e42ef..205546efd 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2866
+  AGENT_VERSION: 7.0.2870
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 
@@ -32,5 +32,5 @@ test: off
 
 build_script:
 - ps: .\install_appveyor_build_agent_core.ps1
-- ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
-- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file
+#- ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
+#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file

From dc72ed8cc961a7fdea04dbc19f4e48eefdbd55d8 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 15:33:59 -0700
Subject: [PATCH 11/21] Fix pwsh profile

---
 appveyor-build-win-agent-v2.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 205546efd..2dadd6ca9 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2870
+  AGENT_VERSION: 7.0.2872
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 
@@ -32,5 +32,17 @@ test: off
 
 build_script:
 - ps: .\install_appveyor_build_agent_core.ps1
-#- ps: Remove-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "AppVeyor.BuildAgent" -Force
-#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file
+- ps: |
+  $appveyorPath = "$env:ProgramFiles\AppVeyor\BuildAgentCore"
+  $pwshProfileFilename = "$env:USERPROFILE\Documents\PowerShell\Microsoft.PowerShell_profile.ps1"
+
+  if (Test-Path $pwshProfileFilename) {
+      $lines = Get-Content $pwshProfileFilename
+      for($i = 0; $i -lt $lines.length; $i++) {
+        if ($lines[$i] -contains '*AppVeyor.BuildAgent.PowerShell.dll*') {
+          $lines[$i] = ''
+        }
+      }
+      $lines += "Import-Module '$appveyorPath\AppVeyor.BuildAgent.PowerShell.dll'"
+      $lines | Set-Content $pwshProfileFilename
+  }
\ No newline at end of file

From 1676011fcd7a8699a413df05009e16b6635200ed Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 15:34:35 -0700
Subject: [PATCH 12/21] Fix script

---
 appveyor-build-win-agent-v2.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 2dadd6ca9..fe397d11d 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -33,16 +33,16 @@ test: off
 build_script:
 - ps: .\install_appveyor_build_agent_core.ps1
 - ps: |
-  $appveyorPath = "$env:ProgramFiles\AppVeyor\BuildAgentCore"
-  $pwshProfileFilename = "$env:USERPROFILE\Documents\PowerShell\Microsoft.PowerShell_profile.ps1"
-
-  if (Test-Path $pwshProfileFilename) {
-      $lines = Get-Content $pwshProfileFilename
-      for($i = 0; $i -lt $lines.length; $i++) {
-        if ($lines[$i] -contains '*AppVeyor.BuildAgent.PowerShell.dll*') {
-          $lines[$i] = ''
+    $appveyorPath = "$env:ProgramFiles\AppVeyor\BuildAgentCore"
+    $pwshProfileFilename = "$env:USERPROFILE\Documents\PowerShell\Microsoft.PowerShell_profile.ps1"
+
+    if (Test-Path $pwshProfileFilename) {
+        $lines = Get-Content $pwshProfileFilename
+        for($i = 0; $i -lt $lines.length; $i++) {
+          if ($lines[$i] -contains '*AppVeyor.BuildAgent.PowerShell.dll*') {
+            $lines[$i] = ''
+          }
         }
-      }
-      $lines += "Import-Module '$appveyorPath\AppVeyor.BuildAgent.PowerShell.dll'"
-      $lines | Set-Content $pwshProfileFilename
-  }
\ No newline at end of file
+        $lines += "Import-Module '$appveyorPath\AppVeyor.BuildAgent.PowerShell.dll'"
+        $lines | Set-Content $pwshProfileFilename
+    }
\ No newline at end of file

From e3eb56363305399034676934c207075b0f5f2626 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 15:57:33 -0700
Subject: [PATCH 13/21] Try catch around import-module

---
 appveyor-build-win-agent-v2.yml             | 2 +-
 scripts/Windows/install_powershell_core.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index fe397d11d..8b4f2be32 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -43,6 +43,6 @@ build_script:
             $lines[$i] = ''
           }
         }
-        $lines += "Import-Module '$appveyorPath\AppVeyor.BuildAgent.PowerShell.dll'"
+        $lines += "try { Import-Module '$appveyorPath\AppVeyor.BuildAgent.PowerShell.dll' } catch {}"
         $lines | Set-Content $pwshProfileFilename
     }
\ No newline at end of file
diff --git a/scripts/Windows/install_powershell_core.ps1 b/scripts/Windows/install_powershell_core.ps1
index 2ba9b6e2d..5b0800595 100644
--- a/scripts/Windows/install_powershell_core.ps1
+++ b/scripts/Windows/install_powershell_core.ps1
@@ -24,7 +24,7 @@ if (Test-Path $appveyorPath) {
 
     if (-not (Test-Path $pwshProfileFilename) -or (Get-Content $pwshProfileFilename | Where-Object { $_.Contains("AppVeyor.BuildAgent.PowerShell.dll") }).Count -eq 0) {
         Write-Host "Updating $pwshProfileFilename with AppVeyor PS Modules"
-        Add-Content $pwshProfileFilename "`nImport-Module '$appveyorPath\dotnetcore\AppVeyor.BuildAgent.PowerShell.dll'"
+        Add-Content $pwshProfileFilename "`ntry { Import-Module '$appveyorPath\dotnetcore\AppVeyor.BuildAgent.PowerShell.dll' } catch {}"
     } else {
         Write-Host "Import of AppVeyor Modules already exists in $pwshProfileFilename"
     }

From 77529ff4e4cf30d08c6a21f731a7df7b162513c2 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 16:20:16 -0700
Subject: [PATCH 14/21] Agent with fixed sql service

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 8b4f2be32..b22112c84 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2872
+  AGENT_VERSION: 7.0.2873
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 

From 9cd3d3e6f34c351e6f40dab87ee8a1577d5b45a5 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 19:00:26 -0700
Subject: [PATCH 15/21] Agent update

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index b22112c84..d43ec2c46 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2873
+  AGENT_VERSION: 7.0.2874
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 

From dbd9ef0b573487ba61d7e188a0c88b2adcb31529 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 19:21:39 -0700
Subject: [PATCH 16/21] Agent 2875

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index d43ec2c46..3db0a4815 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2874
+  AGENT_VERSION: 7.0.2875
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 

From c8899c7173ba1dd6f089997dedef28e1492cec81 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 19:58:55 -0700
Subject: [PATCH 17/21] 7.0.2876

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 3db0a4815..be3ef13ef 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2875
+  AGENT_VERSION: 7.0.2876
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 

From 33abfcfccdeef17c567b7c7d130debd235759bc1 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 21:09:05 -0700
Subject: [PATCH 18/21] 7.0.2877

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index be3ef13ef..10e86c5cb 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2876
+  AGENT_VERSION: 7.0.2877
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 

From bb41a3babbf5c502028207694c863de043660ed1 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Sun, 10 May 2020 21:48:13 -0700
Subject: [PATCH 19/21] 7.0.2878

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index 10e86c5cb..d2039f580 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2877
+  AGENT_VERSION: 7.0.2878
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE
 

From bfde20def95b68acb7ab1e5856b2fa474335ec93 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Mon, 11 May 2020 09:33:49 -0700
Subject: [PATCH 20/21] Clone projects to C:\Projects

---
 scripts/Windows/install_appveyor_build_agent_core.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/Windows/install_appveyor_build_agent_core.ps1 b/scripts/Windows/install_appveyor_build_agent_core.ps1
index f478aa5a7..58da52990 100644
--- a/scripts/Windows/install_appveyor_build_agent_core.ps1
+++ b/scripts/Windows/install_appveyor_build_agent_core.ps1
@@ -38,6 +38,7 @@ New-Item "HKLM:\Software\AppVeyor" -Name "BuildAgent" -Force | Out-Null
 if ($env:appveyor_url) {$appVeyorUrl = $env:appveyor_url} else {$appVeyorUrl = 'https://ci.appveyor.com'}
 Set-ItemProperty "HKLM:\Software\AppVeyor\BuildAgent" -Name "AppVeyorUrl" -Value appVeyorUrl
 Set-ItemProperty "HKLM:\Software\AppVeyor\BuildAgent" -Name "Mode" -Value $env:BUILD_AGENT_MODE
+Set-ItemProperty "HKLM:\Software\AppVeyor\BuildAgent" -Name "ProjectBuildsDirectory" -Value ""
 
 # Enable auto load on system start
 New-Item "HKCU:\Software\Microsoft\Windows\CurrentVersion" -Name "Run" -Force | Out-Null

From 6907cb7ed9121b517d83b6c6c0d0868add39c80d Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Mon, 11 May 2020 10:10:38 -0700
Subject: [PATCH 21/21] 7.0.2879

---
 appveyor-build-win-agent-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-build-win-agent-v2.yml b/appveyor-build-win-agent-v2.yml
index d2039f580..8340c9f80 100644
--- a/appveyor-build-win-agent-v2.yml
+++ b/appveyor-build-win-agent-v2.yml
@@ -8,7 +8,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: vs2019-master-gce-us-central1
     APPVEYOR_BAKE_IMAGE: win-agentv2
   
-  AGENT_VERSION: 7.0.2878
+  AGENT_VERSION: 7.0.2879
   AGENT_INSTALL_DIR: '%ProgramFiles%\AppVeyor\BuildAgentCore'
   BUILD_AGENT_MODE: GCE