Merge release into master

CHANGELOG.md

@@ -1,18 +1,22 @@
-## Known Issues in 1.10.0
+## Known Issues in 1.11.0
 
 * When opening a .csproj-based .NET Core project in VS Code, the C# extension will not activate until a C# file is opened in the editor. ([#1150](https://github.com/OmniSharp/omnisharp-vscode/issues/1150))
 * There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
-* .NET Core SDK 2.0-preview2 is not yet supported. ([#1495](https://github.com/OmniSharp/omnisharp-vscode/issues/1495))
 
-## 1.11.0 _(Not Yet Released)_
+## 1.11.0 (June 27, 2017)
 
 #### Completion List
 
 * No longer trigger completion when a '<' character is typed. ([#1521](https://github.com/OmniSharp/omnisharp-vscode/issues/1521), PR: [#1530](https://github.com/OmniSharp/omnisharp-vscode/pull/1530))
 * Completion list no longer triggers on space in contexts where a lambda expression could be typed. ([#1524](https://github.com/OmniSharp/omnisharp-vscode/issues/1524), PR: [#1548](https://github.com/OmniSharp/omnisharp-vscode/pull/1548))
 
+#### Project System
+
+* Fixed support for the latest .NET Core 2.0 preview. ([#1566](https://github.com/OmniSharp/omnisharp-vscode/issues/1566))
+
 #### Other Updates and Fixes
 
+* Improved download speeds for OmniSharp and Mono dependencies.
 * Allow the ".NET: Restore Packages" command to run on projects targeting full framework. ([#1507](https://github.com/OmniSharp/omnisharp-vscode/pull/1507), PR: [#1545](https://github.com/OmniSharp/omnisharp-vscode/pull/1545)) _(contributed by [@adamhartford](https://github.com/adamhartford))_
 
 ## 1.10.0 (May 25, 2017)

README.md

@@ -18,13 +18,11 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
 * [Documentation](https://code.visualstudio.com/docs/languages/csharp)
 * [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-with-VS-Code-using-CSharp-and-NET-Core)
 
-### What's New in 1.10.0
+### What's New in 1.11.0
 
-* Support added for NUnit and MSBuild tests.
-* Several improvements to the completion list, including new icons for events.
-* Important debugger fixes for OSX.
-* Project references outside of the opened folder are now loaded.
-* Lot's more!
+* Support for latest .NET Core 2.0 preview.
+* Completion list fixes when typing lambda expressions.
+* Other bug fixes
 
 See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.10.0/CHANGELOG.md) for all of the updates.
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.11.0-beta4",
+  "version": "1.11.0",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",

src/features/status.ts

@@ -135,7 +135,7 @@ export function reportDocumentStatus(server: OmniSharpServer): vscode.Disposable
                     SourceFiles: string[];
                 }
 
-                let fileNames: vscode.DocumentSelector[] = [];
+                let fileNames: vscode.DocumentFilter[] = [];
                 let label: string;
 
                 function addProjectFileNames(project: Project) {

test/assets.test.ts

@@ -40,7 +40,7 @@ suite("Asset generation: project.json", () => {
         let rootPath = path.resolve('testRoot');
         let info = createDotNetWorkspaceInformation(rootPath, 'testApp.dll', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@@ -52,7 +52,7 @@ suite("Asset generation: project.json", () => {
         let rootPath = path.resolve('testRoot');
         let info = createDotNetWorkspaceInformation(path.join(rootPath, 'nested'), 'testApp.dll', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@@ -64,7 +64,7 @@ suite("Asset generation: project.json", () => {
         let rootPath = path.resolve('testRoot');
         let info = createDotNetWorkspaceInformation(rootPath, 'testApp.dll', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@@ -76,7 +76,7 @@ suite("Asset generation: project.json", () => {
         let rootPath = path.resolve('testRoot');
         let info = createDotNetWorkspaceInformation(path.join(rootPath, 'nested'), 'testApp.dll', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@@ -85,7 +85,7 @@ suite("Asset generation: project.json", () => {
     });
 });
 
-function createDotNetWorkspaceInformation(projectPath: string, compilationOutputAssemblyFile: string, targetFrameworkShortName: string, emitEntryPoint: boolean = true) : protocol.WorkspaceInformationResponse {
+function createDotNetWorkspaceInformation(projectPath: string, compilationOutputAssemblyFile: string, targetFrameworkShortName: string, emitEntryPoint: boolean = true): protocol.WorkspaceInformationResponse {
     return {
         DotNet: {
             Projects: [
@@ -148,7 +148,7 @@ suite("Asset generation: csproj", () => {
         let rootPath = path.resolve('testRoot');
         let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@@ -160,7 +160,7 @@ suite("Asset generation: csproj", () => {
         let rootPath = path.resolve('testRoot');
         let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'nested', 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ false), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@@ -172,7 +172,7 @@ suite("Asset generation: csproj", () => {
         let rootPath = path.resolve('testRoot');
         let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/bin/Debug/netcoreapp1.0/testApp.dll
@@ -184,7 +184,7 @@ suite("Asset generation: csproj", () => {
         let rootPath = path.resolve('testRoot');
         let info = createMSBuildWorkspaceInformation(path.join(rootPath, 'nested', 'testApp.csproj'), 'testApp', 'netcoreapp1.0');
         let generator = new AssetGenerator(info, rootPath);
-        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), null, true);
+        let launchJson = parse(generator.createLaunchJson(/*isWebProject*/ true), undefined, { disallowComments: true });
         let programPath = launchJson[0].program;
 
         // ${workspaceRoot}/nested/bin/Debug/netcoreapp1.0/testApp.dll
@@ -193,7 +193,7 @@ suite("Asset generation: csproj", () => {
     });
 });
 
-function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: string, targetFrameworkShortName: string, isExe: boolean = true) : protocol.WorkspaceInformationResponse {
+function createMSBuildWorkspaceInformation(projectPath: string, assemblyName: string, targetFrameworkShortName: string, isExe: boolean = true): protocol.WorkspaceInformationResponse {
     return {
         MsBuild: {
             SolutionPath: '',