From 15bf75903bbecec56c5030fd3e0ded80583de592 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Mon, 2 Jul 2018 12:44:41 +0200
Subject: [PATCH] fix build order

---
 build/tfs/product-build.yml | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index 13851b70366..31f0c923664 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -19,25 +19,6 @@ phases:
     inputs:
       versionSpec: "1.3.2"
 
-  - task: NuGetCommand@2
-    displayName: Install ESRPClient.exe
-    inputs:
-      restoreSolution: 'build\tfs\win32\ESRPClient\packages.config'
-      feedsToUse: config
-      nugetConfigPath: 'build\tfs\win32\ESRPClient\NuGet.config'
-      externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
-      restoreDirectory: packages
-
-  - task: ESRPImportCertTask@1
-    displayName: Import ESRP Request Signing Certificate
-    inputs:
-      ESRP: 'ESRP CodeSign'
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
-    displayName: Import ESRP Auth Certificate
-
   - powershell: |
       $ErrorActionPreference = "Stop"
       "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
@@ -58,12 +39,12 @@ phases:
       npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-copy-inno-updater"
     name: build
 
-  # - powershell: |
-  #     $ErrorActionPreference = "Stop"
-  #     npm run gulp -- "electron-$(VSCODE_ARCH)"
-  #     .\scripts\test.bat --build --tfs "Unit Tests"
-  #     # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-  #   name: test
+  - powershell: |
+      $ErrorActionPreference = "Stop"
+      npm run gulp -- "electron-$(VSCODE_ARCH)"
+      .\scripts\test.bat --build --tfs "Unit Tests"
+      # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+    name: test
 
   # - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   #   inputs:
@@ -144,6 +125,25 @@ phases:
   #       ]
   #     SessionTimeout: 120
 
+  - task: NuGetCommand@2
+    displayName: Install ESRPClient.exe
+    inputs:
+      restoreSolution: 'build\tfs\win32\ESRPClient\packages.config'
+      feedsToUse: config
+      nugetConfigPath: 'build\tfs\win32\ESRPClient\NuGet.config'
+      externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+      restoreDirectory: packages
+
+  - task: ESRPImportCertTask@1
+    displayName: Import ESRP Request Signing Certificate
+    inputs:
+      ESRP: 'ESRP CodeSign'
+
+  - powershell: |
+      $ErrorActionPreference = "Stop"
+      .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
+    displayName: Import ESRP Auth Certificate
+
   - powershell: |
       $ErrorActionPreference = "Stop"
       npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup"
-- 
GitLab