diff --git a/.github/workflows/sonarcloud-scan.yml b/.github/workflows/sonarcloud-scan.yml index 20552bdf..2d7e0fed 100644 --- a/.github/workflows/sonarcloud-scan.yml +++ b/.github/workflows/sonarcloud-scan.yml @@ -68,7 +68,7 @@ jobs: run: | .\.sonar\scanner\dotnet-sonarscanner begin /k:"gaepdit_FMS" /o:"gaepdit" /d:sonar.token="$env:SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=coverage.xml /d:sonar.exclusions=FMS.Infrastructure/Migrations/**,FMS/Platform/DevHelpers/SeedData/** dotnet build - coverlet .\artifacts\FMS.Domain.Tests\bin\Debug\net9.0\FMS.Domain.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Domain.Tests --no-build" - coverlet .\artifacts\FMS.App.Tests\bin\Debug\net9.0\FMS.App.Tests.dll --target "dotnet" --targetargs "test tests/FMS.App.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" - coverlet .\artifacts\FMS.Infrastructure.Tests\bin\Debug\net9.0\FMS.Infrastructure.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Infrastructure.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" -f=opencover -o="coverage.xml" + coverlet .\artifacts\FMS.Domain.Tests\bin\Debug\net10.0\FMS.Domain.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Domain.Tests --no-build" + coverlet .\artifacts\FMS.App.Tests\bin\Debug\net10.0\FMS.App.Tests.dll --target "dotnet" --targetargs "test tests/FMS.App.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" + coverlet .\artifacts\FMS.Infrastructure.Tests\bin\Debug\net10.0\FMS.Infrastructure.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Infrastructure.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" -f=opencover -o="coverage.xml" .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="$env:SONAR_TOKEN" diff --git a/.gitignore b/.gitignore index 2f9df388..d3eb1445 100644 --- a/.gitignore +++ b/.gitignore @@ -556,8 +556,8 @@ appsettings.*.json # Webpack **/wwwroot/dist/ -# SonarLint Rider plugin -.idea/**/sonarlint-state.xml +# JetBrains files +.idea/ # Code coverage report from ReportGenerator coveragereport/ diff --git a/.idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 7ad1bf11..00000000 --- a/.idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/dataSources.xml b/.idea/.idea.FMS/.idea/dataSources.xml deleted file mode 100644 index 566869ac..00000000 --- a/.idea/.idea.FMS/.idea/dataSources.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - sqlserver.localdb.jb - true - com.jetbrains.jdbc.sqlserver.SqlServerDriver - Server=(localdb)\MSSQLLocalDB;Database=fms-temp - - - - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/encodings.xml b/.idea/.idea.FMS/.idea/encodings.xml deleted file mode 100644 index df87cf95..00000000 --- a/.idea/.idea.FMS/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/indexLayout.xml b/.idea/.idea.FMS/.idea/indexLayout.xml deleted file mode 100644 index 1ead36c7..00000000 --- a/.idea/.idea.FMS/.idea/indexLayout.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - .github - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 6a354378..00000000 --- a/.idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/projectSettingsUpdater.xml b/.idea/.idea.FMS/.idea/projectSettingsUpdater.xml deleted file mode 100644 index 64af657f..00000000 --- a/.idea/.idea.FMS/.idea/projectSettingsUpdater.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/sonarlint.xml b/.idea/.idea.FMS/.idea/sonarlint.xml deleted file mode 100644 index e4de475c..00000000 --- a/.idea/.idea.FMS/.idea/sonarlint.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/sqldialects.xml b/.idea/.idea.FMS/.idea/sqldialects.xml deleted file mode 100644 index 62c574d9..00000000 --- a/.idea/.idea.FMS/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/vcs.xml b/.idea/.idea.FMS/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/.idea.FMS/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config deleted file mode 100644 index 1bc1c985..00000000 --- a/.idea/config/applicationhost.config +++ /dev/null @@ -1,988 +0,0 @@ - - - - - - -
-
-
-
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 9f1bd96d..ba0920aa 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net9.0/FMS.dll", + "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net10.0/FMS.dll", "args": [], "cwd": "${workspaceFolder}/FMS", "stopAtEntry": false, @@ -35,7 +35,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net9.0/FMS.dll", + "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net10.0/FMS.dll", "args": [], "cwd": "${workspaceFolder}/FMS", "stopAtEntry": false, diff --git a/Directory.Packages.props b/Directory.Packages.props index 22dc0e6a..0f3cf9a9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,36 +4,35 @@ - - + + - + - - - + + - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + \ No newline at end of file diff --git a/FMS.Domain/FMS.Domain.csproj b/FMS.Domain/FMS.Domain.csproj index 14c028e6..bc6c8a7b 100644 --- a/FMS.Domain/FMS.Domain.csproj +++ b/FMS.Domain/FMS.Domain.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/FMS.Infrastructure/Contexts/FmsDbContext.cs b/FMS.Infrastructure/Contexts/FmsDbContext.cs index 7d6bdc31..c0106291 100644 --- a/FMS.Infrastructure/Contexts/FmsDbContext.cs +++ b/FMS.Infrastructure/Contexts/FmsDbContext.cs @@ -112,6 +112,10 @@ protected override void OnModelCreating(ModelBuilder builder) builder.Entity(entityType).Property(AuditProperties.InsertUser); builder.Entity(entityType).Property(AuditProperties.UpdateUser); } + + // Fix missing primary key error + builder.Entity(e => e.HasNoKey()); + } public override Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken()) diff --git a/FMS.Infrastructure/FMS.Infrastructure.csproj b/FMS.Infrastructure/FMS.Infrastructure.csproj index 09fd4955..a3f08e15 100644 --- a/FMS.Infrastructure/FMS.Infrastructure.csproj +++ b/FMS.Infrastructure/FMS.Infrastructure.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 diff --git a/FMS/FMS.csproj b/FMS/FMS.csproj index ca2d1b71..3c74397c 100644 --- a/FMS/FMS.csproj +++ b/FMS/FMS.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FMS FMS.Program 9eaa6ee0-f5de-4484-8e00-194a201392e7 diff --git a/global.json b/global.json index 2d4ad6b7..4372662a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/tests/FMS.App.Tests/Account/AccountIndexTests.cs b/tests/FMS.App.Tests/Account/AccountIndexTests.cs index 9b9119c6..e1354a01 100644 --- a/tests/FMS.App.Tests/Account/AccountIndexTests.cs +++ b/tests/FMS.App.Tests/Account/AccountIndexTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Entities.Users; using FMS.Domain.Services; using FMS.Pages.Account; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs index 0152e1a1..a950f13b 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs index 21f27f7b..64da847b 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs index 499ad2e3..a34c49fd 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs index f97c20f1..c4edaf56 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/tests/FMS.App.Tests/FMS.App.Tests.csproj b/tests/FMS.App.Tests/FMS.App.Tests.csproj index 74ec5e9f..6fe6a48b 100644 --- a/tests/FMS.App.Tests/FMS.App.Tests.csproj +++ b/tests/FMS.App.Tests/FMS.App.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 false diff --git a/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs b/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs index 5715200f..54662152 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs b/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs index 4c50e8d8..28310303 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs b/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs index 00957159..f5d74823 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using FMS.Pages.Facilities; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs b/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs index a797171f..a9b23c98 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs b/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs index 599afa57..ef21c71a 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Files/FilesDetailsTests.cs b/tests/FMS.App.Tests/Files/FilesDetailsTests.cs index 7ca0a851..8f24796b 100644 --- a/tests/FMS.App.Tests/Files/FilesDetailsTests.cs +++ b/tests/FMS.App.Tests/Files/FilesDetailsTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Files; diff --git a/tests/FMS.App.Tests/Files/FilesIndexTests.cs b/tests/FMS.App.Tests/Files/FilesIndexTests.cs index 52d207a3..63f906da 100644 --- a/tests/FMS.App.Tests/Files/FilesIndexTests.cs +++ b/tests/FMS.App.Tests/Files/FilesIndexTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Dto.PaginatedList; using FMS.Domain.Repositories; diff --git a/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs b/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs index e3400d77..7cb3f327 100644 --- a/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs +++ b/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using JetBrains.Annotations; using NUnit.Framework; using FMS.Helpers; diff --git a/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs b/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs index cc29f4db..a6eb2610 100644 --- a/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs +++ b/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using NUnit.Framework; namespace FMS.App.Tests.Helpers diff --git a/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs b/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs index 48217b33..88a54b8c 100644 --- a/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs +++ b/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs @@ -1,5 +1,5 @@ using FMS.Helpers; -using FluentAssertions; +using AwesomeAssertions; using NUnit.Framework; namespace FMS.App.Tests.Helpers diff --git a/tests/FMS.App.Tests/Users/UserDetailsTests.cs b/tests/FMS.App.Tests/Users/UserDetailsTests.cs index 532d7626..4e1a4446 100644 --- a/tests/FMS.App.Tests/Users/UserDetailsTests.cs +++ b/tests/FMS.App.Tests/Users/UserDetailsTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Services; using FMS.Pages.Users; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FMS.App.Tests/Users/UserEditTests.cs b/tests/FMS.App.Tests/Users/UserEditTests.cs index dd1975ed..1e472ec8 100644 --- a/tests/FMS.App.Tests/Users/UserEditTests.cs +++ b/tests/FMS.App.Tests/Users/UserEditTests.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Entities.Users; using FMS.Domain.Services; using FMS.Pages.Users; diff --git a/tests/FMS.App.Tests/Users/UserSearchTests.cs b/tests/FMS.App.Tests/Users/UserSearchTests.cs index 501e54e1..24d6545f 100644 --- a/tests/FMS.App.Tests/Users/UserSearchTests.cs +++ b/tests/FMS.App.Tests/Users/UserSearchTests.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Services; using FMS.Pages.Users; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/tests/FMS.Domain.Tests/CabinetExtensionTests.cs b/tests/FMS.Domain.Tests/CabinetExtensionTests.cs index 217a1f1d..5e9c2442 100644 --- a/tests/FMS.Domain.Tests/CabinetExtensionTests.cs +++ b/tests/FMS.Domain.Tests/CabinetExtensionTests.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Extensions; diff --git a/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj b/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj index 1fcd1eaa..e2458ca2 100644 --- a/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj +++ b/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 false diff --git a/tests/FMS.Domain.Tests/FileTests.cs b/tests/FMS.Domain.Tests/FileTests.cs index d1fc67fa..d672ebe9 100644 --- a/tests/FMS.Domain.Tests/FileTests.cs +++ b/tests/FMS.Domain.Tests/FileTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Entities; using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs index 0fb639a3..1ebd2cd2 100644 --- a/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs index aef91840..547825b8 100644 --- a/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs index c1266653..220e0c4c 100644 --- a/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using TestHelpers; using NUnit.Framework; diff --git a/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs index a1e17f8e..0f953d48 100644 --- a/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs index 47f523ba..b7ed47f1 100644 --- a/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs index 4bffa5a1..ac46b8f3 100644 --- a/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs index 5d7dacec..fe5a3b81 100644 --- a/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; @@ -15,7 +15,7 @@ using FMS.Infrastructure.Contexts; using FMS.Domain.Dto; using FMS.Infrastructure.Repositories; -using FluentAssertions; +using AwesomeAssertions; using NSubstitute; using Microsoft.AspNetCore.Http; diff --git a/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj b/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj index 6b8994ba..7473f253 100644 --- a/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj +++ b/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 false diff --git a/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs index e04f9f96..818e350b 100644 --- a/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using TestHelpers; diff --git a/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs index 028782f1..8afc2221 100644 --- a/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs index 7cded4ad..120a9bbf 100644 --- a/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs index 65e2ee0b..40766010 100644 --- a/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using TestHelpers; using NUnit.Framework; diff --git a/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs index 74d51a9b..906352dd 100644 --- a/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using TestHelpers; using NUnit.Framework; diff --git a/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs index 59c804fa..2f4321cb 100644 --- a/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs index b5a92f4b..148f558f 100644 --- a/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs index a7c8ee43..65cecacd 100644 --- a/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs index 57046675..7e402d5e 100644 --- a/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs index 7fdbdac4..ae3a494b 100644 --- a/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/TestHelpers/TestHelpers.csproj b/tests/TestHelpers/TestHelpers.csproj index e2440519..dddeaa69 100644 --- a/tests/TestHelpers/TestHelpers.csproj +++ b/tests/TestHelpers/TestHelpers.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0