Skip to content

Move to use built in source generation #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 17, 2020
Merged

Move to use built in source generation #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
93d27dc
First iteration getting replacing code generation with source generators
david-driscoll Aug 14, 2020
97f8c20
Everything seems to be working with source generators!
david-driscoll Aug 14, 2020
1d847c6
couple tweaks
david-driscoll Aug 14, 2020
ec97b75
removed old source generator
david-driscoll Aug 14, 2020
8614c0d
Remove jank (#318)
davidwengier Aug 15, 2020
7067cf3
pack generators package
david-driscoll Aug 18, 2020
25d25cd
Merge remote-tracking branch 'origin/master' into feature/source-gene…
david-driscoll Aug 18, 2020
0ec8f68
Merge remote-tracking branch 'origin/master' into feature/source-gene…
david-driscoll Nov 1, 2020
980811a
Updated to the latest beta
david-driscoll Nov 1, 2020
12f388f
Added .net 5 sdk
david-driscoll Nov 2, 2020
ec1bbd5
Updated pipelines to use .net 5 sdk
david-driscoll Nov 2, 2020
2c196d3
Merge remote-tracking branch 'origin/master' into feature/source-gene…
david-driscoll Nov 14, 2020
8595f08
Merge remote-tracking branch 'origin/master' into feature/source-gene…
david-driscoll Nov 14, 2020
ba1dff3
Added additional source generation pieces
david-driscoll Nov 16, 2020
9529a98
Fixed failing tests
david-driscoll Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 46 additions & 49 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GitVersion.Tool" Version="5.5.1" />
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
<PackageReference Update="ReportGenerator" Version="4.8.0" />
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="FluentAssertions" Version="5.10.3" />
<PackageReference Update="NSubstitute" Version="4.2.2" />
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Update="Serilog.Sinks.Observable" Version="2.0.2" />
<PackageReference Update="Serilog.Sinks.XUnit" Version="2.0.4" />
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
<PackageReference Update="coverlet.collector" Version="1.3.0" />
<PackageReference Update="coverlet.msbuild" Version="2.9.0" />
<PackageReference Update="System.Reactive" Version="4.4.1" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.4.1" />
<PackageReference Update="MediatR" Version="8.1.0" />
<PackageReference Update="Bogus" Version="31.0.3" />
<PackageReference Update="Snapper" Version="2.2.4" />
<PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Update="System.IO.Pipelines" Version="4.7.3" />
<PackageReference Update="Nerdbank.Streams" Version="2.6.81" />
<PackageReference Update="CodeGeneration.Roslyn.Attributes" Version="0.7.63" PrivateAssets="all" />
<PackageReference Update="CodeGeneration.Roslyn.Engine" Version="0.7.63" />
<PackageReference Update="CodeGeneration.Roslyn.Tool" Version="0.7.63" PrivateAssets="all" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
<PackageReference Update="DryIoc.Internal" Version="4.5.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.MSBuild.CI" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.MSBuild.Metadata" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="GitVersion.Tool" Version="5.5.1" />
<PackageReference Update="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
<PackageReference Update="ReportGenerator" Version="4.8.0" />
<PackageReference Update="Rocket.Surgery.Nuke" Version="0.14.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="FluentAssertions" Version="5.10.3" />
<PackageReference Update="NSubstitute" Version="4.2.2" />
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Update="Serilog.Sinks.Observable" Version="2.0.2" />
<PackageReference Update="Serilog.Sinks.XUnit" Version="2.0.4" />
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
<PackageReference Update="coverlet.collector" Version="1.3.0" />
<PackageReference Update="coverlet.msbuild" Version="2.9.0" />
<PackageReference Update="System.Reactive" Version="4.4.1" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.4.1" />
<PackageReference Update="MediatR" Version="8.1.0" />
<PackageReference Update="Bogus" Version="31.0.3" />
<PackageReference Update="Snapper" Version="2.2.4" />
<PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Update="System.IO.Pipelines" Version="4.7.3" />
<PackageReference Update="Nerdbank.Streams" Version="2.6.81" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.1" />
<PackageReference Update="DryIoc.Internal" Version="4.5.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion LSP.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F323ED5-E
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{AE4D7807-6F78-428C-A0D9-914BA583A104}"
ProjectSection(SolutionItems) = prePrlaoject
ProjectSection(SolutionItems) = preProject
.appveyor.yml = .appveyor.yml
.editorconfig = .editorconfig
.gitattributes = .gitattributes
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ For more information about using the `DebugAdapterClient` / `DebugAdapterServer`
| OmniSharp.Extensions.DebugAdapter.Shared | [![nuget-version-2fkn0yzdbhmg-badge]![nuget-downloads-2fkn0yzdbhmg-badge]][nuget-2fkn0yzdbhmg] |
| OmniSharp.Extensions.DebugAdapter.Testing | [![nuget-version-jppuysmkpfcw-badge]![nuget-downloads-jppuysmkpfcw-badge]][nuget-jppuysmkpfcw] |
| OmniSharp.Extensions.JsonRpc | [![nuget-version-a1bmkwyotvkg-badge]![nuget-downloads-a1bmkwyotvkg-badge]][nuget-a1bmkwyotvkg] |
| OmniSharp.Extensions.JsonRpc.Generators | [![nuget-version-m6majhsjiw1q-badge]![nuget-downloads-m6majhsjiw1q-badge]][nuget-m6majhsjiw1q] |
| OmniSharp.Extensions.JsonRpc.Testing | [![nuget-version-punkj7/efvjq-badge]![nuget-downloads-punkj7/efvjq-badge]][nuget-punkj7/efvjq] |
| OmniSharp.Extensions.LanguageClient | [![nuget-version-fclou9t/p2ba-badge]![nuget-downloads-fclou9t/p2ba-badge]][nuget-fclou9t/p2ba] |
| OmniSharp.Extensions.LanguageProtocol | [![nuget-version-vddj9t6jnirq-badge]![nuget-downloads-vddj9t6jnirq-badge]][nuget-vddj9t6jnirq] |
Expand Down Expand Up @@ -118,6 +119,9 @@ This project is supported by the [.NET Foundation](http://www.dotnetfoundation.o
[nuget-a1bmkwyotvkg]: https://www.nuget.org/packages/OmniSharp.Extensions.JsonRpc/
[nuget-version-a1bmkwyotvkg-badge]: https://img.shields.io/nuget/v/OmniSharp.Extensions.JsonRpc.svg?color=004880&logo=nuget&style=flat-square "NuGet Version"
[nuget-downloads-a1bmkwyotvkg-badge]: https://img.shields.io/nuget/dt/OmniSharp.Extensions.JsonRpc.svg?color=004880&logo=nuget&style=flat-square "NuGet Downloads"
[nuget-m6majhsjiw1q]: https://www.nuget.org/packages/OmniSharp.Extensions.JsonRpc.Generators/
[nuget-version-m6majhsjiw1q-badge]: https://img.shields.io/nuget/v/OmniSharp.Extensions.JsonRpc.Generators.svg?color=004880&logo=nuget&style=flat-square "NuGet Version"
[nuget-downloads-m6majhsjiw1q-badge]: https://img.shields.io/nuget/dt/OmniSharp.Extensions.JsonRpc.Generators.svg?color=004880&logo=nuget&style=flat-square "NuGet Downloads"
[nuget-punkj7/efvjq]: https://www.nuget.org/packages/OmniSharp.Extensions.JsonRpc.Testing/
[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"
[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"
Expand Down
3 changes: 1 addition & 2 deletions src/Dap.Protocol/Dap.Protocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@

<ItemGroup>
<ProjectReference Include="..\JsonRpc\JsonRpc.csproj" />
<ProjectReference Include="..\JsonRpc.Generators\JsonRpc.Generators.csproj" OutputItemType="CodeGenerationRoslynPlugin" PrivateAssets="all" />
<PackageReference Include="CodeGeneration.Roslyn.Tool" />
<ProjectReference Include="..\JsonRpc.Generators\JsonRpc.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>OmniSharp.Extensions.DebugAdapter.Server, PublicKey=0024000004800000940000000602000000240000525341310004000001000100391db875e68eb4bfef49ce14313b9e13f2cd3cc89eb273bbe6c11a55044c7d4f566cf092e1c77ef9e7c75b1496ae7f95d925938f5a01793dd8d9f99ae0a7595779b71b971287d7d7b5960d052078d14f5ce1a85ea5c9fb2f59ac735ff7bc215cab469b7c3486006860bad6f4c3b5204ea2f28dd4e1d05e2cca462cfd593b9f9f</_Parameter1>
</AssemblyAttribute>
Expand Down
Loading