Skip to content

Commit 1daaddc

Browse files
manandremanandre
authored
Merge branch 'master' into dotnet-sdk
2 parents ff2c1fc + 78026d8 commit 1daaddc

File tree

343 files changed

+16355
-4901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+16355
-4901
lines changed

‎.build/.build.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="JetBrains.ReSharper.CommandLineTools" ExcludeAssets="All" />
1514
<PackageReference Include="GitVersion.Tool" ExcludeAssets="All" />
1615
<PackageReference Include="ReportGenerator" ExcludeAssets="All" />
1716
<PackageReference Include="Rocket.Surgery.Nuke" />

‎.config/dotnet-tools.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"dotnet-reportgenerator-globaltool": {
18-
"version": "5.1.24",
18+
"version": "5.1.25",
1919
"commands": [
2020
"reportgenerator"
2121
]
2222
},
2323
"nuke.globaltool": {
24-
"version": "6.2.1",
24+
"version": "7.0.5",
2525
"commands": [
2626
"nuke"
2727
]

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ${{ matrix.os }}
8080
steps:
8181
- name: Checkout
82-
uses: actions/checkout@v3.6.0
82+
uses: actions/checkout@v4.0.0
8383
with:
8484
clean: 'false'
8585
fetch-depth: '0'
@@ -117,7 +117,7 @@ jobs:
117117
run: |
118118
dotnet nuke Pack --skip
119119
- name: 🐿 Publish Coverage
120-
uses: codecov/codecov-action@v3
120+
uses: codecov/codecov-action@v4.0.0-beta.2
121121
with:
122122
name: 'actions-${{ matrix.os }}'
123123
- name: 🏺 Publish logs

‎.github/workflows/close-milestone.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3.6.0
13+
uses: actions/checkout@v4.0.0
1414
with:
1515
fetch-depth: 0
1616

17+
- uses: actions/setup-dotnet@v3
18+
1719
- name: Install GitVersion
1820
uses: gittools/actions/gitversion/[email protected]
1921
with:
@@ -22,7 +24,7 @@ jobs:
2224
- name: Install GitReleaseManager
2325
uses: gittools/actions/gitreleasemanager/[email protected]
2426
with:
25-
versionSpec: '0.11.x'
27+
versionSpec: '0.15.x'
2628

2729
- name: Use GitVersion
2830
id: gitversion

‎.github/workflows/draft-release.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@ on:
1111

1212
jobs:
1313
create_milestone_and_draft_release:
14+
permissions:
15+
# write permission is required to create a github release
16+
contents: write
1417
runs-on: ubuntu-latest
1518
steps:
1619
- name: Checkout
17-
uses: actions/checkout@v3.6.0
20+
uses: actions/checkout@v4.0.0
1821
with:
1922
fetch-depth: 0
2023

24+
- uses: actions/setup-dotnet@v3
25+
2126
- name: Fetch all history for all tags and branches
2227
run: git fetch --prune
2328

@@ -52,5 +57,5 @@ jobs:
5257
omitNameDuringUpdate: true
5358
name: 'v${{ steps.gitversion.outputs.majorMinorPatch }}'
5459
tag: 'v${{ steps.gitversion.outputs.majorMinorPatch }}'
55-
token: ${{ secrets.OMNISHARP_BOT_TOKEN }}
60+
token: ${{ secrets.GITHUB_TOKEN }}
5661
commit: ${{ github.base_ref }}

‎.github/workflows/sync-labels.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3.6.0
19+
uses: actions/checkout@v4.0.0
2020

2121
- name: Run Labeler
2222
if: success()
23-
uses: crazy-max/ghaction-github-labeler@v4.2.0
23+
uses: crazy-max/ghaction-github-labeler@v5.0.0
2424
with:
2525
yaml-file: .github/labels.yml
2626
skip-delete: false

‎.github/workflows/update-milestone.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3.6.0
16+
uses: actions/checkout@v4.0.0
1717
with:
1818
ref: ${{ github.sha }}
1919
fetch-depth: 0
2020

21+
- uses: actions/setup-dotnet@v3
22+
2123
- name: Fetch all history for all tags and branches
2224
run: git fetch --prune
2325

@@ -31,7 +33,7 @@ jobs:
3133
if: ${{ github.event.action == 'opened' }}
3234
uses: gittools/actions/gitreleasemanager/[email protected]
3335
with:
34-
versionSpec: '0.11.x'
36+
versionSpec: '0.15.x'
3537

3638
- name: Use GitVersion
3739
if: ${{ github.event.action == 'opened' }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ coverage.info
4646
/codealike.json
4747
.tmp/
4848
.nuke/temp/
49+
**/*.received.cs

‎.nuke/build.schema.json

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"AppVeyor",
3838
"AzurePipelines",
3939
"Bamboo",
40+
"Bitbucket",
4041
"Bitrise",
4142
"GitHubActions",
4243
"GitLab",

‎Directory.Packages.props

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<Project>
33
<PropertyGroup>
44
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
@@ -23,28 +23,30 @@
2323
<ItemGroup>
2424
<PackageVersion Include="GitVersion.Tool" Version="5.12.0" />
2525
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2023.2.1" />
26-
<PackageVersion Include="ReportGenerator" Version="5.1.24" />
26+
<PackageVersion Include="ReportGenerator" Version="5.1.25" />
2727
<PackageVersion Include="Rocket.Surgery.Nuke" Version="0.19.1" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<!-- backwards compat is maintained in Directory.Packages.supports.props -->
3131
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
3232
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
3434
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
3535
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
3636
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
37-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
38-
<PackageVersion Include="Newtonsoft.Json" Version="11.0.2" />
39-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
40-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
41-
<PackageVersion Include="xunit" Version="2.4.2" />
37+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
38+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
39+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
40+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
41+
<PackageVersion Include="xunit" Version="2.5.1" />
4242
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
43-
<PackageVersion Include="NSubstitute" Version="5.0.0" />
43+
<PackageVersion Include="Verify.Xunit" Version="16.9.0" />
44+
<PackageVersion Include="Verify.SourceGenerators" Version="1.5.0" />
45+
<PackageVersion Include="NSubstitute" Version="5.1.0" />
4446
<PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
4547
<PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2" />
4648
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
47-
<PackageVersion Include="XunitXml.TestLogger" Version="3.0.78" />
49+
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.17" />
4850
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
4951
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
5052
<PackageVersion Include="System.Reactive" Version="6.0.0" />
@@ -53,9 +55,9 @@
5355
<PackageVersion Include="Microsoft.Reactive.Testing" Version="5.0.0" />
5456
<PackageVersion Include="MediatR" Version="8.1.0" />
5557
<PackageVersion Include="Bogus" Version="34.0.2" />
56-
<PackageVersion Include="Snapper" Version="2.3.2" />
58+
<PackageVersion Include="Snapper" Version="2.4.0" />
5759
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
58-
<PackageVersion Include="Nerdbank.Streams" Version="2.8.57" />
60+
<PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
5961
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
6062
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
6163
<PackageVersion Include="DryIoc.Internal" Version="5.0.1" />

‎Directory.Packages.supports.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net472'"
55
>
66
<!-- Lower bound for most target frameworks -->
7-
<PackageVersion Update="Microsoft.Extensions.Logging" Version="2.0.0" />
8-
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
9-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="2.0.0" />
10-
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
11-
<PackageVersion Update="Microsoft.Extensions.Options" Version="2.0.0" />
12-
<PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
13-
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
7+
<PackageVersion Update="Microsoft.Extensions.Logging" Version="2.2.0" />
8+
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
9+
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="2.2.0" />
10+
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
11+
<PackageVersion Update="Microsoft.Extensions.Options" Version="2.2.0" />
12+
<PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
13+
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
1414
</ItemGroup>
1515
</Project>

‎LSP.sln

+69-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D764E024-3D3
66
ProjectSection(SolutionItems) = preProject
77
src\Directory.Build.props = src\Directory.Build.props
88
src\Directory.Build.targets = src\Directory.Build.targets
9+
src\.editorconfig = src\.editorconfig
910
EndProjectSection
1011
EndProject
1112
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}"
@@ -38,6 +39,8 @@ EndProject
3839
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleServer", "sample\SampleServer\SampleServer.csproj", "{F2067F5F-FA4E-4990-B301-E7898FC4C45F}"
3940
EndProject
4041
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{A316FCEC-81AD-45FB-93EE-C62CA09300DC}"
42+
ProjectSection(SolutionItems) = preProject
43+
EndProjectSection
4144
EndProject
4245
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "src\Client\Client.csproj", "{417E95B2-5AB9-49D5-B7CD-12255472E2E7}"
4346
EndProject
@@ -53,8 +56,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dap.Server", "src\Dap.Serve
5356
EndProject
5457
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = ".build", ".build\.build.csproj", "{28B13787-A442-4D28-BF9A-3D65BF13AAEC}"
5558
EndProject
56-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{26522B49-0743-4CBE-BA67-6D17FF65CAB9}"
57-
EndProject
5859
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "src\Shared\Shared.csproj", "{18FB2302-023B-4F6F-9F6D-099B47B69D9F}"
5960
EndProject
6061
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
8182
EndProject
8283
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsp.Integration.Tests", "test\Lsp.Integration.Tests\Lsp.Integration.Tests.csproj", "{72A74595-A278-46F0-9C8B-3151C9681B91}"
8384
EndProject
85+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}"
86+
ProjectSection(SolutionItems) = preProject
87+
.config\dotnet-tools.json = .config\dotnet-tools.json
88+
Directory.Build.props = Directory.Build.props
89+
Directory.Packages.props = Directory.Packages.props
90+
Directory.Packages.supports.props = Directory.Packages.supports.props
91+
Directory.Build.targets = Directory.Build.targets
92+
.editorconfig = .editorconfig
93+
build.cmd = build.cmd
94+
build.sh = build.sh
95+
build.ps1 = build.ps1
96+
GitReleaseManager.yaml = GitReleaseManager.yaml
97+
.codecov.yml = .codecov.yml
98+
.azure-pipelines.yml = .azure-pipelines.yml
99+
.appveyor.yml = .appveyor.yml
100+
azure-pipelines.nuke.yml = azure-pipelines.nuke.yml
101+
GitVersion.yml = GitVersion.yml
102+
.travis.yml = .travis.yml
103+
LICENSE = LICENSE
104+
README.md = README.md
105+
.gitignore = .gitignore
106+
.gitattributes = .gitattributes
107+
.prettierignore = .prettierignore
108+
.prettierrc = .prettierrc
109+
.lintstagedrc.js = .lintstagedrc.js
110+
NuGet.config = NuGet.config
111+
package.json = package.json
112+
EndProjectSection
113+
EndProject
114+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{19909559-F753-4337-952B-A8B5B5889959}"
115+
ProjectSection(SolutionItems) = preProject
116+
.github\labels.yml = .github\labels.yml
117+
.github\renovate.json = .github\renovate.json
118+
EndProjectSection
119+
EndProject
120+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{97924298-E17E-46E6-83CC-D9CD3B9F5E6F}"
121+
ProjectSection(SolutionItems) = preProject
122+
.github\workflows\ci-ignore.yml = .github\workflows\ci-ignore.yml
123+
.github\workflows\draft-release.yml = .github\workflows\draft-release.yml
124+
.github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml
125+
.github\workflows\dependabot-merge.yml = .github\workflows\dependabot-merge.yml
126+
.github\workflows\sync-labels.yml = .github\workflows\sync-labels.yml
127+
.github\workflows\close-milestone.yml = .github\workflows\close-milestone.yml
128+
.github\workflows\update-milestone.yml = .github\workflows\update-milestone.yml
129+
.github\workflows\ci.yml = .github\workflows\ci.yml
130+
EndProjectSection
131+
EndProject
132+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".husky", ".husky", "{BED6765C-97D8-406D-B782-3307132D16F0}"
133+
ProjectSection(SolutionItems) = preProject
134+
.husky\pre-commit = .husky\pre-commit
135+
EndProjectSection
136+
EndProject
137+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".vscode", ".vscode", "{09BE8ED9-1986-40F3-A9A6-D826A7413581}"
138+
ProjectSection(SolutionItems) = preProject
139+
.vscode\settings.json = .vscode\settings.json
140+
.vscode\csharp.code-snippets = .vscode\csharp.code-snippets
141+
.vscode\launch.json = .vscode\launch.json
142+
.vscode\tasks.json.old = .vscode\tasks.json.old
143+
.vscode\tasks.json = .vscode\tasks.json
144+
EndProjectSection
145+
EndProject
84146
Global
85147
GlobalSection(SolutionConfigurationPlatforms) = preSolution
86148
Debug|Any CPU = Debug|Any CPU
@@ -388,7 +450,7 @@ Global
388450
{E540868F-438E-4F7F-BBB7-010D6CB18A57} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
389451
{F2C9D555-118E-442B-A953-9A7B58A53F33} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
390452
{E1A9123B-A236-4240-8C82-A61BD85C3BF4} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
391-
{28B13787-A442-4D28-BF9A-3D65BF13AAEC} = {26522B49-0743-4CBE-BA67-6D17FF65CAB9}
453+
{28B13787-A442-4D28-BF9A-3D65BF13AAEC} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
392454
{18FB2302-023B-4F6F-9F6D-099B47B69D9F} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
393455
{6D9E5BF4-4666-476B-AC88-D108A80567F6} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
394456
{678A4DD2-A656-4DCC-AE78-F9940C82A6E6} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
@@ -402,6 +464,10 @@ Global
402464
{D43637CC-94E6-4ED4-BAA3-E5D1AD3285F5} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
403465
{201B1CA7-AB12-41AD-9246-BC30F2EBE2DF} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
404466
{72A74595-A278-46F0-9C8B-3151C9681B91} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
467+
{19909559-F753-4337-952B-A8B5B5889959} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
468+
{97924298-E17E-46E6-83CC-D9CD3B9F5E6F} = {19909559-F753-4337-952B-A8B5B5889959}
469+
{BED6765C-97D8-406D-B782-3307132D16F0} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
470+
{09BE8ED9-1986-40F3-A9A6-D826A7413581} = {93A0F406-2CEB-491E-9F40-6DA1BA67DD7C}
405471
EndGlobalSection
406472
GlobalSection(ExtensibilityGlobals) = postSolution
407473
SolutionGuid = {D38DD0EC-D095-4BCD-B8AF-2D788AF3B9AE}

‎benchmarks/Pipeline/Pipeline.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
11-
<PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
12-
<PackageReference Include="Nerdbank.Streams" Version="2.6.81" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
12+
<PackageReference Include="Nerdbank.Streams" Version="2.10.69" />
1313
</ItemGroup>
1414

1515
</Project>

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.400",
3+
"version": "7.0.401",
44
"rollForward": "latestMinor"
55
}
6-
}
6+
}

‎language-server-protocol.sha.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-- This is the last commit we caught up with https://github.com/Microsoft/language-server-protocol/commits/gh-pages
2-
lastSha: bdcc0f2
2+
lastSha: 5fc92456c046ed980646bb95c1d2e390d5b3ef9d
3+
4+
https://github.com/Microsoft/language-server-protocol/compare/5fc92456c046ed980646bb95c1d2e390d5b3ef9d..gh-pages
35

4-
https://github.com/Microsoft/language-server-protocol/compare/bdcc0f2..gh-pages

0 commit comments

Comments
 (0)