GonnaHetzMe/WotBlitzStatisticsBlazor
0
0 Fork 0
mirror of https://github.com/DrMboga/WotBlitzStatisticsBlazor.git synced 2026-10-23 19:30:06 +02:00
Code Issues Projects Releases Wiki Activity

Dotnet 5.0 migration

Browse Source
This commit is contained in:
Mikhail Shabanov committed 2020-12-23 17:30:16 +01:00
1 parent 758aa10e55
commit e5c90e03d3
8 files changed
+35 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

WotBlitzStatisticsPro.Common/WotBlitzStatisticsPro.Common.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>
WotBlitzStatisticsPro.DataAccess/WotBlitzStatisticsPro.DataAccess.csproj
+3 -3
View File
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="MongoDB.Driver" Version="2.10.4" /> <PackageReference Include="MongoDB.Driver" Version="2.11.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
WotBlitzStatisticsPro.GraphQl/Properties/launchSettings.json
+2 -2
View File
@@ -12,7 +12,7 @@
"IIS Express": { "IIS Express": {
"commandName": "IISExpress", "commandName": "IISExpress",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "graphql/playground", "launchUrl": "graphql",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }
@@ -20,7 +20,7 @@
"WotBlitzStatistics.GraphQl": { "WotBlitzStatistics.GraphQl": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "graphql/playground", "launchUrl": "graphql",
"applicationUrl": "https://localhost:5001;http://localhost:5000", "applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
WotBlitzStatisticsPro.GraphQl/Startup.cs
+13 -28
View File
@@ -1,6 +1,3 @@
using HotChocolate;
using HotChocolate.AspNetCore;
using HotChocolate.AspNetCore.Voyager;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@@ -36,39 +33,27 @@ namespace WotBlitzStatisticsPro.GraphQl
services.AddSingleton<IMongoSettings>(mongoConfig); services.AddSingleton<IMongoSettings>(mongoConfig);
WotBlitzStatisticsLogicInstaller.ConfigureServices(services); WotBlitzStatisticsLogicInstaller.ConfigureServices(services);
// Global data loader - caches data between requests
// ToDo: cause nullreference exception
//services.AddSingleton<IDataLoaderRegistry, DataLoaderRegistry>();
// this enables you to use DataLoader in your resolvers.
services.AddDataLoaderRegistry();
// Add GraphQL Services // Add GraphQL Services
services.AddGraphQL(sp => SchemaBuilder.New() services.AddGraphQLServer()
.AddServices(sp) .AddQueryType<WotBlitzStatisticsQuery>()
// Adds the authorize directive and
// enable the authorization middleware.
.AddAuthorizeDirectiveType()
.AddQueryType<WotBlitzStatisticsQuery>()
.AddMutationType<WotBlitzStatisticsMutation>() .AddMutationType<WotBlitzStatisticsMutation>()
//.AddSubscriptionType<SubscriptionType>() .AddType<AccountsSearchItemObjectType>()
.AddType<AccountsSearchItemObjectType>() .AddType<AccountsSearchObjectType>()
.AddType<AccountsSearchObjectType>() .AddEnumType<MarkOfMastery>()
.AddEnumType<MarkOfMastery>() .AddEnumType<RealmType>()
.AddEnumType<RealmType>() .AddEnumType<RequestLanguage>();
.AddEnumType<RequestLanguage>()
.Create());
} }
public void Configure(IApplicationBuilder app, IWebHostEnvironment env) public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{ {
app app
.UseGraphQL("/graphql") .UseRouting()
.UsePlayground("/graphql") .UseEndpoints(endpoints =>
.UseVoyager("/graphql") {
; endpoints.MapGraphQL();
});
} }
} }
} }
WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj
+4 -7
View File
@@ -1,18 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn> <NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="HotChocolate.AspNetCore" Version="10.3.6" /> <PackageReference Include="HotChocolate.AspNetCore" Version="11.0.6" />
<PackageReference Include="HotChocolate.AspNetCore.Abstractions" Version="10.3.6" /> <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="11.0.6" />
<PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="10.3.6" /> <PackageReference Include="HotChocolate.Types.Filters" Version="11.0.6" />
<PackageReference Include="HotChocolate.AspNetCore.Playground" Version="10.3.6" />
<PackageReference Include="HotChocolate.AspNetCore.Voyager" Version="10.3.6" />
<PackageReference Include="HotChocolate.Types.Filters" Version="10.3.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>
WotBlitzStatisticsPro.Logic/WotBlitzStatisticsPro.Logic.csproj
+5 -5
View File
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="9.0.0" /> <PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" /> <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" /> <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
WotBlitzStatisticsPro.Tests/WotBlitzStatisticsPro.Tests.csproj
+6 -6
View File
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Bogus" Version="29.0.2" /> <PackageReference Include="Bogus" Version="32.0.2" />
<PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Moq" Version="4.14.1" /> <PackageReference Include="Moq" Version="4.15.2" />
<PackageReference Include="nunit" Version="3.12.0" /> <PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" /> <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
WotBlitzStatisticsPro.WgApiClient/WotBlitzStatisticsPro.WgApiClient.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>