Merge branch 'master' into release

Author: DustinCampbell

src/main.ts

@@ -45,7 +45,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<{ init
 
     return {
         initializationFinished: Promise.all([omniSharpPromise, coreClrDebugPromise])
-        .then(a => {})
+        .then(promiseResult => {
+            // This promise resolver simply swallows the result of Promise.all. When we decide we want to expose this level of detail
+            // to other extensions then we will design that return type and implement it here.
+        })
     };
 }
 

test/integrationTests/testAssets/testAssets.ts

@@ -47,7 +47,7 @@ export class TestAssetWorkspace {
     }
 
     get vsCodeDirectoryPath(): string {
-        return path.join(vscode.workspace.rootPath, ".vscode");;
+        return path.join(vscode.workspace.rootPath, ".vscode");
     }
 
     get launchJsonPath(): string {