Skip to content

Removed workaround for debugging source generators #1155

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 2 commits into from
May 21, 2022
Merged

Removed workaround for debugging source generators #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bcbb9e
Removed workaround for https://github.com/dotnet/roslyn/issues/55802.…
bkoelman May 21, 2022
314a1e4
Package updates (in non-breaking fashion)
bkoelman May 21, 2022
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
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AspNetVersion>6.0.*</AspNetVersion>
<EFCoreVersion>6.0.*</EFCoreVersion>
<EFCorePostgresVersion>6.0.*</EFCorePostgresVersion>
<MicrosoftCodeAnalysisVersion>4.1.*</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisVersion>4.2.*</MicrosoftCodeAnalysisVersion>
<HumanizerVersion>2.14.1</HumanizerVersion>
<JsonApiDotNetCoreVersionPrefix>5.0.2</JsonApiDotNetCoreVersionPrefix>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
Expand Down Expand Up @@ -34,7 +34,7 @@
<!-- Test Project Dependencies -->
<PropertyGroup>
<CoverletVersion>3.1.2</CoverletVersion>
<MoqVersion>4.17.2</MoqVersion>
<TestSdkVersion>17.1.0</TestSdkVersion>
<MoqVersion>4.18.1</MoqVersion>
<TestSdkVersion>17.2.0</TestSdkVersion>
</PropertyGroup>
</Project>
15 changes: 0 additions & 15 deletions JsonApiDotNetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBuildingBlocks", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.SourceGenerators", "src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj", "{952C0FDE-AFC8-455C-986F-6CC882ED8953}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorDebugger", "test\SourceGeneratorDebugger\SourceGeneratorDebugger.csproj", "{87D066F9-3540-4AC7-A748-134900969EE5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorTests", "test\SourceGeneratorTests\SourceGeneratorTests.csproj", "{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.Annotations", "src\JsonApiDotNetCore.Annotations\JsonApiDotNetCore.Annotations.csproj", "{83FF097C-C8C6-477B-9FAB-DF99B84978B5}"
Expand Down Expand Up @@ -232,18 +230,6 @@ Global
{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x64.Build.0 = Release|Any CPU
{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x86.ActiveCfg = Release|Any CPU
{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x86.Build.0 = Release|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x64.ActiveCfg = Debug|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x64.Build.0 = Debug|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x86.ActiveCfg = Debug|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x86.Build.0 = Debug|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Release|Any CPU.Build.0 = Release|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x64.ActiveCfg = Release|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x64.Build.0 = Release|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x86.ActiveCfg = Release|Any CPU
{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x86.Build.0 = Release|Any CPU
{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -299,7 +285,6 @@ Global
{EC3202C6-1D4C-4B14-A599-B9D3F27FE3BA} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{952C0FDE-AFC8-455C-986F-6CC882ED8953} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
{87D066F9-3540-4AC7-A748-134900969EE5} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{83FF097C-C8C6-477B-9FAB-DF99B84978B5} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
{60334658-BE51-43B3-9C4D-F2BBF56C89CE} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
Expand Down
3 changes: 0 additions & 3 deletions src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using JetBrains.Annotations;
using JsonApiDotNetCore.Controllers;

// ReSharper disable CheckNamespace
#pragma warning disable AV1505 // Namespace should match with assembly name

namespace JsonApiDotNetCore.Resources.Annotations;

/// <summary>
Expand Down
6 changes: 6 additions & 0 deletions src/JsonApiDotNetCore.SourceGenerators/ControllerSourceGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@

namespace JsonApiDotNetCore.SourceGenerators
{
// To debug in Visual Studio (requires v17.2 or higher):
// - Set JsonApiDotNetCore.SourceGenerators as startup project
// - Add a breakpoint at the start of the Initialize or Execute method
// - Optional: change targetProject in Properties\launchSettings.json
// - Press F5

[Generator(LanguageNames.CSharp)]
public sealed class ControllerSourceGenerator : ISourceGenerator
{
Expand Down
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@

<ItemGroup>
<PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" PrivateAssets="all" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore.SourceGenerators/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"JsonApiDotNetCore.SourceGenerators": {
"commandName": "DebugRoslynComponent",
"targetProject": "..\\..\\test\\SourceGeneratorDebugger\\SourceGeneratorDebugger.csproj"
"targetProject": "..\\Examples\\JsonApiDotNetCoreExample\\JsonApiDotNetCoreExample.csproj"
}
}
}
16 changes: 0 additions & 16 deletions test/SourceGeneratorDebugger/Controllers/ArticlesController.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/Controllers/CustomersController.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/ArgumentGuard.cs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/AttrAttribute.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/BaseJsonApiController.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IAddToRelationshipService.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/ICreateService.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IDeleteService.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetAllService.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetByIdService.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetRelationshipService.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetSecondaryService.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IIdentifiable.cs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions test/SourceGeneratorDebugger/JsonApiDotNetCore/IJsonApiOptions.cs
View file
Open in desktop

This file was deleted.

Loading