Merge branch 'master' of https://github.com/Microsoft/vscode

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CHILD_CONCURRENCY: "1"
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
     - uses: actions/checkout@v1
     # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
@@ -45,6 +46,7 @@ jobs:
     runs-on: windows-2016
     env:
       CHILD_CONCURRENCY: "1"
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
@@ -76,6 +78,7 @@ jobs:
     runs-on: macos-latest
     env:
       CHILD_CONCURRENCY: "1"
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1

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

@@ -11,7 +11,7 @@ steps:
   inputs:
     versionSpec: "1.x"
 - script: |
-    yarn --frozen-lockfile
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
   displayName: Install Dependencies
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1

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

@@ -19,7 +19,7 @@ steps:
   inputs:
     versionSpec: "1.x"
 - script: |
-    yarn --frozen-lockfile
+    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
   displayName: Install Dependencies
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1

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

@@ -16,6 +16,8 @@ steps:
     vstsFeed: '$(ArtifactFeed)'
 - powershell: |
     yarn --frozen-lockfile
+  env:
+    CHILD_CONCURRENCY: "1"
   displayName: Install Dependencies
   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1

src/vs/workbench/services/label/common/labelService.ts

@@ -13,7 +13,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkspaceContextService, IWorkspace } from 'vs/platform/workspace/common/workspace';
 import { isEqual, basenameOrAuthority, isEqualOrParent, basename, joinPath, dirname } from 'vs/base/common/resources';
-import { isWindows } from 'vs/base/common/platform';
 import { tildify, getPathLabel } from 'vs/base/common/labels';
 import { ltrim, endsWith } from 'vs/base/common/strings';
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
@@ -71,7 +70,7 @@ const sepRegexp = /\//g;
 const labelMatchingRegexp = /\$\{(scheme|authority|path|(query)\.(.+?))\}/g;
 
 function hasDriveLetter(path: string): boolean {
-	return !!(isWindows && path && path[2] === ':');
+	return !!(path && path[2] === ':');
 }
 
 class ResourceLabelFormattersHandler implements IWorkbenchContribution {