Skip to content

Commit 7b4f140

Browse files
david-driscolldavidwengierDavid Wengier
authored
Move to use built in source generation (#314)
* First iteration getting replacing code generation with source generators * Remove jank (#318) * Added .net 5 sdk * Updated pipelines to use .net 5 sdk * Fixed failing tests Co-authored-by: David Wengier <david.wengier@microsoft.com> Co-authored-by: David Wengier <dawengie@microsoft.com>
1 parent 508e3ac commit 7b4f140

30 files changed

+2646
-783
lines changed

‎Directory.Build.targets‎

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,49 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<ItemGroup>
4-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5-
<PackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.1.0" PrivateAssets="All" />
6-
<PackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="1.1.0" PrivateAssets="All" />
7-
<PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.0" PrivateAssets="All" />
8-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
9-
</ItemGroup>
10-
<ItemGroup>
11-
<PackageReference Update="GitVersion.Tool" Version="5.5.1" />
12-
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
13-
<PackageReference Update="ReportGenerator" Version="4.8.0" />
14-
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
15-
</ItemGroup>
16-
<ItemGroup>
17-
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
18-
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
19-
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.0.0" />
20-
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
21-
<PackageReference Update="Microsoft.Extensions.Options" Version="2.0.0" />
22-
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
23-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
24-
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
25-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
26-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
27-
<PackageReference Update="xunit" Version="2.4.1" />
28-
<PackageReference Update="FluentAssertions" Version="5.10.3" />
29-
<PackageReference Update="NSubstitute" Version="4.2.2" />
30-
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
31-
<PackageReference Update="Serilog.Sinks.Observable" Version="2.0.2" />
32-
<PackageReference Update="Serilog.Sinks.XUnit" Version="2.0.4" />
33-
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
34-
<PackageReference Update="coverlet.collector" Version="1.3.0" />
35-
<PackageReference Update="coverlet.msbuild" Version="2.9.0" />
36-
<PackageReference Update="System.Reactive" Version="4.4.1" />
37-
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
38-
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.4.1" />
39-
<PackageReference Update="MediatR" Version="8.1.0" />
40-
<PackageReference Update="Bogus" Version="31.0.3" />
41-
<PackageReference Update="Snapper" Version="2.2.4" />
42-
<PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
43-
<PackageReference Update="System.IO.Pipelines" Version="4.7.3" />
44-
<PackageReference Update="Nerdbank.Streams" Version="2.6.81" />
45-
<PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="0.7.63" PrivateAssets="all" />
46-
<PackageReference Update="CodeGeneration.Roslyn.Engine" Version="0.7.63" />
47-
<PackageReference Update="CodeGeneration.Roslyn.Tool" Version="0.7.63" PrivateAssets="all" />
48-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
49-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
50-
<PackageReference Update="DryIoc.Internal" Version="4.5.1" />
51-
</ItemGroup>
3+
<ItemGroup>
4+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5+
<PackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.1.0" PrivateAssets="All" />
6+
<PackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="1.1.0" PrivateAssets="All" />
7+
<PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.0" PrivateAssets="All" />
8+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
9+
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Update="GitVersion.Tool" Version="5.5.1" />
12+
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
13+
<PackageReference Update="ReportGenerator" Version="4.8.0" />
14+
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
18+
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
19+
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.0.0" />
20+
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
21+
<PackageReference Update="Microsoft.Extensions.Options" Version="2.0.0" />
22+
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
23+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
24+
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
25+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
26+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
27+
<PackageReference Update="xunit" Version="2.4.1" />
28+
<PackageReference Update="FluentAssertions" Version="5.10.3" />
29+
<PackageReference Update="NSubstitute" Version="4.2.2" />
30+
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
31+
<PackageReference Update="Serilog.Sinks.Observable" Version="2.0.2" />
32+
<PackageReference Update="Serilog.Sinks.XUnit" Version="2.0.4" />
33+
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
34+
<PackageReference Update="coverlet.collector" Version="1.3.0" />
35+
<PackageReference Update="coverlet.msbuild" Version="2.9.0" />
36+
<PackageReference Update="System.Reactive" Version="4.4.1" />
37+
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
38+
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.4.1" />
39+
<PackageReference Update="MediatR" Version="8.1.0" />
40+
<PackageReference Update="Bogus" Version="31.0.3" />
41+
<PackageReference Update="Snapper" Version="2.2.4" />
42+
<PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
43+
<PackageReference Update="System.IO.Pipelines" Version="4.7.3" />
44+
<PackageReference Update="Nerdbank.Streams" Version="2.6.81" />
45+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
46+
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.1" />
47+
<PackageReference Update="DryIoc.Internal" Version="4.5.1" />
48+
</ItemGroup>
5249
</Project>

‎LSP.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F323ED5-E
1414
EndProjectSection
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{AE4D7807-6F78-428C-A0D9-914BA583A104}"
17-
ProjectSection(SolutionItems) = prePrlaoject
17+
ProjectSection(SolutionItems) = preProject
1818
.appveyor.yml = .appveyor.yml
1919
.editorconfig = .editorconfig
2020
.gitattributes = .gitattributes

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ For more information about using the `DebugAdapterClient` / `DebugAdapterServer`
5858
| OmniSharp.Extensions.DebugAdapter.Shared | [![nuget-version-2fkn0yzdbhmg-badge]![nuget-downloads-2fkn0yzdbhmg-badge]][nuget-2fkn0yzdbhmg] |
5959
| OmniSharp.Extensions.DebugAdapter.Testing | [![nuget-version-jppuysmkpfcw-badge]![nuget-downloads-jppuysmkpfcw-badge]][nuget-jppuysmkpfcw] |
6060
| OmniSharp.Extensions.JsonRpc | [![nuget-version-a1bmkwyotvkg-badge]![nuget-downloads-a1bmkwyotvkg-badge]][nuget-a1bmkwyotvkg] |
61+
| OmniSharp.Extensions.JsonRpc.Generators | [![nuget-version-m6majhsjiw1q-badge]![nuget-downloads-m6majhsjiw1q-badge]][nuget-m6majhsjiw1q] |
6162
| OmniSharp.Extensions.JsonRpc.Testing | [![nuget-version-punkj7/efvjq-badge]![nuget-downloads-punkj7/efvjq-badge]][nuget-punkj7/efvjq] |
6263
| OmniSharp.Extensions.LanguageClient | [![nuget-version-fclou9t/p2ba-badge]![nuget-downloads-fclou9t/p2ba-badge]][nuget-fclou9t/p2ba] |
6364
| OmniSharp.Extensions.LanguageProtocol | [![nuget-version-vddj9t6jnirq-badge]![nuget-downloads-vddj9t6jnirq-badge]][nuget-vddj9t6jnirq] |
@@ -118,6 +119,9 @@ This project is supported by the [.NET Foundation](http://www.dotnetfoundation.o
118119
[nuget-a1bmkwyotvkg]: https://www.nuget.org/packages/OmniSharp.Extensions.JsonRpc/
119120
[nuget-version-a1bmkwyotvkg-badge]: https://img.shields.io/nuget/v/OmniSharp.Extensions.JsonRpc.svg?color=004880&logo=nuget&style=flat-square "NuGet Version"
120121
[nuget-downloads-a1bmkwyotvkg-badge]: https://img.shields.io/nuget/dt/OmniSharp.Extensions.JsonRpc.svg?color=004880&logo=nuget&style=flat-square "NuGet Downloads"
122+
[nuget-m6majhsjiw1q]: https://www.nuget.org/packages/OmniSharp.Extensions.JsonRpc.Generators/
123+
[nuget-version-m6majhsjiw1q-badge]: https://img.shields.io/nuget/v/OmniSharp.Extensions.JsonRpc.Generators.svg?color=004880&logo=nuget&style=flat-square "NuGet Version"
124+
[nuget-downloads-m6majhsjiw1q-badge]: https://img.shields.io/nuget/dt/OmniSharp.Extensions.JsonRpc.Generators.svg?color=004880&logo=nuget&style=flat-square "NuGet Downloads"
121125
[nuget-punkj7/efvjq]: https://www.nuget.org/packages/OmniSharp.Extensions.JsonRpc.Testing/
122126
[nuget-version-punkj7/efvjq-badge]: https://img.shields.io/nuget/v/OmniSharp.Extensions.JsonRpc.Testing.svg?color=004880&logo=nuget&style=flat-square "NuGet Version"
123127
[nuget-downloads-punkj7/efvjq-badge]: https://img.shields.io/nuget/dt/OmniSharp.Extensions.JsonRpc.Testing.svg?color=004880&logo=nuget&style=flat-square "NuGet Downloads"

‎src/Dap.Protocol/Dap.Protocol.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\JsonRpc\JsonRpc.csproj" />
17-
<ProjectReference Include="..\JsonRpc.Generators\JsonRpc.Generators.csproj" OutputItemType="CodeGenerationRoslynPlugin" PrivateAssets="all" />
18-
<PackageReference Include="CodeGeneration.Roslyn.Tool" />
17+
<ProjectReference Include="..\JsonRpc.Generators\JsonRpc.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
1918
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
2019
<_Parameter1>OmniSharp.Extensions.DebugAdapter.Server, PublicKey=0024000004800000940000000602000000240000525341310004000001000100391db875e68eb4bfef49ce14313b9e13f2cd3cc89eb273bbe6c11a55044c7d4f566cf092e1c77ef9e7c75b1496ae7f95d925938f5a01793dd8d9f99ae0a7595779b71b971287d7d7b5960d052078d14f5ce1a85ea5c9fb2f59ac735ff7bc215cab469b7c3486006860bad6f4c3b5204ea2f28dd4e1d05e2cca462cfd593b9f9f</_Parameter1>
2120
</AssemblyAttribute>

0 commit comments

Comments
 (0)