Skip to content

Commit 96459e5

Browse files
sungam3rsungam3r
authored
Remove Core project, update deps, fix labeler (#771)
1 parent 6f06fee commit 96459e5

File tree

19 files changed

+40
-73
lines changed

19 files changed

+40
-73
lines changed

‎.github/workflows/label.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
# https://github.com/actions/labeler/blob/master/README.md
77

88
name: Labeler
9-
on: [pull_request]
9+
on:
10+
pull_request_target:
11+
types:
12+
- opened # when PR is opened
1013

1114
jobs:
1215
label:

‎GraphQL.Server.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Transports.Subscriptions.Ab
3434
EndProject
3535
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ui.Voyager", "src\Ui.Voyager\Ui.Voyager.csproj", "{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}"
3636
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{4872A0F3-FA1B-410B-834C-8A5653621E56}"
38-
EndProject
3937
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.AspNetCore", "src\Authorization.AspNetCore\Authorization.AspNetCore.csproj", "{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}"
4038
EndProject
4139
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.AspNetCore.Tests", "tests\Authorization.AspNetCore.Tests\Authorization.AspNetCore.Tests.csproj", "{741DEEE6-FD0B-4F99-8A6F-43584B3E8D5F}"
@@ -121,10 +119,6 @@ Global
121119
{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
122120
{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
123121
{B2C278E4-6A1A-4F83-AE53-C9469B4056EE}.Release|Any CPU.Build.0 = Release|Any CPU
124-
{4872A0F3-FA1B-410B-834C-8A5653621E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125-
{4872A0F3-FA1B-410B-834C-8A5653621E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
126-
{4872A0F3-FA1B-410B-834C-8A5653621E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
{4872A0F3-FA1B-410B-834C-8A5653621E56}.Release|Any CPU.Build.0 = Release|Any CPU
128122
{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129123
{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Debug|Any CPU.Build.0 = Debug|Any CPU
130124
{7A71AF0D-FE5F-4607-A6F6-960FD98CF840}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
[![CodeQL analysis](https://github.com/graphql-dotnet/server/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/graphql-dotnet/server/actions/workflows/codeql-analysis.yml)
1111

1212
[![codecov](https://codecov.io/gh/graphql-dotnet/server/branch/master/graph/badge.svg?token=ZBcVYq7hz4)](https://codecov.io/gh/graphql-dotnet/server)
13-
[![Total alerts](https://img.shields.io/lgtm/alerts/g/graphql-dotnet/server.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/graphql-dotnet/server/alerts/)
14-
[![Language grade: C#](https://img.shields.io/lgtm/grade/csharp/g/graphql-dotnet/server.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/graphql-dotnet/server/context:csharp)
1513

1614
![Activity](https://img.shields.io/github/commit-activity/w/graphql-dotnet/server)
1715
![Activity](https://img.shields.io/github/commit-activity/m/graphql-dotnet/server)
@@ -27,7 +25,6 @@ Provides the following packages:
2725
| Package | Downloads | NuGet Latest |
2826
|------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
2927
| GraphQL.Server.All | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.All)](https://www.nuget.org/packages/GraphQL.Server.All) | [![Nuget](https://img.shields.io/nuget/v/GraphQL.Server.All)](https://www.nuget.org/packages/GraphQL.Server.All) |
30-
| GraphQL.Server.Core | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Core)](https://www.nuget.org/packages/GraphQL.Server.Core) | [![Nuget](https://img.shields.io/nuget/v/GraphQL.Server.Core)](https://www.nuget.org/packages/GraphQL.Server.Core) |
3128
| GraphQL.Server.Transports.AspNetCore | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.AspNetCore)](https://www.nuget.org/packages/GraphQL.Server.Transports.AspNetCore) | [![Nuget](https://img.shields.io/nuget/v/GraphQL.Server.Transports.AspNetCore)](https://www.nuget.org/packages/GraphQL.Server.Transports.AspNetCore) |
3229
| GraphQL.Server.Transports.Subscriptions.Abstractions | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.Subscriptions.Abstractions)](https://www.nuget.org/packages/GraphQL.Server.Transports.Subscriptions.Abstractions) | [![Nuget](https://img.shields.io/nuget/v/GraphQL.Server.Transports.Subscriptions.Abstractions)](https://www.nuget.org/packages/GraphQL.Server.Transports.Subscriptions.Abstractions) |
3330
| GraphQL.Server.Transports.Subscriptions.WebSockets <br/> *formerly known as `GraphQL.Server.Transports.WebSockets`* | [![Nuget](https://img.shields.io/nuget/dt/GraphQL.Server.Transports.Subscriptions.WebSockets)](https://www.nuget.org/packages/GraphQL.Server.Transports.Subscriptions.WebSockets) | [![Nuget](https://img.shields.io/nuget/v/GraphQL.Server.Transports.Subscriptions.WebSockets)](https://www.nuget.org/packages/GraphQL.Server.Transports.Subscriptions.WebSockets) |

‎Tests.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
1515
<PackageReference Include="Shouldly" Version="4.0.3" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

‎samples/Samples.Server/Program.cs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,9 @@ public static int Main(string[] args)
3434
}
3535
}
3636

37-
public static IHostBuilder CreateHostBuilder(string[] args)
38-
{
39-
return Host.CreateDefaultBuilder(args)
40-
.ConfigureWebHostDefaults(webBuilder =>
41-
{
42-
webBuilder
43-
.UseSerilog()
44-
.UseStartup<Startup>();
45-
});
46-
}
37+
public static IHostBuilder CreateHostBuilder(string[] args) => Host
38+
.CreateDefaultBuilder(args)
39+
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>())
40+
.UseSerilog();
4741
}
4842
}

‎samples/Samples.Server/Samples.Server.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
12+
<PackageReference Include="GraphQL.DataLoader" Version="5.1.1" />
13+
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
1314
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
14-
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0" />
15-
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0" />
15+
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.1.1" />
16+
<PackageReference Include="GraphQL.SystemTextJson" Version="5.1.1" />
1617
</ItemGroup>
1718

1819
<ItemGroup>

‎src/All/All.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\Authorization.AspNetCore\Authorization.AspNetCore.csproj" />
13-
<ProjectReference Include="..\Core\Core.csproj" />
1413
<ProjectReference Include="..\Transports.AspNetCore\Transports.AspNetCore.csproj" />
1514
<ProjectReference Include="..\Transports.Subscriptions.Abstractions\Transports.Subscriptions.Abstractions.csproj" />
1615
<ProjectReference Include="..\Transports.Subscriptions.WebSockets\Transports.Subscriptions.WebSockets.csproj" />
@@ -19,9 +18,9 @@
1918
<ProjectReference Include="..\Ui.Playground\Ui.Playground.csproj" />
2019
<ProjectReference Include="..\Ui.Voyager\Ui.Voyager.csproj" />
2120

22-
<PackageReference Include="GraphQL.MemoryCache" Version="5.0.0" />
23-
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0" />
24-
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0" />
21+
<PackageReference Include="GraphQL.MemoryCache" Version="5.1.1" />
22+
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.1.1" />
23+
<PackageReference Include="GraphQL.SystemTextJson" Version="5.1.1" />
2524
</ItemGroup>
2625

2726
</Project>

‎src/Authorization.AspNetCore/Authorization.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="GraphQL" Version="5.0.0" />
11+
<PackageReference Include="GraphQL" Version="5.1.1" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Benchmarks/Benchmarks.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.19" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" Condition="'$(TargetFramework)' == 'net5'" />
15-
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
16-
<PackageReference Include="GraphQL.NewtonsoftJson" Version="5.0.0-preview-500" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
14+
<PackageReference Include="GraphQL.SystemTextJson" Version="5.1.1" />
15+
<PackageReference Include="GraphQL.NewtonsoftJson" Version="5.1.1" />
1716
</ItemGroup>
1817

1918
<ItemGroup>

‎src/Core/Core.csproj

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)