diff --git a/README.md b/README.md index 76b0d651f..f7d24a6ac 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ With TFVC, the extension uses information about the current workspace to determi **Note:** At this time, you will need to have a ***local*** TFVC workspace already available on your local machine. More information about the difference between the two types (and how to determine which one you're using) can be found [here](TFVC_README.md#what-is-the-difference-between-a-local-and-server-workspace-how-can-i-tell-which-one-im-working-with). The issue tracking support for Server workspaces is [here](https://github.com/Microsoft/vsts-vscode/issues/176). ## Installation -First, you will need to install [Visual Studio Code](https://code.visualstudio.com/download) `1.11.1` or later. +First, you will need to install [Visual Studio Code](https://code.visualstudio.com/download) `1.12.0` or later. -To install the extension with the latest version of Visual Studio Code (version 1.11.1 is the latest as of this writing), bring up the Visual Studio Code Command Palette (`F1`), type `install` and choose `Extensions: Install Extensions`. In the `Search Extensions in Marketplace` text box, type `team`. Find the `Visual Studio Team Services` extension published by *Microsoft* and click the `Install` button. Restart Visual Studio Code. +To install the extension with the latest version of Visual Studio Code (version 1.13.1 is the latest as of this writing), bring up the Visual Studio Code Command Palette (`F1`), type `install` and choose `Extensions: Install Extensions`. In the `Search Extensions in Marketplace` text box, type `team`. Find the `Visual Studio Team Services` extension published by *Microsoft* and click the `Install` button. Restart Visual Studio Code. ## Authentication ### Visual Studio Team Services diff --git a/package.json b/package.json index c6cf61397..c419e263b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "license": "SEE LICENSE IN LICENSE.txt", "homepage": "https://github.com/Microsoft/vsts-vscode/blob/master/README.md", "engines": { - "vscode": "^1.11.0" + "vscode": "^1.12.0" }, "enableProposedApi": false, "activationEvents": [ diff --git a/src/tfvc/scm/model.ts b/src/tfvc/scm/model.ts index e06af5529..7b090d4e4 100644 --- a/src/tfvc/scm/model.ts +++ b/src/tfvc/scm/model.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ "use strict"; -import { Uri, EventEmitter, Event, Disposable, window } from "vscode"; +import { Uri, EventEmitter, Event, Disposable, ProgressLocation, window } from "vscode"; import { Telemetry } from "../../services/telemetry"; import { TfvcTelemetryEvents } from "../../helpers/constants"; import { TfvcRepository } from "../tfvcrepository"; @@ -91,7 +91,7 @@ export class Model implements Disposable { } private async run(fn: () => Promise): Promise { - return window.withScmProgress(async () => { + return window.withProgress({ location: ProgressLocation.SourceControl }, async () => { if (fn) { await fn(); } else {