From 65c5c5cae6bc0a1e444a1d17ee50574fa3989dd4 Mon Sep 17 00:00:00 2001
From: Greg Williamson <fundies@users.noreply.github.com>
Date: Mon, 12 Oct 2020 14:51:45 -0400
Subject: [PATCH 1/4] Update azure-jobs.yml

---
 azure-jobs.yml | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/azure-jobs.yml b/azure-jobs.yml
index 89504580e..acfbb4333 100644
--- a/azure-jobs.yml
+++ b/azure-jobs.yml
@@ -54,35 +54,22 @@ jobs:
           git checkout --progress --force enigmaref
         displayName: Checkout ENIGMA Reference
       
-    - script: |
-        git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys64
-        %CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git
+    - powershell: |
+        choco install msys2
       displayName: Install MSYS2
     
     - script: |
-        set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-        %CD:~0,2%\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-        %CD:~0,2%\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
-        %CD:~0,2%\msys64\usr\bin\pacman --overwrite='*' --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
-        %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
-      displayName: Update MSYS2
-      
-    - script: taskkill /f /fi "MODULES eq msys-2.0.dll" || exit /b 0s
-      displayName: Reset MSYS2
-    
-    - script: |
-        set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
-        %CD:~0,2%\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla
-        %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Scc
+        set PATH=C:\tools\msys64\msys64\usr\bin
+        C:\tools\msys64\msys64\usr\bin\pacman --noconfirm -Syyuu
+        C:\tools\msys64\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla
+        C:\tools\msys64\msys64\usr\bin\pacman --noconfirm -Scc
       displayName: Install Toolchain
     
     - script: |
-        set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
+        set PATH=C:\tools\msys64\msys64\usr\bin
+        C:\tools\msys64\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
         cd $(Agent.BuildDirectory)/RadialGM/
-        %CD:~0,2%\msys64\usr\bin\bash -lc "bash ci-build.sh MinSizeRel $(PWD)/cmake-package"
+        C:\tools\msys64\msys64\usr\bin\bash -lc "bash ci-build.sh MinSizeRel $(PWD)/cmake-package"
       displayName: 'Release Build'
       env:
         MSYSTEM: $(MINGW_UPPER)
@@ -90,10 +77,10 @@ jobs:
         MINGW_INSTALLS: $(MINGW_LOWER)
     
     - script: |
-        set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-        %CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
+        set PATH=C:\tools\msys64\msys64\usr\bin
+        C:\tools\msys64\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
         cd $(Agent.BuildDirectory)/RadialGM/
-        %CD:~0,2%\msys64\usr\bin\bash -lc "bash ci-build.sh Debug $(PWD)/cmake-package"
+        C:\tools\msys64\msys64\usr\bin\bash -lc "bash ci-build.sh Debug $(PWD)/cmake-package"
       displayName: 'Debug Build'
       env:
         MSYSTEM: $(MINGW_UPPER)

From e017175ef24905d0a74de9af9ca8363cf3abb5bf Mon Sep 17 00:00:00 2001
From: Greg Williamson <fundies@users.noreply.github.com>
Date: Mon, 12 Oct 2020 14:59:15 -0400
Subject: [PATCH 2/4] Update azure-jobs.yml

---
 azure-jobs.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/azure-jobs.yml b/azure-jobs.yml
index acfbb4333..5b355764c 100644
--- a/azure-jobs.yml
+++ b/azure-jobs.yml
@@ -59,17 +59,16 @@ jobs:
       displayName: Install MSYS2
     
     - script: |
-        set PATH=C:\tools\msys64\msys64\usr\bin
-        C:\tools\msys64\msys64\usr\bin\pacman --noconfirm -Syyuu
-        C:\tools\msys64\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla
-        C:\tools\msys64\msys64\usr\bin\pacman --noconfirm -Scc
+        set PATH=C:\tools\msys64\usr\bin
+        C:\tools\msys64\usr\bin\pacman --noconfirm -Syyuu
+        C:\tools\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla
+        C:\tools\msys64\usr\bin\pacman --noconfirm -Scc
       displayName: Install Toolchain
     
     - script: |
-        set PATH=C:\tools\msys64\msys64\usr\bin
-        C:\tools\msys64\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
+        set PATH=C:\tools\msys64\usr\bin
         cd $(Agent.BuildDirectory)/RadialGM/
-        C:\tools\msys64\msys64\usr\bin\bash -lc "bash ci-build.sh MinSizeRel $(PWD)/cmake-package"
+        C:\tools\msys64\usr\bin\bash -lc "bash ci-build.sh MinSizeRel $(PWD)/cmake-package"
       displayName: 'Release Build'
       env:
         MSYSTEM: $(MINGW_UPPER)
@@ -77,10 +76,9 @@ jobs:
         MINGW_INSTALLS: $(MINGW_LOWER)
     
     - script: |
-        set PATH=C:\tools\msys64\msys64\usr\bin
-        C:\tools\msys64\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
+        set PATH=C:\tools\msys64\usr\bin
         cd $(Agent.BuildDirectory)/RadialGM/
-        C:\tools\msys64\msys64\usr\bin\bash -lc "bash ci-build.sh Debug $(PWD)/cmake-package"
+        C:\tools\msys64\usr\bin\bash -lc "bash ci-build.sh Debug $(PWD)/cmake-package"
       displayName: 'Debug Build'
       env:
         MSYSTEM: $(MINGW_UPPER)

From 1f0ed87d24b3e5845e0472b825e336edccb6c81b Mon Sep 17 00:00:00 2001
From: Greg Williamson <fundies@users.noreply.github.com>
Date: Mon, 12 Oct 2020 16:12:56 -0400
Subject: [PATCH 3/4] Update azure-jobs.yml

---
 azure-jobs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-jobs.yml b/azure-jobs.yml
index 5b355764c..0799016e2 100644
--- a/azure-jobs.yml
+++ b/azure-jobs.yml
@@ -121,7 +121,7 @@ jobs:
     dependsOn: CreateReleaseCandidate
   pool:
     vmImage: 'windows-latest'
-  timeoutInMinutes: 250
+  timeoutInMinutes: 360
 
   steps:
     - checkout: ${{ parameters.repo }}

From b5bde68bfa650bb0e8de5eecff46924c434af871 Mon Sep 17 00:00:00 2001
From: Greg Williamson <fundies@users.noreply.github.com>
Date: Mon, 12 Oct 2020 19:24:22 -0400
Subject: [PATCH 4/4] Update azure-vars.yml

---
 azure-vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-vars.yml b/azure-vars.yml
index be89ecadf..8ce1a50eb 100644
--- a/azure-vars.yml
+++ b/azure-vars.yml
@@ -1,3 +1,3 @@
 variables:
-  vcpkgGitRef: 7960648b4d922888e7a5c2a4c3ae9e153eab0374 # Update this git ref to update vcpkg
+  vcpkgGitRef: 16b68c2f35771c250b354248f11015f9def2a89b # Update this git ref to update vcpkg
   releasetag: 'RadialGM-$(Build.SourceVersion)'