mirror of
https://github.com/TomasiDeveloping/PlayerManagement.git
synced 2026-04-16 09:12:20 +00:00
.net 10 and fix
This commit is contained in:
parent
463f526fe7
commit
3f7aea2e67
@ -1,17 +1,12 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Asp.Versioning.Mvc" />
|
<PackageReference Include="Asp.Versioning.Mvc" />
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" />
|
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" />
|
||||||
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
|
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
|
||||||
<PackageReference Include="Azure.Identity" />
|
<PackageReference Include="Azure.Identity" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
using Api.Helpers;
|
using Api.Helpers;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||||
using Microsoft.OpenApi.Models;
|
using Microsoft.OpenApi;
|
||||||
|
|
||||||
namespace Api.Configurations;
|
namespace Api.Configurations;
|
||||||
|
|
||||||
@ -30,34 +30,19 @@ public static class SwaggerExtension
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Configures Bearer token authentication for Swagger
|
// Configures Bearer token authentication for Swagger
|
||||||
options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
|
options.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme, new OpenApiSecurityScheme
|
||||||
{
|
{
|
||||||
Description = @"JWT Authorization header using the Bearer scheme.
|
Description = "JWT Authorization header using the Bearer scheme.",
|
||||||
Enter 'Bearer' [space] and then your token in the text input below.
|
|
||||||
Example: 'Bearer 12345abcdef'",
|
|
||||||
Name = "Authorization",
|
Name = "Authorization",
|
||||||
|
BearerFormat = "JWT",
|
||||||
In = ParameterLocation.Header,
|
In = ParameterLocation.Header,
|
||||||
Type = SecuritySchemeType.ApiKey,
|
Type = SecuritySchemeType.Http,
|
||||||
Scheme = JwtBearerDefaults.AuthenticationScheme
|
Scheme = JwtBearerDefaults.AuthenticationScheme
|
||||||
});
|
});
|
||||||
|
|
||||||
// Adds security requirements for Bearer token authentication
|
// Adds security requirements for Bearer token authentication
|
||||||
options.AddSecurityRequirement(new OpenApiSecurityRequirement
|
options.AddSecurityRequirement(document => new OpenApiSecurityRequirement
|
||||||
{
|
{
|
||||||
{
|
[new OpenApiSecuritySchemeReference(JwtBearerDefaults.AuthenticationScheme, document)] = []
|
||||||
new OpenApiSecurityScheme
|
|
||||||
{
|
|
||||||
Reference = new OpenApiReference
|
|
||||||
{
|
|
||||||
Type = ReferenceType.SecurityScheme,
|
|
||||||
Id = JwtBearerDefaults.AuthenticationScheme
|
|
||||||
},
|
|
||||||
Scheme = "Oauth2",
|
|
||||||
Name = JwtBearerDefaults.AuthenticationScheme,
|
|
||||||
In = ParameterLocation.Header
|
|
||||||
},
|
|
||||||
new List<string>()
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
using Microsoft.OpenApi.Models;
|
using Microsoft.OpenApi;
|
||||||
using Swashbuckle.AspNetCore.SwaggerGen;
|
using Swashbuckle.AspNetCore.SwaggerGen;
|
||||||
|
|
||||||
namespace Api.Helpers;
|
namespace Api.Helpers;
|
||||||
|
|||||||
@ -3,6 +3,7 @@ using Api.Middleware;
|
|||||||
using Application;
|
using Application;
|
||||||
using Database;
|
using Database;
|
||||||
using HealthChecks.UI.Client;
|
using HealthChecks.UI.Client;
|
||||||
|
using Microsoft.AspNetCore.Builder;
|
||||||
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Utilities.Classes;
|
using Utilities.Classes;
|
||||||
@ -24,7 +25,6 @@ try
|
|||||||
.WriteTo.File(logPath, rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true);
|
.WriteTo.File(logPath, rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
builder.Services.AddDatabase(builder.Configuration);
|
builder.Services.AddDatabase(builder.Configuration);
|
||||||
builder.Services.AddApplication();
|
builder.Services.AddApplication();
|
||||||
|
|
||||||
@ -54,6 +54,8 @@ try
|
|||||||
app.UseStaticFiles();
|
app.UseStaticFiles();
|
||||||
app.UseDefaultFiles();
|
app.UseDefaultFiles();
|
||||||
|
|
||||||
|
app.MapOpenApi();
|
||||||
|
|
||||||
app.UseSwagger();
|
app.UseSwagger();
|
||||||
app.UseSwaggerUI();
|
app.UseSwaggerUI();
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,5 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="DataTransferObjects\Alliance\" />
|
<Folder Include="DataTransferObjects\Alliance\" />
|
||||||
<Folder Include="Classes\" />
|
<Folder Include="Classes\" />
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
using System.Reflection;
|
using Application.Helpers;
|
||||||
using Application.Helpers;
|
|
||||||
using Application.Interfaces;
|
using Application.Interfaces;
|
||||||
|
using Application.Profiles;
|
||||||
using Application.Repositories;
|
using Application.Repositories;
|
||||||
using Application.Services;
|
using Application.Services;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
@ -13,7 +13,7 @@ public static class ApplicationDependencyInjection
|
|||||||
{
|
{
|
||||||
public static IServiceCollection AddApplication(this IServiceCollection services)
|
public static IServiceCollection AddApplication(this IServiceCollection services)
|
||||||
{
|
{
|
||||||
services.AddAutoMapper(Assembly.GetExecutingAssembly());
|
services.AddAutoMapper(_ => {}, typeof(AllianceProfile));
|
||||||
|
|
||||||
services.AddScoped<IAllianceRepository, AllianceRepository>();
|
services.AddScoped<IAllianceRepository, AllianceRepository>();
|
||||||
services.AddScoped<IAdmonitionRepository, AdmonitionRepository>();
|
services.AddScoped<IAdmonitionRepository, AdmonitionRepository>();
|
||||||
|
|||||||
@ -1,11 +1,5 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection" />
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity" />
|
<PackageReference Include="Microsoft.AspNetCore.Identity" />
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@ -3,37 +3,33 @@
|
|||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="MailKit" Version="4.11.0" />
|
<PackageVersion Include="MailKit" Version="4.15.0" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
|
<PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
|
||||||
<PackageVersion Include="Octokit" Version="14.0.0" />
|
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.3" />
|
||||||
|
<PackageVersion Include="Octokit" Version="14.0.0" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
|
<PackageVersion Include="Microsoft.AspNetCore.Identity" Version="2.3.9" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3" />
|
||||||
|
<PackageVersion Include="AutoMapper" Version="16.0.0" />
|
||||||
<PackageVersion Include="AutoMapper" Version="14.0.0" />
|
<PackageVersion Include="ExcelDataReader" Version="3.8.0" />
|
||||||
<PackageVersion Include="ExcelDataReader" Version="3.7.0" />
|
<PackageVersion Include="ExcelDataReader.DataSet" Version="3.8.0" />
|
||||||
<PackageVersion Include="ExcelDataReader.DataSet" Version="3.7.0" />
|
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
|
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.3" />
|
||||||
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.1" />
|
<PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.1" />
|
||||||
|
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
|
||||||
<PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.0" />
|
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
|
||||||
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
|
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
|
||||||
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
|
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
|
||||||
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
|
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.3" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
|
<PackageVersion Include="Serilog" Version="4.3.1" />
|
||||||
|
<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.4" />
|
<PackageVersion Include="Serilog.Sinks.Seq" Version="9.0.0" />
|
||||||
<PackageVersion Include="Serilog" Version="4.2.0" />
|
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.3" />
|
||||||
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
|
|
||||||
<PackageVersion Include="Serilog.Sinks.Seq" Version="9.0.0" />
|
|
||||||
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
|
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -1,20 +1,12 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="Constants\" />
|
<Folder Include="Constants\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MailKit" />
|
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Http.Features" />
|
<PackageReference Include="MailKit" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" />
|
|
||||||
<PackageReference Include="Octokit" />
|
<PackageReference Include="Octokit" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user