Merge branch 'master' into patch-1

Author: JoeRobich

.github/workflows/ci.yml

@@ -28,22 +28,33 @@ jobs:
         node-version: '12.x'
 
     - name: Install dependencies
-      run: npm ci && npm i -g gulp
+      run: |
+          npm ci
+          npm i -g gulp
 
-    - name: Build
+    - name: Build extension package
       run: gulp 'vsix:release:package'
 
-    - name: Initialize code coverage
-      run: gulp cov:instrument
-
     - name: Run unit and integration tests
-      run: gulp test
+      run: |
+          gulp cov:instrument
+          gulp test
+          gulp cov:merge
+          npm run test:artifacts
       env:
         CODE_VERSION: 1.45.0
         DISPLAY: :99.0
 
-    - name: Report code coverage
-      run: gulp cov:report
+    - name: Report unit test coverage
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage/unit/lcov.info
+        flags: unit
 
-    - name: Run artifact tests
-      run: npm run test:artifacts
+    - name: Report integration test coverage
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage/integration/lcov.info
+        flags: integration

.github/workflows/release-ci.yml

@@ -17,9 +17,11 @@ jobs:
         node-version: '12.x'
 
     - name: Install dependencies
-      run: npm ci && npm i -g gulp
+      run: |
+          npm ci
+          npm i -g gulp
 
-    - name: Build
+    - name: Build extension package
       run: gulp 'vsix:release:package'
 
     - name: Run release tests
@@ -37,4 +39,4 @@ jobs:
         upload_url: ${{ github.event.release.upload_url }}
         asset_path: ./csharp-${{ env.VERSION }}.vsix
         asset_name: csharp-${{ env.VERSION }}.vsix
-        asset_content_type: application/zip  
+        asset_content_type: application/zip

.gitignore

@@ -4,16 +4,17 @@ node_modules
 out
 .omnisharp/
 .omnisharp-*/
-.debugger
-.razor
-.vscode-test
-.razor
+.vs/
+.debugger/
+.razor/
+.vscode-test/
 dist/
 *.razor.json
 
 install.*
 
 *.vsix
+*.map
 
 
 test/**/.vscode/launch.json

debugger.md

@@ -2,21 +2,14 @@
 This page gives you detailed instructions on how to debug code running under .NET Core in VS Code. 
 
 #### Your Feedback​
-File bugs and feature requests [here](https://github.com/OmniSharp/omnisharp-vscode/issues) and [join our insiders group](http://landinghub.visualstudio.com/dotnetcoreinsiders) to help us build great tooling for .NET Core.
+File bugs and feature requests [here](https://github.com/OmniSharp/omnisharp-vscode/issues) to help us build great tooling for .NET Core.
 
 ### First Time setup
 ##### 1: Get Visual Studio Code
-Install Visual Studio Code (VSC). Pick the latest VSC version from here: https://code.visualstudio.com Make sure it is at least 1.5. 
-
-If you are not sure what version you have, you can see your version of VS Code:
-
-* **OSX:** Code->About Visual Studio Code
-* **Windows / Linux:** Help->About
+Install Visual Studio Code (VS Code). Pick the latest VS Code version from here: https://code.visualstudio.com
 
 ##### 2: Install .NET command line tools
-Install the .NET Core command line tools (CLI) by following the installation part of the instructions here: https://www.microsoft.com/net/core
-
-**OSX:** .NET Core requires openSSL to work. Don't forget this! Execute: `brew install openssl`
+Install the .NET Core command line tools (CLI) by following the installation part of the instructions here: https://dotnet.microsoft.com/download
 
 ##### 3: Install C# Extension for VS Code
 Open the command palette in VS Code (press <kbd>F1</kbd>) and run `Extensions: Install Extensions`. Enter `C#` in the search box and press `Enter`. Select the extension and click on `Install`.
@@ -30,15 +23,14 @@ The first time that C# code is opened in VS Code, the extension will download th
 ### Once for each project
 The following steps have to be executed for every project. 
 ##### 1: Get a project
-You can start from scratch by creating an empty project with `dotnet new`. Begin by opening the terminal in Visual Studio Code (`View->Integrated Terminal`) and type these commands:
+You can start from scratch by creating an empty console project with `dotnet new`. Begin by opening the terminal in Visual Studio Code (`View->Integrated Terminal`) and type these commands:
 
     cd ~
     mkdir MyApplication
     cd MyApplication
-    dotnet new
-    dotnet restore
-
-If you want a web project (ASP.NET project) use `dotnet new web`. For web projects, makes sure to run `bower install` before running so that they can restore assets.
+    dotnet new console
+    
+See `dotnet new --list` for a list of all the available project templates.
 
 ##### 2: Open the directory in VS Code
 Go to `File->Open Folder` (`File->Open` on macOS) and open the directory in Visual Studio Code. If this is the first time that the C# extension has been activated, it will now download additional platform-specific dependencies.