From 6c3b04ec6537a2552b13f10a3c61fd3c425a4a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 10:44:44 +0200
Subject: [PATCH 01/20] Create a job to upload dev builds

For now it will try to download all the artifacts to $(Build.SourcesDirectory)/dev_bin
---
 azure-pipelines.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dccab02a..c7872451 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -99,4 +99,17 @@ jobs:
     qt_aqt_spec: 'win32_msvc2017'
     vc_redist_url: 'https://go.microsoft.com/fwlink/?LinkId=746571'
     vc_redist_file_name: 'vc_redist.x86.exe'
-    vc_vars: 'vcvars32.bat'
\ No newline at end of file
+    vc_vars: 'vcvars32.bat'
+- job: PublishDevBuilds
+  dependsOn: Linux, MacOS, Windows_x86, Windows_x64
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'develop'))
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        buildType: 'current'
+        targetPath: $(Build.SourcesDirectory)/dev_bin
+    - script: |
+        ls -lah $(Build.SourcesDirectory)/dev_bin
+      
\ No newline at end of file

From 17a6de82ad8a384be7117fe9e4b8978a04fad93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 10:48:49 +0200
Subject: [PATCH 02/20] dependsOn is an array

---
 azure-pipelines.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c7872451..0e1ee47f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -101,7 +101,11 @@ jobs:
     vc_redist_file_name: 'vc_redist.x86.exe'
     vc_vars: 'vcvars32.bat'
 - job: PublishDevBuilds
-  dependsOn: Linux, MacOS, Windows_x86, Windows_x64
+  dependsOn: 
+  - Linux
+  - MacOS
+  - Windows_x86
+  - Windows_x64
   condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'develop'))
   pool:
     vmImage: 'ubuntu-16.04'

From f382aab6dd4a64e240cb03c1803802e73db3df30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 11:08:33 +0200
Subject: [PATCH 03/20] remove branch condition for now

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0e1ee47f..76d012b1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,7 +106,7 @@ jobs:
   - MacOS
   - Windows_x86
   - Windows_x64
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'develop'))
+  condition: succeeded()
   pool:
     vmImage: 'ubuntu-16.04'
   steps:

From 1efa957a4c1937b5670ef05210d76a7e723ab5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 11:24:57 +0200
Subject: [PATCH 04/20] Force spec

---
 azure-pipelines-windows-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index 62c25660..fd830f8b 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -28,7 +28,7 @@ jobs:
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}"
       set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
       set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\""
-      qmake CONFIG+="7zip" %DEFINES_VAR%
+      qmake -spec ${{ parameters.qt_spec }} CONFIG+="7zip" %DEFINES_VAR%
       nmake
     displayName: 'Build'
   - script: |

From 6ecbd1f9c79bf8634eb646bcc62024cf588a370a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 11:37:29 +0200
Subject: [PATCH 05/20] Something in qt seems to be broken

---
 azure-pipelines-windows-template.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index fd830f8b..ab9bd984 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -27,6 +27,7 @@ jobs:
   - script: |
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}"
       set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
+      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
       set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\""
       qmake -spec ${{ parameters.qt_spec }} CONFIG+="7zip" %DEFINES_VAR%
       nmake

From c2e95f2a36d1f3f2f0309a688d466f0de3b31fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 11:49:50 +0200
Subject: [PATCH 06/20] Find whats in PATH by default

---
 azure-pipelines-windows-template.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index ab9bd984..e94b5ffa 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -15,6 +15,7 @@ jobs:
   steps:
   - template: azure-pipelines-build-number.yml
   - script: |
+      echo %PATH%
       pip install aqtinstall
       mkdir C:\Qt
       python -m aqt install -O c:\Qt ${{ parameters.qt_version }} windows desktop ${{ parameters.qt_aqt_spec }}
@@ -29,7 +30,7 @@ jobs:
       set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
       dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
       set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\""
-      qmake -spec ${{ parameters.qt_spec }} CONFIG+="7zip" %DEFINES_VAR%
+      qmake CONFIG+="7zip" %DEFINES_VAR%
       nmake
     displayName: 'Build'
   - script: |

From 4272e17784149ce11d1c22deb17182a3560be4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 12:08:08 +0200
Subject: [PATCH 07/20] Check specs

---
 azure-pipelines-windows-template.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index e94b5ffa..e044c168 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -15,10 +15,10 @@ jobs:
   steps:
   - template: azure-pipelines-build-number.yml
   - script: |
-      echo %PATH%
       pip install aqtinstall
       mkdir C:\Qt
       python -m aqt install -O c:\Qt ${{ parameters.qt_version }} windows desktop ${{ parameters.qt_aqt_spec }}
+      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\mkspecs
       choco install -y wget
       choco install innosetup 
       wget "https://sourceforge.net/projects/sevenzip/files/7-Zip/18.05/7z1805-src.7z" -P $(Build.SourcesDirectory)\compressed_archive
@@ -27,14 +27,13 @@ jobs:
     displayName: 'Install dependencies'
   - script: |
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\${{ parameters.vc_vars }}"
-      set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
-      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
+      set PATH=C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
       set DEFINES_VAR=DEFINES+="BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\""
       qmake CONFIG+="7zip" %DEFINES_VAR%
       nmake
     displayName: 'Build'
   - script: |
-      set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
+      set PATH=%PATH%;C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
       cd $(Build.SourcesDirectory)\ci\win
       .\create_installer.cmd ${{ parameters.arquitecture }} 7z $(Build.BuildNumber)
     displayName: 'Create installer'

From 08d94be48a21fe64586ba13dd6c8c1fc0997332b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 13:58:15 +0200
Subject: [PATCH 08/20] Try to upload all files to bintray

---
 azure-pipelines.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76d012b1..dfb8d5ae 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -107,13 +107,24 @@ jobs:
   - Windows_x86
   - Windows_x64
   condition: succeeded()
+  variables:
+  - group: bintray
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
+    - template: azure-pipelines-build-number.yml
     - task: DownloadPipelineArtifact@2
       inputs:
         buildType: 'current'
         targetPath: $(Build.SourcesDirectory)/dev_bin
     - script: |
         ls -lah $(Build.SourcesDirectory)/dev_bin
+    - task: cURLUploader@2
+      inputs:
+        files: '$(Build.SourcesDirectory)/dev_bin/**/*.*'
+        authType: 'userAndPass'
+        username: $(username)
+        password: $(api-key)
+        url: https://api.bintray.com/content/luisangelsm/YACReader/DevBuilds/$(Build.BuildNumber)
+      
       
\ No newline at end of file

From 1dec3ad286c2b07a6e6ac6d244a538ce44d3e72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 13:59:55 +0200
Subject: [PATCH 09/20] ** as fnmatch should be enough

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dfb8d5ae..c47aeb65 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -121,7 +121,7 @@ jobs:
         ls -lah $(Build.SourcesDirectory)/dev_bin
     - task: cURLUploader@2
       inputs:
-        files: '$(Build.SourcesDirectory)/dev_bin/**/*.*'
+        files: '$(Build.SourcesDirectory)/dev_bin/**'
         authType: 'userAndPass'
         username: $(username)
         password: $(api-key)

From 14b3ec02caa00478c579f317d02c97a963e44f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 14:09:13 +0200
Subject: [PATCH 10/20] Disable windows builds dependencies for now

installing qt is failing I think
---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c47aeb65..c5a6e6e3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -104,8 +104,8 @@ jobs:
   dependsOn: 
   - Linux
   - MacOS
-  - Windows_x86
-  - Windows_x64
+#  - Windows_x86
+#  - Windows_x64
   condition: succeeded()
   variables:
   - group: bintray

From 3db3908d8c48f6b3ffc10dd03211e774ef5f1bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 16:07:43 +0200
Subject: [PATCH 11/20] Change default remote path

---
 azure-pipelines.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c5a6e6e3..2983cc4a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -125,6 +125,7 @@ jobs:
         authType: 'userAndPass'
         username: $(username)
         password: $(api-key)
-        url: https://api.bintray.com/content/luisangelsm/YACReader/DevBuilds/$(Build.BuildNumber)
+        remotePath: ''
+        url: https://api.bintray.com/content/luisangelsm/YACReader/DevBuilds/$(Build.BuildNumber)/
       
       
\ No newline at end of file

From 1b95fe3cd8b085839c71e92acd8fd5cd6df04418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 16:14:04 +0200
Subject: [PATCH 12/20] Upload only files

I don't know if there is a better pattern to define files only
---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2983cc4a..92305f1b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -118,10 +118,10 @@ jobs:
         buildType: 'current'
         targetPath: $(Build.SourcesDirectory)/dev_bin
     - script: |
-        ls -lah $(Build.SourcesDirectory)/dev_bin
+        ls -lah $(Build.SourcesDirectory)/dev_bin/***.*
     - task: cURLUploader@2
       inputs:
-        files: '$(Build.SourcesDirectory)/dev_bin/**'
+        files: '$(Build.SourcesDirectory)/dev_bin/***.*'
         authType: 'userAndPass'
         username: $(username)
         password: $(api-key)

From 35089493c707cb44183bc090ee697a186b6ba92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 16:20:20 +0200
Subject: [PATCH 13/20] Publish uploaded files

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 92305f1b..5917b97b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -125,6 +125,7 @@ jobs:
         authType: 'userAndPass'
         username: $(username)
         password: $(api-key)
+        options: -H "X-Bintray-Publish:1"
         remotePath: ''
         url: https://api.bintray.com/content/luisangelsm/YACReader/DevBuilds/$(Build.BuildNumber)/
       

From b8dbf4dd4d013d3cf96a2343c2549faf8603f3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 16:37:45 +0200
Subject: [PATCH 14/20] The folder seems to be there, let's see what's inside

I guess this is a problem with aqtinstall, I need to gather information if I want to open an issue
---
 azure-pipelines-windows-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index e044c168..6e2a5c0b 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -18,7 +18,7 @@ jobs:
       pip install aqtinstall
       mkdir C:\Qt
       python -m aqt install -O c:\Qt ${{ parameters.qt_version }} windows desktop ${{ parameters.qt_aqt_spec }}
-      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\mkspecs
+      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\mkspecs\win32-msvc
       choco install -y wget
       choco install innosetup 
       wget "https://sourceforge.net/projects/sevenzip/files/7-Zip/18.05/7z1805-src.7z" -P $(Build.SourcesDirectory)\compressed_archive

From 6d44e307379198356cb5c61c97d7a7c22268f6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 17:06:47 +0200
Subject: [PATCH 15/20] Try other pattern

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5917b97b..30608b27 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -118,10 +118,10 @@ jobs:
         buildType: 'current'
         targetPath: $(Build.SourcesDirectory)/dev_bin
     - script: |
-        ls -lah $(Build.SourcesDirectory)/dev_bin/***.*
+        ls -lah $(Build.SourcesDirectory)/dev_bin/**/*.*
     - task: cURLUploader@2
       inputs:
-        files: '$(Build.SourcesDirectory)/dev_bin/***.*'
+        files: '$(Build.SourcesDirectory)/dev_bin/**/*.*'
         authType: 'userAndPass'
         username: $(username)
         password: $(api-key)

From 386ca2d82b37fde148d908f3315fa92f75660945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 17:10:32 +0200
Subject: [PATCH 16/20] Try to calculate the build number only once

---
 azure-pipelines-windows-template.yml | 2 +-
 azure-pipelines.yml                  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index 6e2a5c0b..99c2d527 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -10,10 +10,10 @@ parameters:
 
 jobs:
 - job: ${{ parameters.name }}
+  dependsOn: Initialization
   pool:
     vmImage: 'vs2017-win2016'
   steps:
-  - template: azure-pipelines-build-number.yml
   - script: |
       pip install aqtinstall
       mkdir C:\Qt
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 30608b27..1f710176 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,11 +5,15 @@ trigger:
 - develop
 
 jobs:
+- job: Initialization
+  pool: Default
+  steps:
+  - template: azure-pipelines-build-number.yml
 - job: Linux
+  dependsOn: Initialization
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
-  - template: azure-pipelines-build-number.yml
   - script: |
       sudo add-apt-repository 'deb http://download.opensuse.org/repositories/home:/selmf/xUbuntu_16.04/ /'
       sudo add-apt-repository ppa:kubuntu-ppa/backports
@@ -40,12 +44,12 @@ jobs:
       path: $(Build.ArtifactStagingDirectory)
       artifactName: src $(Build.BuildNumber) tarball
 - job: MacOS
+  dependsOn: Initialization
   variables:
   - group: macos-codesign
   pool:
     vmImage: 'macOS-10.14'
   steps:
-  - template: azure-pipelines-build-number.yml
   - script: |
       brew install qt
       brew link qt --force
@@ -112,7 +116,6 @@ jobs:
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
-    - template: azure-pipelines-build-number.yml
     - task: DownloadPipelineArtifact@2
       inputs:
         buildType: 'current'

From 359be4c6444d98663d1190c8d2859540ead8cf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 17:17:53 +0200
Subject: [PATCH 17/20] Default is not a valid pool

---
 azure-pipelines.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1f710176..1f57bea8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,8 @@ trigger:
 
 jobs:
 - job: Initialization
-  pool: Default
+  pool:
+    vmImage: 'vs2017-win2016'
   steps:
   - template: azure-pipelines-build-number.yml
 - job: Linux

From 7a2fa7f6b3570a6813d9c09ff6468b2fbf6c3917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 18:05:34 +0200
Subject: [PATCH 18/20] Try to find if qt.conf is properly placed

---
 azure-pipelines-windows-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index 99c2d527..74b6d744 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -18,7 +18,7 @@ jobs:
       pip install aqtinstall
       mkdir C:\Qt
       python -m aqt install -O c:\Qt ${{ parameters.qt_version }} windows desktop ${{ parameters.qt_aqt_spec }}
-      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\mkspecs\win32-msvc
+      dir C:\Qt\Qt${{ parameters.qt_version }}\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin
       choco install -y wget
       choco install innosetup 
       wget "https://sourceforge.net/projects/sevenzip/files/7-Zip/18.05/7z1805-src.7z" -P $(Build.SourcesDirectory)\compressed_archive

From e0d4a5f987b2d7d164c1951a292073b452c63518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 18:32:34 +0200
Subject: [PATCH 19/20] Add win dependencies again

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1f57bea8..fe086728 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -109,8 +109,8 @@ jobs:
   dependsOn: 
   - Linux
   - MacOS
-#  - Windows_x86
-#  - Windows_x64
+  - Windows_x86
+  - Windows_x64
   condition: succeeded()
   variables:
   - group: bintray

From 5a52382d1f580fb9b922237f0e27b7135d820dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 11 Sep 2019 19:29:28 +0200
Subject: [PATCH 20/20] Only upload dev builds from develop branch

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fe086728..b353851b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -111,7 +111,7 @@ jobs:
   - MacOS
   - Windows_x86
   - Windows_x64
-  condition: succeeded()
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'develop'))
   variables:
   - group: bintray
   pool: