Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

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

@@ -1,21 +1,21 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "12.13.0"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
+  inputs:
+    versionSpec: "1.x"
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
     keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
-    vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache
+    vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'
   inputs:
     azureSubscription: 'azuredatastudio-adointegration'
     KeyVaultName: ado-secrets
     SecretsFilter: 'github-distro-mixin-password'
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version
-  inputs:
-    versionSpec: "1.x"
 - script: |
     CHILD_CONCURRENCY=1 yarn --frozen-lockfile
   displayName: Install Dependencies
@@ -26,7 +26,7 @@ steps:
   inputs:
     keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
     targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
-    vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache
+    vstsFeed: 'npm-cache' # {{SQL CARBON EDIT}} update build cache
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - script: |
     yarn electron x64

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

@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "12.13.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

build/azure-pipelines/darwin/publish.sh

@@ -5,28 +5,20 @@ set -e
 zip -d ../VSCode-darwin.zip "*.pkg"
 
 # publish the build
-PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
-VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
-node build/azure-pipelines/common/publish.js \
-	"$VSCODE_QUALITY" \
+node build/azure-pipelines/common/createAsset.js \
 	darwin \
 	archive \
 	"VSCode-darwin-$VSCODE_QUALITY.zip" \
-	$VERSION \
-	true \
 	../VSCode-darwin.zip
 
 # package Remote Extension Host
 pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
 
 # publish Remote Extension Host
-node build/azure-pipelines/common/publish.js \
-	"$VSCODE_QUALITY" \
+node build/azure-pipelines/common/createAsset.js \
 	server-darwin \
 	archive-unsigned \
 	"vscode-server-darwin.zip" \
-	$VERSION \
-	true \
 	../vscode-server-darwin.zip
 
 # publish hockeyapp symbols