Merge remote-tracking branch 'origin/master' into improve-outline-breadcrumbs

Author: trolleyman

.editorconfig

@@ -10,6 +10,6 @@ indent_size = 4
 trim_trailing_whitespace = true
 
 # 2 space indentation and utf-8 for *.yml, package.json, and .json files under src
-[{*.yml,package.json,src/**/*.json}]
+[{*.yml,package.json,*.json}]
 indent_size = 2
 charset = utf-8

ISSUE_TEMPLATE renamed to .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +1,39 @@
-<!-- To prefill this information:
-1. Open Visual Studio Code
-2. Bring up the command palette (press <kbd>F1</kbd>)
-3. Type `CSharp: Report an issue`
-
-If the `CSharp: Report an issue` command doesn't appear, make sure that you have C# extension version 1.17.0 or newer installed.
--->
-
-## Environment data
-`dotnet --info` output:
-VS Code version:
-C# Extension version:
-
-## OmniSharp log
-
-
-## Steps to reproduce
-
-
-## Expected  behavior
-
-
-## Actual behavior
+---
+name: 🐞 Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- To prefill this information:
+1. Open Visual Studio Code
+2. Bring up the command palette (press <kbd>F1</kbd>)
+3. Type `CSharp: Report an issue`
+
+If the `CSharp: Report an issue` command doesn't appear, make sure that you have C# extension version 1.17.0 or newer installed.
+-->
+
+## Environment data
+`dotnet --info` output:
+VS Code version:
+C# Extension version:
+
+## OmniSharp log
+
+
+## Steps to reproduce
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Expected  behavior
+A clear and concise description of what you expected to happen.
+
+## Actual behavior
+
+## Additional context
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Issue with Razor (Blazor) tooling
+    url:  https://github.com/dotnet/razor-tooling/issues/new/choose
+    about: Please open issues relating to the Razor tooling in dotnet/razor-tooling.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: 💡 Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Describe the solution you would like
+A clear and concise description of what you want to happen.
+
+## Applicable Scenarios
+In what scenarios would the feature apply?
+
+## Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+Add any other context or screenshots about the feature request here.

.github/workflows/branch-merge.yml

@@ -0,0 +1,22 @@
+name: Merge master into feature/lsp-engine
+on:
+  schedule:
+    - cron:  '0 */3 * * *'
+  workflow_dispatch:
+jobs:
+  Create-Merge-PR:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: feature/lsp-engine
+      - name: Get changes from master
+        run: |
+          git remote add upstream https://github.com/OmniSharp/omnisharp-vscode.git
+          git fetch upstream master:upstream-master
+          git reset --hard upstream-master
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          title: Merge master into feature/lsp-engine
+          branch: merge-master-to-feature-lsp-engine

.github/workflows/ci.yml

@@ -2,25 +2,26 @@ name: OmniSharp-VSCode CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, feature/** ]
 
   pull_request:
-    branches: [ master ]
+    branches: [ master, feature/** ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Setup virtual display
       run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
 
-    - name: Install .NET Core 5.0 SDK
+    - name: Install .NET Core 6.0 SDK
       uses: actions/[email protected]
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Install Node.js 15.x
       uses: actions/setup-node@v1
@@ -40,11 +41,11 @@ jobs:
 
     - name: Run unit and integration tests
       run: |
-          gulp test
+          npm run test
           npm run test:artifacts
       env:
-        CODE_VERSION: 1.45.0
+        CODE_VERSION: 1.66.0
         DISPLAY: :99.0
 
     - name: Build platform-specific extension package
-      run: gulp 'vsix:release:package:platform-specific'
+      run: gulp 'vsix:release:package:platform-specific'

.github/workflows/release-ci.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
     - uses: actions/checkout@v2
@@ -73,6 +74,28 @@ jobs:
         asset_path: ./csharp-${{ env.VERSION }}-linux-x64.vsix
         asset_name: csharp-${{ env.VERSION }}-linux-x64.vsix
         asset_content_type: application/zip
+        
+    - name: Upload release build (alpine-arm64)
+      id: upload-release-asset-alpine-arm64
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./csharp-${{ env.VERSION }}-alpine-arm64.vsix
+        asset_name: csharp-${{ env.VERSION }}-alpine-arm64.vsix
+        asset_content_type: application/zip
+
+    - name: Upload release build (alpine-x64)
+      id: upload-release-asset-alpine-x64
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./csharp-${{ env.VERSION }}-alpine-x64.vsix
+        asset_name: csharp-${{ env.VERSION }}-alpine-x64.vsix
+        asset_content_type: application/zip
 
     - name: Upload release build (win32-arm64)
       id: upload-release-asset-win32-arm64

.mocharc.jsonc

@@ -1,7 +1,6 @@
 {
     "ui": "tdd",
     "require": [
-        "source-map-support/register",
-        "ts-node/register"
+        "source-map-support/register"
     ]
-}
+}

.vscode/launch.json

@@ -9,7 +9,6 @@
             "args": [
                 "--extensionDevelopmentPath=${workspaceRoot}"
             ],
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/dist/*.js"
@@ -52,7 +51,6 @@
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
                 "OSVC_SUITE": "featureTests"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/out/test/**/*.js"
@@ -77,7 +75,6 @@
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
                 "OSVC_SUITE": "singleCsproj"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/dist/*.js"
@@ -121,7 +118,6 @@
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
                 "OSVC_SUITE": "slnWithCsproj"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/dist/*.js"
@@ -146,7 +142,6 @@
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
                 "OSVC_SUITE": "slnFilterWithCsproj"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/dist/*.js"
@@ -171,7 +166,6 @@
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
                 "OSVC_SUITE": "slnWithGenerator"
             },
-            "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/dist/*.js"
@@ -188,8 +182,8 @@
                 "updatePackageDependencies"
             ],
             "env": {
-                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-linux-x64-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-linux-x86-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-linux-arm64-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-osx-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-win-x64-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-win-x86-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-win-arm64-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-linux-x64-net6.0-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-linux-arm64-net6.0-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-osx-x64-net6.0-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-osx-arm64-net6.0-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-win-x64-net6.0-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-win-x86-net6.0-1.38.1.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.38.1/omnisharp-win-arm64-net6.0-1.38.1.zip",
-                "NEW_DEPS_VERSION": "1.38.1"
+                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-x64-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-x86-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-arm64-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-osx-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-win-x64-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-win-x86-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-win-arm64-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-musl-x64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-musl-arm64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-x64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-linux-arm64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-osx-x64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-osx-arm64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-win-x64-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-win-x86-net6.0-1.39.3.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.3/omnisharp-win-arm64-net6.0-1.39.3.zip",
+                "NEW_DEPS_VERSION": "1.39.3"
             },
             "cwd": "${workspaceFolder}"
         }