Skip to content

Migrate to slnx + update nuget pkgs + small code cleanups #11

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 1 commit into from
Apr 6, 2025
Merged

Migrate to slnx + update nuget pkgs + small code cleanups #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
<ImplicitUsings>true</ImplicitUsings>
<Nullable>enable</Nullable>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>
26 changes: 13 additions & 13 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
<PackageVersion Include="AutoMapper" Version="14.0.0" />
<PackageVersion Include="BuildBundlerMinifier" Version="3.2.449" />
<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.AspNetCore.Authentication.JwtBearer" Version="9.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SQLite" Version="9.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="3.0.71" />
<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="Serilog.Sinks.MSSqlServer" Version="8.2.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.7.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.3" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="xunit.v3" Version="1.1.0" />
<PackageVersion Include="xunit.v3" Version="2.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
</ItemGroup>
Expand Down
124 changes: 0 additions & 124 deletions RDMG.sln
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions RDMG.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/Docker/">
<File Path="Docker/configure-db.sh" />
<File Path="Docker/Dockerfile" />
<File Path="Docker/entrypoint.sh" />
<File Path="Docker/setup.sql" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".dockerignore" />
<File Path=".env" />
<File Path=".github/workflows/main.yml" />
<File Path=".gitignore" />
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="docker-compose.yml" />
<File Path="LICENSE" />
<File Path="OpenGameLicense.txt" />
<File Path="README.md" />
</Folder>
<Folder Name="/src/">
<Project Path="src/RDMG.Core/RDMG.Core.csproj" />
<Project Path="src/RDMG.Infrastructure/RDMG.Infrastructure.csproj" />
<Project Path="src/RDMG.Resources/RDMG.Resources.csproj" />
<Project Path="src/RDMG.Web/RDMG.Web.csproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj" />
</Folder>
</Solution>
2 changes: 0 additions & 2 deletions src/RDMG.Core/Abstractions/Data/IAppDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using RDMG.Core.Domain;
using System.Threading;
using System.Threading.Tasks;

namespace RDMG.Core.Abstractions.Data;

Expand Down
1 change: 0 additions & 1 deletion src/RDMG.Core/Abstractions/Generator/IDungeon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using RDMG.Core.Abstractions.Generator.Models;
using RDMG.Core.Abstractions.Services.Models;
using RDMG.Core.Domain;
using System.Collections.Generic;

namespace RDMG.Core.Abstractions.Generator;
public interface IDungeon
Expand Down
1 change: 0 additions & 1 deletion src/RDMG.Core/Abstractions/Generator/IDungeonHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using RDMG.Core.Abstractions.Generator.Models;
using RDMG.Core.Abstractions.Services.Models;
using System.Collections.Generic;

namespace RDMG.Core.Abstractions.Generator;

Expand Down
1 change: 0 additions & 1 deletion src/RDMG.Core/Abstractions/Generator/IDungeonNoCorridor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using RDMG.Core.Abstractions.Generator.Models;
using RDMG.Core.Abstractions.Services.Models;
using System.Collections.Generic;

namespace RDMG.Core.Abstractions.Generator;
public interface IDungeonNoCorridor
Expand Down
1 change: 0 additions & 1 deletion src/RDMG.Core/Abstractions/Generator/Models/Json/Monster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;

namespace RDMG.Core.Abstractions.Generator.Models.Json;
Expand Down
6 changes: 1 addition & 5 deletions src/RDMG.Core/Abstractions/Generator/Models/RoamingMonsterDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
namespace RDMG.Core.Abstractions.Generator.Models;

public class RoamingMonsterDescription(string name, string description)
{
public string Name { get; } = name;
public string Description { get; } = description;
}
public record RoamingMonsterDescription(string Name, string Description);
8 changes: 1 addition & 7 deletions src/RDMG.Core/Abstractions/Generator/Models/RoomDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
namespace RDMG.Core.Abstractions.Generator.Models;

public class RoomDescription(string name, string treasure, string monster, string doors)
{
public string Name { get; } = name;
public string Treasure { get; } = treasure;
public string Monster { get; } = monster;
public string Doors { get; } = doors;
}
public record RoomDescription(string Name, string Treasure, string Monster, string Doors);
21 changes: 10 additions & 11 deletions src/RDMG.Core/Abstractions/Generator/Models/Trap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

namespace RDMG.Core.Abstractions.Generator.Models;

public class Trap(string name, Save save, int spot, int disable, DisableCheck disableCheck, bool attackMod, DamageType? dmgType, string special)
{
public string Name { get; } = name;
public Save Save { get; } = save;
public int Spot { get; } = spot;
public int Disable { get; } = disable;
public DisableCheck DisableCheck { get; } = disableCheck;
public bool AttackMod { get; } = attackMod;
public DamageType? DmgType { get; } = dmgType;
public string Special { get; } = special;
}
public record Trap(
string Name,
Save Save,
int Spot,
int Disable,
DisableCheck DisableCheck,
bool AttackMod,
DamageType? DmgType,
string Special
);
6 changes: 1 addition & 5 deletions src/RDMG.Core/Abstractions/Generator/Models/TrapDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
namespace RDMG.Core.Abstractions.Generator.Models;

public class TrapDescription(string name, string description)
{
public string Name { get; } = name;
public string Description { get; } = description;
}
public record TrapDescription(string Name, string Description);
17 changes: 7 additions & 10 deletions src/RDMG.Core/Abstractions/Generator/Models/TreasureDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
using System.Collections.Generic;

namespace RDMG.Core.Abstractions.Generator.Models;

public class TreasureDescription
{
public string Name { get; set; } = string.Empty;
public int Cost { get; set; }
public int Rarity { get; set; }
public bool Magical { get; set; }
public List<string> Types { get; set; } = [];
}
public record TreasureDescription(
string Name,
int Cost,
int Rarity,
bool Magical,
IReadOnlyCollection<string> Types
);
3 changes: 0 additions & 3 deletions src/RDMG.Core/Abstractions/Repository/IDungeonOptionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using RDMG.Core.Domain;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

namespace RDMG.Core.Abstractions.Repository;

Expand Down
4 changes: 0 additions & 4 deletions src/RDMG.Core/Abstractions/Repository/IDungeonRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

namespace RDMG.Core.Abstractions.Repository;

public interface IDungeonRepository
Expand Down
3 changes: 0 additions & 3 deletions src/RDMG.Core/Abstractions/Repository/IOptionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using RDMG.Core.Domain;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

namespace RDMG.Core.Abstractions.Repository;

Expand Down
2 changes: 0 additions & 2 deletions src/RDMG.Core/Abstractions/Repository/IUserRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using RDMG.Core.Domain;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace RDMG.Core.Abstractions.Repository;

Expand Down
7 changes: 2 additions & 5 deletions src/RDMG.Core/Abstractions/Services/Exceptions/ServiceAggregateException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Collections.ObjectModel;

namespace RDMG.Core.Abstractions.Services.Exceptions;
public class ServiceAggregateException : Exception
Expand All @@ -10,7 +7,7 @@ public class ServiceAggregateException : Exception

public ReadOnlyCollection<ServiceException> GetInnerExceptions()
{
return new ReadOnlyCollection<ServiceException>(_innerExceptions.ToList());
return new ReadOnlyCollection<ServiceException>([.. _innerExceptions]);
}

public ServiceAggregateException(IEnumerable<ServiceException> innerExceptions)
Expand Down
4 changes: 1 addition & 3 deletions src/RDMG.Core/Abstractions/Services/Exceptions/ServiceException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace RDMG.Core.Abstractions.Services.Exceptions;
namespace RDMG.Core.Abstractions.Services.Exceptions;

public class ServiceException : Exception
{
Expand Down
1 change: 0 additions & 1 deletion src/RDMG.Core/Abstractions/Services/IAuthService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using RDMG.Core.Abstractions.Services.Models;
using System.Threading.Tasks;

namespace RDMG.Core.Abstractions.Services;

Expand Down
Loading