diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..48051fb --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,11 @@ + + + net9.0 + latest + true + enable + true + true + true + + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index d01a33a..d5a418b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,24 +6,24 @@ - - - - - - - - + + + + + + + + - + - - - + + + - + diff --git a/RDMG.sln b/RDMG.sln deleted file mode 100644 index 86658a5..0000000 --- a/RDMG.sln +++ /dev/null @@ -1,124 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32002.185 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RDMG.Web", "src\RDMG.Web\RDMG.Web.csproj", "{7F703F64-0A79-4214-BF1F-481D9BD22D09}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RDMG.Core.Tests", "tests\RDMG.Core.Tests\RDMG.Core.Tests.csproj", "{A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RDMG.Core", "src\RDMG.Core\RDMG.Core.csproj", "{F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RDMG.Infrastructure", "src\RDMG.Infrastructure\RDMG.Infrastructure.csproj", "{79A37F9A-178B-4C65-8B36-5F94EF7E3993}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RDMG.Resources", "src\RDMG.Resources\RDMG.Resources.csproj", "{E1EBA5E2-59E9-425C-89F5-6869B9408C7F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{EC3117DF-B57F-4029-87B6-A11862510D4D}" - ProjectSection(SolutionItems) = preProject - Docker\configure-db.sh = Docker\configure-db.sh - Docker\Dockerfile = Docker\Dockerfile - Docker\entrypoint.sh = Docker\entrypoint.sh - Docker\setup.sql = Docker\setup.sql - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A9C8155D-F8A5-43F6-8CA9-F2C6BF743DDC}" - ProjectSection(SolutionItems) = preProject - .dockerignore = .dockerignore - .env = .env - .gitignore = .gitignore - Directory.Packages.props = Directory.Packages.props - docker-compose.yml = docker-compose.yml - LICENSE = LICENSE - .github\workflows\main.yml = .github\workflows\main.yml - OpenGameLicense.txt = OpenGameLicense.txt - README.md = README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{703434B6-C99D-4CB1-B25B-E71BA4E9685F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3C2711CF-E414-46E1-84BD-5FA1D358836A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Debug|x64.ActiveCfg = Debug|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Debug|x64.Build.0 = Debug|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Debug|x86.ActiveCfg = Debug|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Debug|x86.Build.0 = Debug|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Release|Any CPU.Build.0 = Release|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Release|x64.ActiveCfg = Release|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Release|x64.Build.0 = Release|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Release|x86.ActiveCfg = Release|Any CPU - {7F703F64-0A79-4214-BF1F-481D9BD22D09}.Release|x86.Build.0 = Release|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Debug|x64.ActiveCfg = Debug|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Debug|x64.Build.0 = Debug|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Debug|x86.ActiveCfg = Debug|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Debug|x86.Build.0 = Debug|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Release|Any CPU.Build.0 = Release|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Release|x64.ActiveCfg = Release|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Release|x64.Build.0 = Release|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Release|x86.ActiveCfg = Release|Any CPU - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A}.Release|x86.Build.0 = Release|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Debug|x64.ActiveCfg = Debug|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Debug|x64.Build.0 = Debug|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Debug|x86.ActiveCfg = Debug|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Debug|x86.Build.0 = Debug|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Release|Any CPU.Build.0 = Release|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Release|x64.ActiveCfg = Release|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Release|x64.Build.0 = Release|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Release|x86.ActiveCfg = Release|Any CPU - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271}.Release|x86.Build.0 = Release|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Debug|x64.ActiveCfg = Debug|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Debug|x64.Build.0 = Debug|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Debug|x86.ActiveCfg = Debug|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Debug|x86.Build.0 = Debug|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Release|Any CPU.Build.0 = Release|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Release|x64.ActiveCfg = Release|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Release|x64.Build.0 = Release|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Release|x86.ActiveCfg = Release|Any CPU - {79A37F9A-178B-4C65-8B36-5F94EF7E3993}.Release|x86.Build.0 = Release|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Debug|x64.ActiveCfg = Debug|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Debug|x64.Build.0 = Debug|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Debug|x86.ActiveCfg = Debug|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Debug|x86.Build.0 = Debug|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Release|Any CPU.Build.0 = Release|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Release|x64.ActiveCfg = Release|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Release|x64.Build.0 = Release|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Release|x86.ActiveCfg = Release|Any CPU - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {7F703F64-0A79-4214-BF1F-481D9BD22D09} = {703434B6-C99D-4CB1-B25B-E71BA4E9685F} - {A4BAB97D-A19F-47A3-B0CA-8F24898B0A1A} = {3C2711CF-E414-46E1-84BD-5FA1D358836A} - {F11BD7E4-901C-4B7D-8A8B-B0ACD5B31271} = {703434B6-C99D-4CB1-B25B-E71BA4E9685F} - {79A37F9A-178B-4C65-8B36-5F94EF7E3993} = {703434B6-C99D-4CB1-B25B-E71BA4E9685F} - {E1EBA5E2-59E9-425C-89F5-6869B9408C7F} = {703434B6-C99D-4CB1-B25B-E71BA4E9685F} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DE268029-B3D2-4384-B99A-1CE965B74851} - EndGlobalSection -EndGlobal diff --git a/RDMG.slnx b/RDMG.slnx new file mode 100644 index 0000000..15530eb --- /dev/null +++ b/RDMG.slnx @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/RDMG.Core/Abstractions/Data/IAppDbContext.cs b/src/RDMG.Core/Abstractions/Data/IAppDbContext.cs index d2d0a12..b688dde 100644 --- a/src/RDMG.Core/Abstractions/Data/IAppDbContext.cs +++ b/src/RDMG.Core/Abstractions/Data/IAppDbContext.cs @@ -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; diff --git a/src/RDMG.Core/Abstractions/Generator/IDungeon.cs b/src/RDMG.Core/Abstractions/Generator/IDungeon.cs index 51be0cb..951218e 100644 --- a/src/RDMG.Core/Abstractions/Generator/IDungeon.cs +++ b/src/RDMG.Core/Abstractions/Generator/IDungeon.cs @@ -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 diff --git a/src/RDMG.Core/Abstractions/Generator/IDungeonHelper.cs b/src/RDMG.Core/Abstractions/Generator/IDungeonHelper.cs index 5044cca..f99929f 100644 --- a/src/RDMG.Core/Abstractions/Generator/IDungeonHelper.cs +++ b/src/RDMG.Core/Abstractions/Generator/IDungeonHelper.cs @@ -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; diff --git a/src/RDMG.Core/Abstractions/Generator/IDungeonNoCorridor.cs b/src/RDMG.Core/Abstractions/Generator/IDungeonNoCorridor.cs index e82a264..33c835d 100644 --- a/src/RDMG.Core/Abstractions/Generator/IDungeonNoCorridor.cs +++ b/src/RDMG.Core/Abstractions/Generator/IDungeonNoCorridor.cs @@ -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 diff --git a/src/RDMG.Core/Abstractions/Generator/Models/Json/Monster.cs b/src/RDMG.Core/Abstractions/Generator/Models/Json/Monster.cs index 16c52e5..4817e39 100644 --- a/src/RDMG.Core/Abstractions/Generator/Models/Json/Monster.cs +++ b/src/RDMG.Core/Abstractions/Generator/Models/Json/Monster.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using System.Text.Json.Serialization; namespace RDMG.Core.Abstractions.Generator.Models.Json; diff --git a/src/RDMG.Core/Abstractions/Generator/Models/RoamingMonsterDescription.cs b/src/RDMG.Core/Abstractions/Generator/Models/RoamingMonsterDescription.cs index 9850fb0..4538c75 100644 --- a/src/RDMG.Core/Abstractions/Generator/Models/RoamingMonsterDescription.cs +++ b/src/RDMG.Core/Abstractions/Generator/Models/RoamingMonsterDescription.cs @@ -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; -} \ No newline at end of file +public record RoamingMonsterDescription(string Name, string Description); \ No newline at end of file diff --git a/src/RDMG.Core/Abstractions/Generator/Models/RoomDescription.cs b/src/RDMG.Core/Abstractions/Generator/Models/RoomDescription.cs index 568c9ba..010ab47 100644 --- a/src/RDMG.Core/Abstractions/Generator/Models/RoomDescription.cs +++ b/src/RDMG.Core/Abstractions/Generator/Models/RoomDescription.cs @@ -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; -} \ No newline at end of file +public record RoomDescription(string Name, string Treasure, string Monster, string Doors); \ No newline at end of file diff --git a/src/RDMG.Core/Abstractions/Generator/Models/Trap.cs b/src/RDMG.Core/Abstractions/Generator/Models/Trap.cs index 5c0652b..c24f778 100644 --- a/src/RDMG.Core/Abstractions/Generator/Models/Trap.cs +++ b/src/RDMG.Core/Abstractions/Generator/Models/Trap.cs @@ -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; -} \ No newline at end of file +public record Trap( + string Name, + Save Save, + int Spot, + int Disable, + DisableCheck DisableCheck, + bool AttackMod, + DamageType? DmgType, + string Special +); \ No newline at end of file diff --git a/src/RDMG.Core/Abstractions/Generator/Models/TrapDescription.cs b/src/RDMG.Core/Abstractions/Generator/Models/TrapDescription.cs index dc66b47..1457389 100644 --- a/src/RDMG.Core/Abstractions/Generator/Models/TrapDescription.cs +++ b/src/RDMG.Core/Abstractions/Generator/Models/TrapDescription.cs @@ -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; -} \ No newline at end of file +public record TrapDescription(string Name, string Description); \ No newline at end of file diff --git a/src/RDMG.Core/Abstractions/Generator/Models/TreasureDescription.cs b/src/RDMG.Core/Abstractions/Generator/Models/TreasureDescription.cs index 6b399a8..12a9ec3 100644 --- a/src/RDMG.Core/Abstractions/Generator/Models/TreasureDescription.cs +++ b/src/RDMG.Core/Abstractions/Generator/Models/TreasureDescription.cs @@ -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 Types { get; set; } = []; -} \ No newline at end of file +public record TreasureDescription( + string Name, + int Cost, + int Rarity, + bool Magical, + IReadOnlyCollection Types +); \ No newline at end of file diff --git a/src/RDMG.Core/Abstractions/Repository/IDungeonOptionRepository.cs b/src/RDMG.Core/Abstractions/Repository/IDungeonOptionRepository.cs index 22d340b..f2b1b61 100644 --- a/src/RDMG.Core/Abstractions/Repository/IDungeonOptionRepository.cs +++ b/src/RDMG.Core/Abstractions/Repository/IDungeonOptionRepository.cs @@ -1,7 +1,4 @@ using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Repository; diff --git a/src/RDMG.Core/Abstractions/Repository/IDungeonRepository.cs b/src/RDMG.Core/Abstractions/Repository/IDungeonRepository.cs index 1df6f0b..21eb270 100644 --- a/src/RDMG.Core/Abstractions/Repository/IDungeonRepository.cs +++ b/src/RDMG.Core/Abstractions/Repository/IDungeonRepository.cs @@ -1,7 +1,3 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - namespace RDMG.Core.Abstractions.Repository; public interface IDungeonRepository diff --git a/src/RDMG.Core/Abstractions/Repository/IOptionRepository.cs b/src/RDMG.Core/Abstractions/Repository/IOptionRepository.cs index d5c064b..6c002b1 100644 --- a/src/RDMG.Core/Abstractions/Repository/IOptionRepository.cs +++ b/src/RDMG.Core/Abstractions/Repository/IOptionRepository.cs @@ -1,7 +1,4 @@ using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Repository; diff --git a/src/RDMG.Core/Abstractions/Repository/IUserRepository.cs b/src/RDMG.Core/Abstractions/Repository/IUserRepository.cs index 80430aa..91d9a39 100644 --- a/src/RDMG.Core/Abstractions/Repository/IUserRepository.cs +++ b/src/RDMG.Core/Abstractions/Repository/IUserRepository.cs @@ -1,6 +1,4 @@ using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Repository; diff --git a/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceAggregateException.cs b/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceAggregateException.cs index cb191d2..93427ee 100644 --- a/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceAggregateException.cs +++ b/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceAggregateException.cs @@ -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 @@ -10,7 +7,7 @@ public class ServiceAggregateException : Exception public ReadOnlyCollection GetInnerExceptions() { - return new ReadOnlyCollection(_innerExceptions.ToList()); + return new ReadOnlyCollection([.. _innerExceptions]); } public ServiceAggregateException(IEnumerable innerExceptions) diff --git a/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceException.cs b/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceException.cs index 2766f8c..b7c5d12 100644 --- a/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceException.cs +++ b/src/RDMG.Core/Abstractions/Services/Exceptions/ServiceException.cs @@ -1,6 +1,4 @@ -using System; - -namespace RDMG.Core.Abstractions.Services.Exceptions; +namespace RDMG.Core.Abstractions.Services.Exceptions; public class ServiceException : Exception { diff --git a/src/RDMG.Core/Abstractions/Services/IAuthService.cs b/src/RDMG.Core/Abstractions/Services/IAuthService.cs index 2999610..e331bd8 100644 --- a/src/RDMG.Core/Abstractions/Services/IAuthService.cs +++ b/src/RDMG.Core/Abstractions/Services/IAuthService.cs @@ -1,5 +1,4 @@ using RDMG.Core.Abstractions.Services.Models; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Services; diff --git a/src/RDMG.Core/Abstractions/Services/IDungeonService.cs b/src/RDMG.Core/Abstractions/Services/IDungeonService.cs index 9fa1b95..0d89685 100644 --- a/src/RDMG.Core/Abstractions/Services/IDungeonService.cs +++ b/src/RDMG.Core/Abstractions/Services/IDungeonService.cs @@ -1,7 +1,4 @@ using RDMG.Core.Abstractions.Services.Models; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Services; @@ -10,7 +7,7 @@ public interface IDungeonService Task> GetAllDungeonOptionsAsync(CancellationToken cancellationToken); Task> GetAllDungeonOptionsForUserAsync(int userId, CancellationToken cancellationToken); Task GetDungeonOptionAsync(int id, CancellationToken cancellationToken); - Task GetDungeonOptionByNameAsync(string dungeonName, int userId, CancellationToken cancellationToken); + Task GetDungeonOptionByNameAsync(string dungeonName, int userId, CancellationToken cancellationToken); Task GetDungeonAsync(int id, CancellationToken cancellationToken); Task CreateOrUpdateDungeonAsync(DungeonOptionModel optionModel, bool addDungeon, int level, CancellationToken cancellationToken); Task UpdateDungeonAsync(DungeonModel model, CancellationToken cancellationToken); diff --git a/src/RDMG.Core/Abstractions/Services/IOptionService.cs b/src/RDMG.Core/Abstractions/Services/IOptionService.cs index 690424b..40aa578 100644 --- a/src/RDMG.Core/Abstractions/Services/IOptionService.cs +++ b/src/RDMG.Core/Abstractions/Services/IOptionService.cs @@ -1,8 +1,5 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Services; diff --git a/src/RDMG.Core/Abstractions/Services/IUserService.cs b/src/RDMG.Core/Abstractions/Services/IUserService.cs index 2db7666..0d4bab2 100644 --- a/src/RDMG.Core/Abstractions/Services/IUserService.cs +++ b/src/RDMG.Core/Abstractions/Services/IUserService.cs @@ -1,6 +1,4 @@ using RDMG.Core.Abstractions.Services.Models; -using System.Collections.Generic; -using System.Threading.Tasks; namespace RDMG.Core.Abstractions.Services; diff --git a/src/RDMG.Core/Abstractions/Services/Models/DungeonOptionModel.cs b/src/RDMG.Core/Abstractions/Services/Models/DungeonOptionModel.cs index d03d7b8..35403d1 100644 --- a/src/RDMG.Core/Abstractions/Services/Models/DungeonOptionModel.cs +++ b/src/RDMG.Core/Abstractions/Services/Models/DungeonOptionModel.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace RDMG.Core.Abstractions.Services.Models; +namespace RDMG.Core.Abstractions.Services.Models; public class DungeonOptionModel : EditModel { diff --git a/src/RDMG.Core/Abstractions/Services/Models/EditModel.cs b/src/RDMG.Core/Abstractions/Services/Models/EditModel.cs index dba2c84..0627316 100644 --- a/src/RDMG.Core/Abstractions/Services/Models/EditModel.cs +++ b/src/RDMG.Core/Abstractions/Services/Models/EditModel.cs @@ -1,6 +1,4 @@ -using System; - -namespace RDMG.Core.Abstractions.Services.Models; +namespace RDMG.Core.Abstractions.Services.Models; public class EditModel { diff --git a/src/RDMG.Core/Domain/AuditableEntity.cs b/src/RDMG.Core/Domain/AuditableEntity.cs index 22710a5..8f66c57 100644 --- a/src/RDMG.Core/Domain/AuditableEntity.cs +++ b/src/RDMG.Core/Domain/AuditableEntity.cs @@ -1,6 +1,4 @@ -using System; - -namespace RDMG.Core.Domain; +namespace RDMG.Core.Domain; public abstract class AuditableEntity : BaseEntity { public string CreatedBy { get; set; } = string.Empty; diff --git a/src/RDMG.Core/Domain/DungeonOption.cs b/src/RDMG.Core/Domain/DungeonOption.cs index f204f91..2918533 100644 --- a/src/RDMG.Core/Domain/DungeonOption.cs +++ b/src/RDMG.Core/Domain/DungeonOption.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace RDMG.Core.Domain; public class DungeonOption : AuditableEntity diff --git a/src/RDMG.Core/Generator/Dungeon.cs b/src/RDMG.Core/Generator/Dungeon.cs index 993830f..21a492f 100644 --- a/src/RDMG.Core/Generator/Dungeon.cs +++ b/src/RDMG.Core/Generator/Dungeon.cs @@ -2,9 +2,6 @@ using RDMG.Core.Abstractions.Generator.Models; using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text.Json; namespace RDMG.Core.Generator; @@ -474,9 +471,9 @@ public virtual void Init(DungeonOptionModel optionModel) var imgSizeY = DungeonHeight / DungeonSize; _roomCount = (int)Math.Round((float)DungeonSize / 100 * optionModel.RoomDensity); RoomSize = (int)Math.Round((float)(DungeonSize - Math.Round(DungeonSize * 0.35)) / 100 * RoomSizePercent); - RoomDescription = new List(); - TrapDescription = new List(); - RoamingMonsterDescription = new List(); + RoomDescription = []; + TrapDescription = []; + RoamingMonsterDescription = []; _trapCount = DungeonSize * optionModel.TrapPercent / 100; _roamingCount = DungeonSize * optionModel.RoamingPercent / 100; DungeonSize += 2; // because of boundaries diff --git a/src/RDMG.Core/Generator/DungeonHelper.cs b/src/RDMG.Core/Generator/DungeonHelper.cs index 901292f..ea01cd2 100644 --- a/src/RDMG.Core/Generator/DungeonHelper.cs +++ b/src/RDMG.Core/Generator/DungeonHelper.cs @@ -4,10 +4,6 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; using RDMG.Core.Helpers; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Text; using System.Text.Json; @@ -408,14 +404,14 @@ private List GetFilteredList() { if (MonsterType.Equals("any", StringComparison.OrdinalIgnoreCase)) { - return TreasureList - .Where(item => item.Rarity <= ItemsRarity && item.Cost < _sumValue) - .ToList(); + return [.. TreasureList.Where(item => item.Rarity <= ItemsRarity && item.Cost < _sumValue)]; } - return TreasureList - .Where(item => item.Rarity <= ItemsRarity && item.Cost < _sumValue && item.Types.Contains(MonsterType)) - .ToList(); + return + [ + .. TreasureList.Where(item => + item.Rarity <= ItemsRarity && item.Cost < _sumValue && item.Types.Contains(MonsterType)) + ]; } private void GetAllCost() diff --git a/src/RDMG.Core/Generator/DungeonNoCorridor.cs b/src/RDMG.Core/Generator/DungeonNoCorridor.cs index 76dc578..7c6db9e 100644 --- a/src/RDMG.Core/Generator/DungeonNoCorridor.cs +++ b/src/RDMG.Core/Generator/DungeonNoCorridor.cs @@ -3,9 +3,6 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; using RDMG.Core.Helpers; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text.Json; namespace RDMG.Core.Generator; diff --git a/src/RDMG.Core/Helpers/EnumHelper.cs b/src/RDMG.Core/Helpers/EnumHelper.cs index e38e9c0..9972f70 100644 --- a/src/RDMG.Core/Helpers/EnumHelper.cs +++ b/src/RDMG.Core/Helpers/EnumHelper.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel; +using System.ComponentModel; namespace RDMG.Core.Helpers; diff --git a/src/RDMG.Core/Helpers/PasswordHelper.cs b/src/RDMG.Core/Helpers/PasswordHelper.cs index 3b74b0a..266ac3c 100644 --- a/src/RDMG.Core/Helpers/PasswordHelper.cs +++ b/src/RDMG.Core/Helpers/PasswordHelper.cs @@ -1,5 +1,4 @@ -using System; -using System.Security.Cryptography; +using System.Security.Cryptography; namespace RDMG.Core.Helpers; diff --git a/src/RDMG.Core/RDMG.Core.csproj b/src/RDMG.Core/RDMG.Core.csproj index 06c2968..3b8c2ab 100644 --- a/src/RDMG.Core/RDMG.Core.csproj +++ b/src/RDMG.Core/RDMG.Core.csproj @@ -1,8 +1,4 @@  - - net9.0 - enable - diff --git a/src/RDMG.Core/Services/AuthService.cs b/src/RDMG.Core/Services/AuthService.cs index a2daf6e..5522ba4 100644 --- a/src/RDMG.Core/Services/AuthService.cs +++ b/src/RDMG.Core/Services/AuthService.cs @@ -4,8 +4,6 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Helpers; -using System; -using System.Threading.Tasks; namespace RDMG.Core.Services; diff --git a/src/RDMG.Core/Services/DungeonService.cs b/src/RDMG.Core/Services/DungeonService.cs index 3c458e5..668dc43 100644 --- a/src/RDMG.Core/Services/DungeonService.cs +++ b/src/RDMG.Core/Services/DungeonService.cs @@ -7,11 +7,6 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; using RDMG.Resources; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Services; @@ -125,9 +120,8 @@ private async Task UpdateExistingDungeonAsync(DungeonOptionModel o private async Task CreateOptionAndAddDungeonToItAsync(DungeonOptionModel optionModel, CancellationToken cancellationToken) { - await CreateDungeonOptionAsync(optionModel, cancellationToken); - var created = await GetDungeonOptionByNameAsync(optionModel.DungeonName, optionModel.UserId, cancellationToken); - var dungeon = await GenerateDungeonAsync(optionModel, created.Id); + var createdId = await CreateDungeonOptionAsync(optionModel, cancellationToken); + var dungeon = await GenerateDungeonAsync(optionModel, createdId); dungeon.Level = 1; var id = await AddDungeonAsync(dungeon, cancellationToken); dungeon.Id = id; @@ -209,7 +203,7 @@ public async Task> GetAllDungeonOptionsForUserAs } } - public async Task GetDungeonOptionByNameAsync(string dungeonName, int userId, + public async Task GetDungeonOptionByNameAsync(string dungeonName, int userId, CancellationToken cancellationToken) { try diff --git a/src/RDMG.Core/Services/OptionService.cs b/src/RDMG.Core/Services/OptionService.cs index 12793f0..b375aed 100644 --- a/src/RDMG.Core/Services/OptionService.cs +++ b/src/RDMG.Core/Services/OptionService.cs @@ -5,11 +5,6 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Services; @@ -33,7 +28,7 @@ public async Task> ListOptionsAsync(OptionKey? filter = return filter.HasValue ? cacheEntry?.Where(o => o.Key == filter.Value) ?? [] : cacheEntry ?? []; var options = await _optionRepository.ListAsync(null, cancellationToken); - cacheEntry = options.Select(_mapper.Map).ToList(); + cacheEntry = [.. options.Select(_mapper.Map)]; var cacheEntryOptions = new MemoryCacheEntryOptions() .SetSlidingExpiration(TimeSpan.FromMinutes(10)); diff --git a/src/RDMG.Core/Services/UserService.cs b/src/RDMG.Core/Services/UserService.cs index 3235ed6..fbe3d13 100644 --- a/src/RDMG.Core/Services/UserService.cs +++ b/src/RDMG.Core/Services/UserService.cs @@ -6,10 +6,6 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; using RDMG.Core.Helpers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace RDMG.Core.Services; @@ -98,9 +94,7 @@ public async Task> ListAsync(bool? deleted = false) { var result = await _userRepository.ListAsync(deleted); - return result.Select(_mapper.Map) - .OrderBy(um => um.Username) - .ToList(); + return [.. result.Select(_mapper.Map).OrderBy(um => um.Username)]; } catch (Exception ex) { diff --git a/src/RDMG.Infrastructure/ConfigureServices.cs b/src/RDMG.Infrastructure/ConfigureServices.cs index b701770..4fcf074 100644 --- a/src/RDMG.Infrastructure/ConfigureServices.cs +++ b/src/RDMG.Infrastructure/ConfigureServices.cs @@ -9,8 +9,6 @@ using RDMG.Infrastructure.Data; using RDMG.Infrastructure.Interceptors; using RDMG.Infrastructure.Repository; -using System; -using System.IO; using System.Reflection; using RDMG.Infrastructure.Repository.Automapper; diff --git a/src/RDMG.Infrastructure/Data/AppDbContextInitializer.cs b/src/RDMG.Infrastructure/Data/AppDbContextInitializer.cs index f9c6459..cbd3c13 100644 --- a/src/RDMG.Infrastructure/Data/AppDbContextInitializer.cs +++ b/src/RDMG.Infrastructure/Data/AppDbContextInitializer.cs @@ -6,11 +6,6 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Domain; using RDMG.Core.Helpers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Infrastructure.Data; public class AppDbContextInitializer(IAppDbContext context, IDungeonService dungeonService, IOptions config) diff --git a/src/RDMG.Infrastructure/Extensions/ModelBuilderExtensions.cs b/src/RDMG.Infrastructure/Extensions/ModelBuilderExtensions.cs index 4d40671..59affc9 100644 --- a/src/RDMG.Infrastructure/Extensions/ModelBuilderExtensions.cs +++ b/src/RDMG.Infrastructure/Extensions/ModelBuilderExtensions.cs @@ -1,6 +1,4 @@ using Microsoft.EntityFrameworkCore; -using System; -using System.Linq; namespace RDMG.Infrastructure.Extensions; diff --git a/src/RDMG.Infrastructure/Interceptors/AuditEntitiesSaveChangesInterceptor.cs b/src/RDMG.Infrastructure/Interceptors/AuditEntitiesSaveChangesInterceptor.cs index 3543a40..7f740d5 100644 --- a/src/RDMG.Infrastructure/Interceptors/AuditEntitiesSaveChangesInterceptor.cs +++ b/src/RDMG.Infrastructure/Interceptors/AuditEntitiesSaveChangesInterceptor.cs @@ -2,9 +2,6 @@ using Microsoft.EntityFrameworkCore.Diagnostics; using RDMG.Core.Abstractions.Services; using RDMG.Core.Domain; -using System; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Infrastructure.Interceptors; public class AuditEntitiesSaveChangesInterceptor(ICurrentUserService currentUserService) : SaveChangesInterceptor diff --git a/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj b/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj index d8f41da..8d11a36 100644 --- a/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj +++ b/src/RDMG.Infrastructure/RDMG.Infrastructure.csproj @@ -1,8 +1,4 @@ - - net9.0 - enable - @@ -12,9 +8,4 @@ - - - - - \ No newline at end of file diff --git a/src/RDMG.Infrastructure/Repository/DungeonOptionRepository.cs b/src/RDMG.Infrastructure/Repository/DungeonOptionRepository.cs index 68e0de3..903962d 100644 --- a/src/RDMG.Infrastructure/Repository/DungeonOptionRepository.cs +++ b/src/RDMG.Infrastructure/Repository/DungeonOptionRepository.cs @@ -4,10 +4,6 @@ using RDMG.Core.Abstractions.Data; using RDMG.Core.Abstractions.Repository; using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Infrastructure.Repository; diff --git a/src/RDMG.Infrastructure/Repository/DungeonRepository.cs b/src/RDMG.Infrastructure/Repository/DungeonRepository.cs index 71aaa31..80baa0b 100644 --- a/src/RDMG.Infrastructure/Repository/DungeonRepository.cs +++ b/src/RDMG.Infrastructure/Repository/DungeonRepository.cs @@ -4,10 +4,6 @@ using RDMG.Core.Abstractions.Data; using RDMG.Core.Abstractions.Repository; using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Infrastructure.Repository; diff --git a/src/RDMG.Infrastructure/Repository/OptionRepository.cs b/src/RDMG.Infrastructure/Repository/OptionRepository.cs index 84bd0b1..e7b21e4 100644 --- a/src/RDMG.Infrastructure/Repository/OptionRepository.cs +++ b/src/RDMG.Infrastructure/Repository/OptionRepository.cs @@ -4,10 +4,6 @@ using RDMG.Core.Abstractions.Data; using RDMG.Core.Abstractions.Repository; using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Infrastructure.Repository; diff --git a/src/RDMG.Infrastructure/Repository/UserRepository.cs b/src/RDMG.Infrastructure/Repository/UserRepository.cs index 114c820..32e054f 100644 --- a/src/RDMG.Infrastructure/Repository/UserRepository.cs +++ b/src/RDMG.Infrastructure/Repository/UserRepository.cs @@ -4,10 +4,6 @@ using RDMG.Core.Abstractions.Data; using RDMG.Core.Abstractions.Repository; using RDMG.Core.Domain; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Infrastructure.Repository; diff --git a/src/RDMG.Resources/RDMG.Resources.csproj b/src/RDMG.Resources/RDMG.Resources.csproj index 613c2d3..b82d9bc 100644 --- a/src/RDMG.Resources/RDMG.Resources.csproj +++ b/src/RDMG.Resources/RDMG.Resources.csproj @@ -1,10 +1,4 @@ - - - net9.0 - enable - - diff --git a/src/RDMG.Web/RDMG.Web.csproj b/src/RDMG.Web/RDMG.Web.csproj index e3eadd6..a5a3f59 100644 --- a/src/RDMG.Web/RDMG.Web.csproj +++ b/src/RDMG.Web/RDMG.Web.csproj @@ -1,8 +1,5 @@  - net9.0 - enable - enable true true 1.0.3.1 diff --git a/src/RDMG.Web/libman.json b/src/RDMG.Web/libman.json index fe731dd..9f65deb 100644 --- a/src/RDMG.Web/libman.json +++ b/src/RDMG.Web/libman.json @@ -11,7 +11,7 @@ "destination": "wwwroot/lib/bootstrap" }, { - "library": "bootbox.js@6.0.0", + "library": "bootbox.js@6.0.2", "destination": "wwwroot/lib/bootbox" }, { diff --git a/tests/RDMG.Core.Tests/DungeonHelperTests/Get.cs b/tests/RDMG.Core.Tests/DungeonHelperTests/Get.cs index 00786e1..1ece43c 100644 --- a/tests/RDMG.Core.Tests/DungeonHelperTests/Get.cs +++ b/tests/RDMG.Core.Tests/DungeonHelperTests/Get.cs @@ -2,7 +2,6 @@ using RDMG.Core.Abstractions.Generator.Models; using RDMG.Core.Domain; using Shouldly; -using System.Linq; using Xunit; namespace RDMG.Core.Tests.DungeonHelperTests; diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs index 1c64a54..e18fcf5 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Create.cs @@ -3,10 +3,6 @@ using RDMG.Core.Abstractions.Services.Models; using RDMG.Core.Generator; using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.DungeonServiceTests; diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs index 6081f82..91378da 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Delete.cs @@ -1,7 +1,5 @@ using RDMG.Core.Abstractions.Services; using Shouldly; -using System.Linq; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.DungeonServiceTests; diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Generate.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Generate.cs index 894b73a..df25004 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Generate.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Generate.cs @@ -1,8 +1,6 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Abstractions.Services.Models; using Shouldly; -using System; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.DungeonServiceTests; diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs index da87f81..ef1fdd6 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Get.cs @@ -1,7 +1,5 @@ using RDMG.Core.Abstractions.Services; using Shouldly; -using System.Linq; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.DungeonServiceTests; diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs index c696105..556fb5b 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/List.cs @@ -1,7 +1,5 @@ using RDMG.Core.Abstractions.Services; using Shouldly; -using System.Linq; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.DungeonServiceTests; diff --git a/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs b/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs index 894a295..af40a2f 100644 --- a/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs +++ b/tests/RDMG.Core.Tests/DungeonServiceTests/Update.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Generator; using Shouldly; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.DungeonServiceTests; diff --git a/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs b/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs index f14fede..ece78b8 100644 --- a/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs +++ b/tests/RDMG.Core.Tests/GeneratorTests/DungeonGenerator.cs @@ -1,6 +1,5 @@ using RDMG.Core.Domain; using Shouldly; -using System.Linq; using Xunit; namespace RDMG.Core.Tests.GeneratorTests; diff --git a/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs b/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs index 4381cde..eb29d62 100644 --- a/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs +++ b/tests/RDMG.Core.Tests/GeneratorTests/DungeonNoCorridorGenerator.cs @@ -1,6 +1,5 @@ using RDMG.Core.Domain; using Shouldly; -using System.Linq; using Xunit; namespace RDMG.Core.Tests.GeneratorTests; diff --git a/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs b/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs index 4705961..b422cd3 100644 --- a/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs +++ b/tests/RDMG.Core.Tests/GeneratorTests/DungeonTestBase.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Generator; using RDMG.Core.Abstractions.Generator.Models; using RDMG.Core.Domain; -using System.Collections.Generic; using System.Text; using Xunit; diff --git a/tests/RDMG.Core.Tests/OptionServiceTests/List.cs b/tests/RDMG.Core.Tests/OptionServiceTests/List.cs index 8d7a404..2ffcce1 100644 --- a/tests/RDMG.Core.Tests/OptionServiceTests/List.cs +++ b/tests/RDMG.Core.Tests/OptionServiceTests/List.cs @@ -2,9 +2,6 @@ using RDMG.Core.Abstractions.Services; using RDMG.Core.Domain; using Shouldly; -using System; -using System.Linq; -using System.Threading.Tasks; using Xunit; namespace RDMG.Core.Tests.OptionServiceTests; diff --git a/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj b/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj index e6ff6dc..a60ffcc 100644 --- a/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj +++ b/tests/RDMG.Core.Tests/RDMG.Core.Tests.csproj @@ -1,7 +1,5 @@  - net9.0 - enable false true Exe diff --git a/tests/RDMG.Core.Tests/TestEnvironment.cs b/tests/RDMG.Core.Tests/TestEnvironment.cs index 94f56b7..7bec697 100644 --- a/tests/RDMG.Core.Tests/TestEnvironment.cs +++ b/tests/RDMG.Core.Tests/TestEnvironment.cs @@ -7,10 +7,6 @@ using RDMG.Infrastructure; using RDMG.Infrastructure.Data; using RDMG.Web.Services; -using System; -using System.IO; -using System.Threading; -using System.Threading.Tasks; namespace RDMG.Core.Tests; diff --git a/tests/RDMG.Core.Tests/TestFixture.cs b/tests/RDMG.Core.Tests/TestFixture.cs index dfd1c36..60b4cdd 100644 --- a/tests/RDMG.Core.Tests/TestFixture.cs +++ b/tests/RDMG.Core.Tests/TestFixture.cs @@ -1,7 +1,6 @@ using RDMG.Core.Abstractions.Generator; using RDMG.Core.Abstractions.Repository; using RDMG.Core.Abstractions.Services; -using System; namespace RDMG.Core.Tests;