Merge branch 'master' into dotnet-sdk

OmniSharp · Sep 21, 2023 · 1daaddc · 1daaddc
2 parents ff2c1fc + 78026d8
commit 1daaddc
Show file tree

Hide file tree

Showing 343 changed files with 16,355 additions and 4,901 deletions.
diff --git a/.build/.build.csproj b/.build/.build.csproj
@@ -11,7 +11,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.ReSharper.CommandLineTools" ExcludeAssets="All" />
         <PackageReference Include="GitVersion.Tool" ExcludeAssets="All" />
         <PackageReference Include="ReportGenerator" ExcludeAssets="All" />
         <PackageReference Include="Rocket.Surgery.Nuke" />

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,13 +15,13 @@
             ]
         },
         "dotnet-reportgenerator-globaltool": {
-            "version": "5.1.24",
+            "version": "5.1.25",
             "commands": [
                 "reportgenerator"
             ]
         },
         "nuke.globaltool": {
-            "version": "6.2.1",
+            "version": "7.0.5",
             "commands": [
                 "nuke"
             ]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.0.0
         with:
           clean: 'false'
           fetch-depth: '0'
@@ -117,7 +117,7 @@ jobs:
         run: |
           dotnet nuke Pack --skip
       - name: 🐿 Publish Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4.0.0-beta.2
         with:
           name: 'actions-${{ matrix.os }}'
       - name: 🏺 Publish logs

diff --git a/.github/workflows/close-milestone.yml b/.github/workflows/close-milestone.yml
@@ -10,10 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.0.0
         with:
           fetch-depth: 0
 
+      - uses: actions/setup-dotnet@v3
+
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0.10.2
         with:
@@ -22,7 +24,7 @@ jobs:
       - name: Install GitReleaseManager
         uses: gittools/actions/gitreleasemanager/setup@v0.10.2
         with:
-          versionSpec: '0.11.x'
+          versionSpec: '0.15.x'
 
       - name: Use GitVersion
         id: gitversion

diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -11,13 +11,18 @@ on:
 
 jobs:
   create_milestone_and_draft_release:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.0.0
         with:
           fetch-depth: 0
 
+      - uses: actions/setup-dotnet@v3
+
       - name: Fetch all history for all tags and branches
         run: git fetch --prune
 
@@ -52,5 +57,5 @@ jobs:
           omitNameDuringUpdate: true
           name: 'v${{ steps.gitversion.outputs.majorMinorPatch }}'
           tag: 'v${{ steps.gitversion.outputs.majorMinorPatch }}'
-          token: ${{ secrets.OMNISHARP_BOT_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           commit: ${{ github.base_ref }}
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.0.0
 
       - name: Run Labeler
         if: success()
-        uses: crazy-max/ghaction-github-labeler@v4.2.0
+        uses: crazy-max/ghaction-github-labeler@v5.0.0
         with:
           yaml-file: .github/labels.yml
           skip-delete: false

diff --git a/.github/workflows/update-milestone.yml b/.github/workflows/update-milestone.yml
@@ -13,11 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.0.0
         with:
           ref: ${{ github.sha }}
           fetch-depth: 0
 
+      - uses: actions/setup-dotnet@v3
+
       - name: Fetch all history for all tags and branches
         run: git fetch --prune
 
@@ -31,7 +33,7 @@ jobs:
         if: ${{ github.event.action == 'opened' }}
         uses: gittools/actions/gitreleasemanager/setup@v0.10.2
         with:
-          versionSpec: '0.11.x'
+          versionSpec: '0.15.x'
 
       - name: Use GitVersion
         if: ${{ github.event.action == 'opened' }}

diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ coverage.info
 /codealike.json
 .tmp/
 .nuke/temp/
+**/*.received.cs
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -37,6 +37,7 @@
             "AppVeyor",
             "AzurePipelines",
             "Bamboo",
+            "Bitbucket",
             "Bitrise",
             "GitHubActions",
             "GitLab",

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Project>
   <PropertyGroup>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
@@ -23,28 +23,30 @@
   <ItemGroup>
     <PackageVersion Include="GitVersion.Tool" Version="5.12.0" />
     <PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2023.2.1" />
-    <PackageVersion Include="ReportGenerator" Version="5.1.24" />
+    <PackageVersion Include="ReportGenerator" Version="5.1.25" />
     <PackageVersion Include="Rocket.Surgery.Nuke" Version="0.19.1" />
   </ItemGroup>
   <ItemGroup>
     <!-- backwards compat is maintained in Directory.Packages.supports.props -->
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
+    <PackageVersion Include="xunit" Version="2.5.1" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="NSubstitute" Version="5.0.0" />
+    <PackageVersion Include="Verify.Xunit" Version="16.9.0" />
+    <PackageVersion Include="Verify.SourceGenerators" Version="1.5.0" />
+    <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2" />
     <PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
-    <PackageVersion Include="XunitXml.TestLogger" Version="3.0.78" />
+    <PackageVersion Include="XunitXml.TestLogger" Version="3.1.17" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.0" />
@@ -53,9 +55,9 @@
     <PackageVersion Include="Microsoft.Reactive.Testing" Version="5.0.0" />
     <PackageVersion Include="MediatR" Version="8.1.0" />
     <PackageVersion Include="Bogus" Version="34.0.2" />
-    <PackageVersion Include="Snapper" Version="2.3.2" />
+    <PackageVersion Include="Snapper" Version="2.4.0" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageVersion Include="Nerdbank.Streams" Version="2.8.57" />
+    <PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="DryIoc.Internal" Version="5.0.1" />

diff --git a/Directory.Packages.supports.props b/Directory.Packages.supports.props
@@ -4,12 +4,12 @@
         Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net472'"
     >
         <!-- Lower bound for most target frameworks -->
-        <PackageVersion Update="Microsoft.Extensions.Logging" Version="2.0.0" />
-    <PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
-    <PackageVersion Update="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
-    <PackageVersion Update="Microsoft.Extensions.Options" Version="2.0.0" />
-    <PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+        <PackageVersion Update="Microsoft.Extensions.Logging" Version="2.2.0" />
+    <PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
+    <PackageVersion Update="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
+    <PackageVersion Update="Microsoft.Extensions.Options" Version="2.2.0" />
+    <PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
+        <PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     </ItemGroup>
 </Project>
diff --git a/LSP.sln b/LSP.sln
@@ -6,6 +6,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D764E024-3D3
 	ProjectSection(SolutionItems) = preProject
 		src\Directory.Build.props = src\Directory.Build.props
 		src\Directory.Build.targets = src\Directory.Build.targets
+		src\.editorconfig = src\.editorconfig
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}"
@@ -38,6 +39,8 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleServer", "sample\SampleServer\SampleServer.csproj", "{F2067F5F-FA4E-4990-B301-E7898FC4C45F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{A316FCEC-81AD-45FB-93EE-C62CA09300DC}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "src\Client\Client.csproj", "{417E95B2-5AB9-49D5-B7CD-12255472E2E7}"
 EndProject
@@ -53,8 +56,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dap.Server", "src\Dap.Serve
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = ".build", ".build\.build.csproj", "{28B13787-A442-4D28-BF9A-3D65BF13AAEC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{26522B49-0743-4CBE-BA67-6D17FF65CAB9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "src\Shared\Shared.csproj", "{18FB2302-023B-4F6F-9F6D-099B47B69D9F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dap.Tests", "test\Dap.Tests\Dap.Tests.csproj", "{6D9E5BF4-4666-476B-AC88-D108A80567F6}"
@@ -81,6 +82,67 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Protocol.Proposals", "src\P
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsp.Integration.Tests", "test\Lsp.Integration.Tests\Lsp.Integration.Tests.csproj", "{72A74595-A278-46F0-9C8B-3151C9681B91}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}"
+	ProjectSection(SolutionItems) = preProject
+		.config\dotnet-tools.json = .config\dotnet-tools.json
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
+		Directory.Packages.supports.props = Directory.Packages.supports.props
+		Directory.Build.targets = Directory.Build.targets
+		.editorconfig = .editorconfig
+		build.cmd = build.cmd
+		build.sh = build.sh
+		build.ps1 = build.ps1
+		GitReleaseManager.yaml = GitReleaseManager.yaml
+		.codecov.yml = .codecov.yml
+		.azure-pipelines.yml = .azure-pipelines.yml
+		.appveyor.yml = .appveyor.yml
+		azure-pipelines.nuke.yml = azure-pipelines.nuke.yml
+		GitVersion.yml = GitVersion.yml
+		.travis.yml = .travis.yml
+		LICENSE = LICENSE
+		README.md = README.md
+		.gitignore = .gitignore
+		.gitattributes = .gitattributes
+		.prettierignore = .prettierignore
+		.prettierrc = .prettierrc
+		.lintstagedrc.js = .lintstagedrc.js
+		NuGet.config = NuGet.config
+		package.json = package.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{19909559-F753-4337-952B-A8B5B5889959}"
+	ProjectSection(SolutionItems) = preProject
+		.github\labels.yml = .github\labels.yml
+		.github\renovate.json = .github\renovate.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{97924298-E17E-46E6-83CC-D9CD3B9F5E6F}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci-ignore.yml = .github\workflows\ci-ignore.yml
+		.github\workflows\draft-release.yml = .github\workflows\draft-release.yml
+		.github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml
+		.github\workflows\dependabot-merge.yml = .github\workflows\dependabot-merge.yml
+		.github\workflows\sync-labels.yml = .github\workflows\sync-labels.yml
+		.github\workflows\close-milestone.yml = .github\workflows\close-milestone.yml
+		.github\workflows\update-milestone.yml = .github\workflows\update-milestone.yml
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".husky", ".husky", "{BED6765C-97D8-406D-B782-3307132D16F0}"
+	ProjectSection(SolutionItems) = preProject
+		.husky\pre-commit = .husky\pre-commit
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".vscode", ".vscode", "{09BE8ED9-1986-40F3-A9A6-D826A7413581}"
+	ProjectSection(SolutionItems) = preProject
+		.vscode\settings.json = .vscode\settings.json
+		.vscode\csharp.code-snippets = .vscode\csharp.code-snippets
+		.vscode\launch.json = .vscode\launch.json
+		.vscode\tasks.json.old = .vscode\tasks.json.old
+		.vscode\tasks.json = .vscode\tasks.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -388,7 +450,7 @@ Global
 		{E540868F-438E-4F7F-BBB7-010D6CB18A57} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
 		{F2C9D555-118E-442B-A953-9A7B58A53F33} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
 		{E1A9123B-A236-4240-8C82-A61BD85C3BF4} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
-		{28B13787-A442-4D28-BF9A-3D65BF13AAEC} = {26522B49-0743-4CBE-BA67-6D17FF65CAB9}
+		{28B13787-A442-4D28-BF9A-3D65BF13AAEC} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
 		{18FB2302-023B-4F6F-9F6D-099B47B69D9F} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
 		{6D9E5BF4-4666-476B-AC88-D108A80567F6} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
 		{678A4DD2-A656-4DCC-AE78-F9940C82A6E6} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
@@ -402,6 +464,10 @@ Global
 		{D43637CC-94E6-4ED4-BAA3-E5D1AD3285F5} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
 		{201B1CA7-AB12-41AD-9246-BC30F2EBE2DF} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
 		{72A74595-A278-46F0-9C8B-3151C9681B91} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
+		{19909559-F753-4337-952B-A8B5B5889959} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
+		{97924298-E17E-46E6-83CC-D9CD3B9F5E6F} = {19909559-F753-4337-952B-A8B5B5889959}
+		{BED6765C-97D8-406D-B782-3307132D16F0} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
+		{09BE8ED9-1986-40F3-A9A6-D826A7413581} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D38DD0EC-D095-4BCD-B8AF-2D788AF3B9AE}

diff --git a/benchmarks/Pipeline/Pipeline.csproj b/benchmarks/Pipeline/Pipeline.csproj
@@ -7,9 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
-        <PackageReference Include="Nerdbank.Streams" Version="2.6.81" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
+        <PackageReference Include="Nerdbank.Streams" Version="2.10.69" />
     </ItemGroup>
 
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.400",
+    "version": "7.0.401",
     "rollForward": "latestMinor"
   }
-}
+}
diff --git a/language-server-protocol.sha.txt b/language-server-protocol.sha.txt
@@ -1,4 +1,5 @@
 -- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages
-lastSha: bdcc0f2
+lastSha: 5fc92456c046ed980646bb95c1d2e390d5b3ef9d
+
+https://github.com/Microsoft/language-server-protocol/compare/5fc92456c046ed980646bb95c1d2e390d5b3ef9d..gh-pages
 
-https://github.com/Microsoft/language-server-protocol/compare/bdcc0f2..gh-pages