Skip to content
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

Обновление пакетов #31

Merged
merged 5 commits into from
Oct 24, 2023
Merged

Обновление пакетов #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
839d017
bump
gkurbesov Oct 20, 2023
965be83
Смигрировал DefaultHttpResultSerializer на DefaultHttpResponseFormatter
gkurbesov Oct 20, 2023
7db785b
new version
gkurbesov Oct 20, 2023
2cd32e0
fix dev package
gkurbesov Oct 20, 2023
8159c57
*
gkurbesov Oct 20, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/publish-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ name: Publish dev
on:
push:
branches:
- publish-dev
- publish-dev/**

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3
- name: Setup .NET Core 6.0
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- name: Setup .NET Core 3.1
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 3.1.x
- name: Install dependencies
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<VersionMajor>7</VersionMajor>
<VersionMajor>8</VersionMajor>
<VersionMinor>0</VersionMinor>
<BuildNumber>$(BuildNumber)</BuildNumber>
<BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
Expand Down
4 changes: 2 additions & 2 deletions Mindbox.ExceptionsHandling.Abstractions/Mindbox.ExceptionsHandling.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>Mindbox.ExceptionsHandling</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Mindbox.ExceptionsHandling.GraphQL/ConfigurationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ public static class ConfigurationExtensions
public static IServiceCollection AddGraphQLErrorHandling(this IServiceCollection services) =>
services
.AddErrorFilter<GraphQLHandleErrorFilter>()
.AddHttpResultSerializer<GraphQLHttpAgnosticResultSerializer>();
.AddHttpResponseFormatter<GraphQLHttpAgnosticResultFormatter>();
}
10 changes: 6 additions & 4 deletions ...QL/GraphQLHttpAgnosticResultSerializer.cs → ...hQL/GraphQLHttpAgnosticResultFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@

namespace Mindbox.ExceptionsHandling.GraphQL;

public class GraphQLHttpAgnosticResultSerializer : DefaultHttpResultSerializer
public class GraphQLHttpAgnosticResultFormatter : DefaultHttpResponseFormatter
{
public override HttpStatusCode GetStatusCode(IExecutionResult result)
protected override HttpStatusCode OnDetermineStatusCode(
IQueryResult result,
FormatInfo format,
HttpStatusCode? proposedStatusCode)
{
return result switch
{
// This is required for our frontend
QueryResult => HttpStatusCode.OK,
DeferredQueryResult => HttpStatusCode.OK,
BatchQueryResult => HttpStatusCode.OK,
_ => HttpStatusCode.InternalServerError
};
}
Expand Down
4 changes: 2 additions & 2 deletions Mindbox.ExceptionsHandling.GraphQL/Mindbox.ExceptionsHandling.GraphQL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HotChocolate.AspNetCore" Version="12.6.0" />
<PackageReference Include="HotChocolate.Execution" Version="12.6.0" />
<PackageReference Include="HotChocolate.AspNetCore" Version="13.5.1" />
<PackageReference Include="HotChocolate.Execution" Version="13.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mindbox.ExceptionsHandling.Abstractions\Mindbox.ExceptionsHandling.Abstractions.csproj" />
Expand Down
63 changes: 0 additions & 63 deletions Mindbox.ExceptionsHandling.Tests/GraphQLHttpAgnosticResultSerializerTests.cs
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions Mindbox.ExceptionsHandling.Tests/Mindbox.ExceptionsHandling.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
<PackageReference Include="coverlet.collector" Version="3.1.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mindbox.ExceptionsHandling.GraphQL\Mindbox.ExceptionsHandling.GraphQL.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Mindbox.ExceptionsHandling/Mindbox.ExceptionsHandling.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mindbox.ExceptionsHandling.Abstractions\Mindbox.ExceptionsHandling.Abstractions.csproj" />
Expand Down
Loading