Fix strategy and timeout

Changing the matrix to match new strategy schema.  and moving timoutInMinutes up.

script/vsts/platforms/linux.yml

@@ -1,11 +1,12 @@
 jobs:
 - job: Linux
   dependsOn: GetReleaseVersion
+  timeoutInMinutes: 180
+  
   variables:
     ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
   pool:
     vmImage: ubuntu-16.04
-    timeoutInMinutes: 180
 
   steps:
   - task: NodeTool@0

script/vsts/platforms/macos.yml

@@ -1,14 +1,15 @@
 jobs:
 - job: macOS
   dependsOn: GetReleaseVersion
+  timeoutInMinutes: 180
+
   variables:
     ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
     IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
     IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
   pool:
     vmImage: macos-10.13
-    timeoutInMinutes: 180
-
+    
   steps:
   - task: NodeTool@0
     inputs:

script/vsts/platforms/windows.yml

@@ -1,21 +1,23 @@
 jobs:
 - job: Windows
   dependsOn: GetReleaseVersion
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
-    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
-  pool:
-    vmImage: vs2017-win2016
-    timeoutInMinutes: 180
-    parallel: 2
+  timeoutInMinutes: 180
+  strategy:
+    maxParallel: 2
     matrix:
       x64:
         buildArch: x64
       # TODO: x86 is currently not supported on VSTS
       # x86:
       #   buildArch: x86
-
+  pool:
+    vmImage: vs2017-win2016
+    
+  variables:
+    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
+  
   steps:
   - task: NodeTool@0
     inputs:

script/vsts/pull-requests.yml

@@ -1,8 +1,8 @@
 trigger: none  # No CI builds, only PR builds
 
-phases:
+jobs:
 
-- phase: GetReleaseVersion
+- job: GetReleaseVersion
   steps:
   # This has to be done separately because VSTS inexplicably
   # exits the script block after `npm install` completes.

script/vsts/release-branch-build.yml

@@ -2,9 +2,9 @@ trigger:
 - master
 - 1.* # VSTS only supports wildcards at the end
 
-phases:
+jobs:
 
-- phase: GetReleaseVersion
+- job: GetReleaseVersion
   steps:
   # This has to be done separately because VSTS inexplicably
   # exits the script block after `npm install` completes.
@@ -20,9 +20,10 @@ phases:
 - template: platforms/macos.yml
 - template: platforms/linux.yml
 
-- phase: UploadArtifacts
-  queue: Hosted  # Need this for Python 2.7
-
+- job: UploadArtifacts
+  pool: 
+    vmImage: vs2017-win2016  
+    
   dependsOn:
   - GetReleaseVersion
   - Windows
@@ -34,7 +35,12 @@ phases:
     IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
     IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
-  steps:
+  steps:  
+  - task: UsePythonVersion@0
+    displayName: 'Use Python 2.7.x'
+    inputs:
+      versionSpec: 2.7.x
+
   - task: NodeTool@0
     inputs:
       versionSpec: 8.9.3