Merge master into ds custom

CONTRIBUTING.md

@@ -188,7 +188,7 @@ From there use the ```Extension + Debugger``` launch option.
 Information on our coding standards can be found [here](https://github.com/Microsoft/vscode-python/blob/master/CODING_STANDARDS.md).
 We have CI tests to ensure the code committed will adhere to the above coding standards. *You can run this locally by executing the command `npx gulp precommit` or use the `precommit` Task.
 
-Messages displayed to the user must ve localized using/created constants from/in the [localize.ts](https://github.com/Microsoft/vscode-python/blob/master/src/client/common/utils/localize.ts) file.
+Messages displayed to the user must be localized using/created constants from/in the [localize.ts](https://github.com/Microsoft/vscode-python/blob/master/src/client/common/utils/localize.ts) file.
 
 ## Development process
 

build/.mocha.functional.perf.opts

@@ -0,0 +1,9 @@
+./out/test/**/*.functional.test.js
+--require=out/test/unittests.js
+--exclude=out/**/*.jsx
+--ui=tdd
+--recursive
+--colors
+--exit
+--timeout=180000
+--reporter spec

build/ci/vscode-python-ci-manual.yaml

@@ -0,0 +1,296 @@
+# manual CI build
+
+name: '$(Year:yyyy).$(Month).0.$(BuildID)-manual'
+
+trigger: none
+pr: none
+
+# Variables that are available for the entire pipeline.
+variables:
+- template: templates/globals.yml
+
+stages:
+- stage: Build
+  jobs:
+  - template: templates/jobs/build_compile.yml
+
+# Each item in each matrix has a number of possible values it may
+# define.  They are detailed in templates/test_phases.yml.  The only
+# required value is "TestsToRun".
+
+- stage: Linux
+  dependsOn: []
+  jobs:
+  - job: 'Py3x'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          # with mocks
+          # focused on small units (i.e. functions)
+          # and tightly controlled dependencies
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          # no mocks, no vscode
+          # focused on integration
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          # no mocks, with vscode
+          # focused on integration
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+        'Multi Workspace':
+          # no mocks, with vscode
+          # focused on integration
+          TestsToRun: 'testMultiWorkspace'
+          NeedsPythonTestReqs: true
+        'Venv':
+          TestsToRun: 'venvTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+          # This is for the venvTests to use, not needed if you don't run venv tests...
+          PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+        'Debugger':
+          TestsToRun: 'testDebugger'
+          NeedsPythonTestReqs: true
+        'Smoke':
+          TestsToRun: 'testSmoke'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - template: templates/test_phases.yml
+
+  # This is the oldest Python 3 version we support.
+  - job: 'Py36'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          PythonVersion: '3.6'
+          # Note: "pythonInternalTools" tests are 3.7+.
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          PythonVersion: '3.6'
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          PythonVersion: '3.6'
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - template: templates/test_phases.yml
+
+  # This is the oldest Python 3 version we support.
+  - job: 'Py35'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          PythonVersion: '3.5'
+          # Note: "pythonInternalTools" tests are 3.7+.
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          PythonVersion: '3.5'
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          PythonVersion: '3.5'
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+        'Venv':
+          PythonVersion: '3.5'
+          TestsToRun: 'venvTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+          PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+        'Debugger':
+          PythonVersion: '3.5'
+          TestsToRun: 'testDebugger'
+          NeedsPythonTestReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - template: templates/test_phases.yml
+
+- stage: Mac
+  dependsOn: []
+  jobs:
+  - job: 'Py3x'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+        'Multi Workspace':
+          TestsToRun: 'testMultiWorkspace'
+          NeedsPythonTestReqs: true
+        'Venv':
+          TestsToRun: 'venvTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+          PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+        'Debugger':
+          TestsToRun: 'testDebugger'
+          NeedsPythonTestReqs: true
+        'Smoke':
+          TestsToRun: 'testSmoke'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'macos-10.13'
+    steps:
+      - template: templates/test_phases.yml
+
+  # This is the oldest Python 3 version we support.
+  - job: 'Py35'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          PythonVersion: '3.5'
+          # Note: "pythonInternalTools" tests are 3.7+.
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          PythonVersion: '3.5'
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          PythonVersion: '3.5'
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+        'Venv':
+          PythonVersion: '3.5'
+          TestsToRun: 'venvTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+          PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+        'Debugger':
+          PythonVersion: '3.5'
+          TestsToRun: 'testDebugger'
+          NeedsPythonTestReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'macos-10.13'
+    steps:
+      - template: templates/test_phases.yml
+
+- stage: Windows
+  dependsOn: []
+  jobs:
+  - job: 'Py3x'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonInternalTools, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+        'Multi Workspace':
+          TestsToRun: 'testMultiWorkspace'
+          NeedsPythonTestReqs: true
+        'Venv':
+          TestsToRun: 'venvTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+          PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+        'Debugger':
+          TestsToRun: 'testDebugger'
+          NeedsPythonTestReqs: true
+        'Smoke':
+          TestsToRun: 'testSmoke'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'vs2017-win2016'
+    steps:
+      - template: templates/test_phases.yml
+
+  # This is the oldest Python 3 version we support.
+  - job: 'Py35'
+    dependsOn: []
+    timeoutInMinutes: 120
+    strategy:
+      matrix:
+        'Unit':
+          PythonVersion: '3.5'
+          # Note: "pythonInternalTools" tests are 3.7+.
+          TestsToRun: 'testUnitTests, pythonUnitTests, pythonIPythonTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+        'Functional':
+          PythonVersion: '3.5'
+          TestsToRun: 'testfunctional'
+          NeedsPythonTestReqs: true
+          NeedsPythonFunctionalReqs: true
+        'Single Workspace':
+          PythonVersion: '3.5'
+          TestsToRun: 'testSingleWorkspace'
+          NeedsPythonTestReqs: true
+        'Venv':
+          PythonVersion: '3.5'
+          TestsToRun: 'venvTests'
+          NeedsPythonTestReqs: true
+          NeedsIPythonReqs: true
+          PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
+        'Debugger':
+          PythonVersion: '3.5'
+          TestsToRun: 'testDebugger'
+          NeedsPythonTestReqs: true
+      #maxParallel: 3
+    pool:
+      vmImage: 'vs2017-win2016'
+    steps:
+      - template: templates/test_phases.yml
+
+- stage: Reports
+  dependsOn:
+  - Linux
+  - Mac
+  - Windows
+  condition: always()
+  jobs:
+  - template: templates/jobs/coverage.yml