Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2

build/azure-pipelines/darwin/continuous-build-darwin.yml

@@ -44,10 +44,10 @@ steps:
 - script: |
     ./scripts/test.sh --tfs "Unit Tests"
   displayName: Run Unit Tests (Electron)
-# - script: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
-#     yarn test-browser --browser chromium --browser webkit
+# - script: | {{SQL CARBON EDIT}} disable
+#     yarn test-browser --browser chromium --browser webkit --browser firefox
 #   displayName: Run Unit Tests (Browser)
-# - script: | {{SQL CARBON EDIT}} remove step
+# - script: | {{SQL CARBON EDIT}} disable
 #     ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 - task: PublishTestResults@2

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -77,23 +77,6 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-  env:
-    OSS_GITHUB_ID: "a5d3c261b032765a78de"
-    OSS_GITHUB_SECRET: $(oss-github-client-secret)
-    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
-    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
-    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
-    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
-    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
-    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
-    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
-    VSO_GITHUB_SECRET: $(vso-github-client-secret)
-    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
-    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
-    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
-    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
-    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
-    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - script: |
     set -e
@@ -118,7 +101,7 @@ steps:
 
 - script: |
     set -e
-    yarn test-browser --build --browser chromium --browser webkit
+    yarn test-browser --build --browser chromium --browser webkit --browser firefox
   displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 

build/azure-pipelines/exploration-build.yml

@@ -1,8 +1,12 @@
 pool:
   vmImage: 'Ubuntu-16.04'
 
-trigger: none
-pr: none
+trigger:
+  branches:
+    include: ['master']
+pr:
+  branches:
+    include: ['master']
 
 steps:
 - task: NodeTool@0
@@ -27,10 +31,10 @@ steps:
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
 
-    git checkout origin/electron-6.0.x
+    git checkout origin/electron-8.0.x
     git merge origin/master
 
     # Push master branch into exploration branch
-    git push origin HEAD:electron-6.0.x
+    git push origin HEAD:electron-8.0.x
 
   displayName: Sync & Merge Exploration

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -52,10 +52,10 @@ steps:
 - script: |
     DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
   displayName: Run Unit Tests (Electron)
-# - script: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
+# - script: |  {{SQL CARBON EDIT}} disable
 #     DISPLAY=:10 yarn test-browser --browser chromium
 #   displayName: Run Unit Tests (Browser)
-# - script: | {{SQL CARBON EDIT}} remove step
+# - script: |  {{SQL CARBON EDIT}} disable
 #     DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 - task: PublishTestResults@2

build/azure-pipelines/linux/product-build-linux-multiarch.yml

@@ -86,23 +86,6 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-  env:
-    OSS_GITHUB_ID: "a5d3c261b032765a78de"
-    OSS_GITHUB_SECRET: $(oss-github-client-secret)
-    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
-    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
-    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
-    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
-    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
-    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
-    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
-    VSO_GITHUB_SECRET: $(vso-github-client-secret)
-    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
-    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
-    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
-    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
-    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
-    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - script: |
     set -e

build/azure-pipelines/linux/product-build-linux.yml

@@ -76,23 +76,6 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-  env:
-    OSS_GITHUB_ID: "a5d3c261b032765a78de"
-    OSS_GITHUB_SECRET: $(oss-github-client-secret)
-    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
-    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
-    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
-    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
-    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
-    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
-    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
-    VSO_GITHUB_SECRET: $(vso-github-client-secret)
-    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
-    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
-    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
-    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
-    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
-    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - script: |
     set -e

build/azure-pipelines/product-compile.yml

@@ -74,9 +74,9 @@ steps:
 
 - script: |
     set -e
-    yarn postinstall
-  displayName: Run postinstall scripts
-  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
+    yarn generate-github-config
+  displayName: Generate GitHub config
+  condition: succeeded()
   env:
     OSS_GITHUB_ID: "a5d3c261b032765a78de"
     OSS_GITHUB_SECRET: $(oss-github-client-secret)
@@ -95,6 +95,12 @@ steps:
     GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
     GITHUB_APP_SECRET: $(github-app-client-secret)
 
+- script: |
+    set -e
+    yarn postinstall
+  displayName: Run postinstall scripts
+  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
+
 # Mixin must run before optimize, because the CSS loader will
 # inline small SVGs
 - script: |

build/azure-pipelines/publish-types/publish-types.yml

@@ -63,7 +63,7 @@ steps:
 
     MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
     LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
-    MESSAGE2="[@octref, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
+    MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
 
     curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
     -H 'Content-type: application/json; charset=utf-8' \

build/azure-pipelines/win32/continuous-build-win32.yml

@@ -49,10 +49,10 @@ steps:
 - powershell: |
     .\scripts\test.bat --tfs "Unit Tests"
   displayName: Run Unit Tests (Electron)
-# - powershell: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
-#     yarn test-browser --browser chromium
+# - powershell: | {{SQL CARBON EDIT}} disable
+#     yarn test-browser --browser chromium --browser firefox
 #   displayName: Run Unit Tests (Browser)
-# - powershell: | {{SQL CARBON EDIT}} remove step
+# - powershell: | {{SQL CARBON EDIT}} disable
 #     .\scripts\test-integration.bat --tfs "Integration Tests"
 #   displayName: Run Integration Tests (Electron)
 - task: PublishTestResults@2

build/azure-pipelines/win32/product-build-win32.yml

@@ -86,23 +86,6 @@ steps:
     exec { yarn postinstall }
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-  env:
-    OSS_GITHUB_ID: "a5d3c261b032765a78de"
-    OSS_GITHUB_SECRET: $(oss-github-client-secret)
-    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
-    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
-    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
-    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
-    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
-    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
-    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
-    VSO_GITHUB_SECRET: $(vso-github-client-secret)
-    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
-    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
-    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
-    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
-    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
-    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -132,7 +115,7 @@ steps:
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { yarn test-browser --build --browser chromium }
+    exec { yarn test-browser --build --browser chromium --browser firefox }
   displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))