Skip to content

Migrate to .NET9 + xUnit v3 + small code cleanups #3

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
Externius merged 2 commits into from
Feb 15, 2025
Merged

Migrate to .NET9 + xUnit v3 + small code cleanups #3

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
ad9f3f3
Migrate to .NET9 + Xunit v3 + small code cleanups
Externius Feb 15, 2025
93e4c2e
Update workflow files
Externius Feb 15, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and run unit tests

env:
DOTNET_VERSION: '8.x'
DOTNET_VERSION: '9.x'

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release CI/CD
env:
AZURE_WEBAPP_NAME: app-open5etools
AZURE_WEBAPP_PACKAGE_PATH: '.'
DOTNET_VERSION: '8.x'
DOTNET_VERSION: '9.x'

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Open5ETools.Web/bin/Debug/net8.0/Open5ETools.Web.dll",
"program": "${workspaceFolder}/src/Open5ETools.Web/bin/Debug/net9.0/Open5ETools.Web.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Open5ETools.Web",
"stopAtEntry": false,
Expand Down
44 changes: 22 additions & 22 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="AutoMapper" Version="14.0.0" />
<PackageVersion Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SQLite" Version="8.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="IdentityModel" Version="7.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SQLite" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageVersion Include="Serilog.Sinks.MSSqlServer" Version="6.6.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.4.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.MSSqlServer" Version="8.1.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.5.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="xunit.v3" Version="1.1.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="X.PagedList" Version="8.4.7" />
<PackageVersion Include="X.PagedList.Mvc.Core" Version="8.4.7" />
<PackageVersion Include="X.PagedList" Version="10.5.7" />
<PackageVersion Include="X.PagedList.Mvc.Core" Version="10.5.7" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This repo is for playing around with DnD5E SRD materials, trying out some techno

## Prerequisites

You have .NET 8 SDK installed.
You have .NET 9 SDK installed.

## Get the code

Expand Down
3 changes: 2 additions & 1 deletion src/Open5ETools.Core/Common/Interfaces/Services/DM/IDungeonService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public interface IDungeonService
Task<IEnumerable<DungeonOptionModel>> GetAllDungeonOptionsAsync(CancellationToken cancellationToken);
Task<IEnumerable<DungeonOptionModel>> GetAllDungeonOptionsForUserAsync(int userId, CancellationToken cancellationToken);
Task<DungeonOptionModel> GetDungeonOptionAsync(int id, CancellationToken cancellationToken);
Task<DungeonOptionModel> GetDungeonOptionByNameAsync(string dungeonName, int userId, CancellationToken cancellationToken);
Task<DungeonOptionModel?> GetDungeonOptionByNameAsync(string dungeonName, int userId, CancellationToken cancellationToken);
Task<DungeonModel> GetDungeonAsync(int id, CancellationToken cancellationToken);
Task<DungeonModel> CreateOrUpdateDungeonAsync(DungeonOptionModel optionModel, bool addDungeon, int level, CancellationToken cancellationToken);
Task UpdateDungeonAsync(DungeonModel model, CancellationToken cancellationToken);
Expand All @@ -19,4 +19,5 @@ public interface IDungeonService
Task<bool> DeleteDungeonAsync(int id, CancellationToken cancellationToken);
Task<DungeonModel> GenerateDungeonAsync(DungeonOptionModel model);
Task RenameDungeonAsync(int optionId, int userId, string newName, CancellationToken cancellationToken);
Task<string> ExportToJsonAsync(int dungeonId, CancellationToken cancellationToken);
}
8 changes: 3 additions & 5 deletions src/Open5ETools.Core/ConfigureServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
using Open5ETools.Core.Common.Interfaces.Services.EG;
using Open5ETools.Core.Common.Interfaces.Services.SM;
using Open5ETools.Core.Services;
using Open5ETools.Core.Services.Automapper;
using Open5ETools.Core.Services.DM;
using Open5ETools.Core.Services.DM.Generator;
using Open5ETools.Core.Services.EG;
using Open5ETools.Core.Services.SM;

namespace Open5ETools.Core;

public static class ConfigureServices
{
public static IServiceCollection AddApplicationServices(
Expand All @@ -29,11 +31,7 @@ this IServiceCollection services
.AddScoped<IDungeonService, DungeonService>()
.AddScoped<ISpellService, SpellService>();

services.AddAutoMapper(cfg =>
{
cfg.AllowNullCollections = true;
}
, AppDomain.CurrentDomain.GetAssemblies());
services.AddAutoMapper(cfg => { cfg.AllowNullCollections = true; }, typeof(UserProfile));

return services;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Open5ETools.Core/Open5ETools.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Loading
Loading