diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 071c4d1..f497a93 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,10 +30,9 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.x - 7.x 8.x 9.x + 10.x - name: Set up JDK 11 uses: actions/setup-java@v4 diff --git a/.github/workflows/Publish packages.yml b/.github/workflows/Publish packages.yml index 1ad1168..07ff038 100644 --- a/.github/workflows/Publish packages.yml +++ b/.github/workflows/Publish packages.yml @@ -20,10 +20,9 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.x - 7.x 8.x 9.x + 10.x - name: Restore dependencies run: dotnet restore diff --git a/Samples/Calculator/Calculator.API/Calculator.API.csproj b/Samples/Calculator/Calculator.API/Calculator.API.csproj index f898263..52602c2 100644 --- a/Samples/Calculator/Calculator.API/Calculator.API.csproj +++ b/Samples/Calculator/Calculator.API/Calculator.API.csproj @@ -1,13 +1,13 @@ - net9.0 + net10.0 enable enable - + diff --git a/Samples/Calculator/Calculator.API/Controllers/V1/TriangleController.cs b/Samples/Calculator/Calculator.API/Controllers/V1/TriangleController.cs index 4ae0e4e..69d91af 100644 --- a/Samples/Calculator/Calculator.API/Controllers/V1/TriangleController.cs +++ b/Samples/Calculator/Calculator.API/Controllers/V1/TriangleController.cs @@ -3,6 +3,7 @@ using Calculator.API.InputModels.V1; using Calculator.API.OutputModels; using Calculator.API.OutputModels.V1; +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; [ApiController, ApiVersion("1.0"), ApiVersion("2.0"), Route("api/v{version:apiVersion}/triangle")] diff --git a/Samples/Calculator/Calculator.API/Controllers/V2/RectangleController.cs b/Samples/Calculator/Calculator.API/Controllers/V2/RectangleController.cs index d0ee78c..35d41b0 100644 --- a/Samples/Calculator/Calculator.API/Controllers/V2/RectangleController.cs +++ b/Samples/Calculator/Calculator.API/Controllers/V2/RectangleController.cs @@ -2,6 +2,7 @@ using Calculator.API.InputModels.V2; using Calculator.API.OutputModels.V1; +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; [ApiController, ApiVersion("2.0"), Route("api/v{version:apiVersion}/rectangle")] diff --git a/Samples/Calculator/Calculator.API/Program.cs b/Samples/Calculator/Calculator.API/Program.cs index fee46fe..b3dbecf 100644 --- a/Samples/Calculator/Calculator.API/Program.cs +++ b/Samples/Calculator/Calculator.API/Program.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Mvc.Versioning; +using Asp.Versioning; var builder = WebApplication.CreateBuilder(args); builder.Services.AddApiVersioning( @@ -13,7 +13,3 @@ app.MapControllers(); app.Run(); - -#pragma warning disable S1118 // This class is needed for API tests -public partial class Program {} -#pragma warning restore S1118 diff --git a/Samples/Calculator/Calculator.CleanTests/Calculator.CleanTests.csproj b/Samples/Calculator/Calculator.CleanTests/Calculator.CleanTests.csproj index fad0f57..d9eabb9 100644 --- a/Samples/Calculator/Calculator.CleanTests/Calculator.CleanTests.csproj +++ b/Samples/Calculator/Calculator.CleanTests/Calculator.CleanTests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable @@ -10,20 +10,20 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Samples/Job Agency/JobAgency.CleanTests/JobAgency.CleanTests.csproj b/Samples/Job Agency/JobAgency.CleanTests/JobAgency.CleanTests.csproj index 496f75f..7ce788b 100644 --- a/Samples/Job Agency/JobAgency.CleanTests/JobAgency.CleanTests.csproj +++ b/Samples/Job Agency/JobAgency.CleanTests/JobAgency.CleanTests.csproj @@ -1,26 +1,26 @@ - net9.0 + net10.0 enable false - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Samples/Job Agency/JobAgency.CleanTests/JobAgencyCleanTest.cs b/Samples/Job Agency/JobAgency.CleanTests/JobAgencyCleanTest.cs index de331d5..4df0695 100644 --- a/Samples/Job Agency/JobAgency.CleanTests/JobAgencyCleanTest.cs +++ b/Samples/Job Agency/JobAgency.CleanTests/JobAgencyCleanTest.cs @@ -19,15 +19,10 @@ [Collection("Job agency clean tests collection")] [WithRequirements(CleanUtilitiesCategories.Database)] -public abstract class JobAgencyCleanTest : CleanTest +public abstract class JobAgencyCleanTest(ITestOutputHelper testOutputHelper) : CleanTest(testOutputHelper) { private int _databaseId; - protected JobAgencyCleanTest(ITestOutputHelper testOutputHelper) - : base(testOutputHelper) - { - } - protected IDatabaseManager DatabaseManager => this.GetGlobalService(); protected IModelBuilder JobAgencyModelBuilder => this.GetService>(); protected IRepository JobAgencyRepository => this.GetService>(); @@ -40,10 +35,10 @@ public override async Task InitializeAsync() this.InitializeGlobalDependenciesProvider(); this._databaseId = await this.DatabaseManager.GetDatabaseIdAsync(this.GetCancellationToken()); - + this.DatabaseManager.SetupEntities(); this.DatabaseManager.RegisterDependencies(this._databaseId, this.LocalDependenciesCollection); - + this.InitializeLocalDependenciesProvider(); } @@ -84,19 +79,19 @@ private static IEqualizer PrepareEqualizer() var equalizationProfileProvider = new DedicatedProfileProvider(); RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); - + // Benefits RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); - + // Requirements RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); RegisterGeneralEqualizationProfile(); - + equalizer.AddProfileProvider(equalizationProfileProvider); return equalizer; diff --git a/Samples/Job Agency/JobAgency.Data/JobAgency.Data.csproj b/Samples/Job Agency/JobAgency.Data/JobAgency.Data.csproj index 541d2dc..d634355 100644 --- a/Samples/Job Agency/JobAgency.Data/JobAgency.Data.csproj +++ b/Samples/Job Agency/JobAgency.Data/JobAgency.Data.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable @@ -10,8 +10,8 @@ - - + + diff --git a/Samples/Job Agency/JobAgency.Models/JobAgency.Models.csproj b/Samples/Job Agency/JobAgency.Models/JobAgency.Models.csproj index bfa5e14..3e1f4ea 100644 --- a/Samples/Job Agency/JobAgency.Models/JobAgency.Models.csproj +++ b/Samples/Job Agency/JobAgency.Models/JobAgency.Models.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable diff --git a/Tests/TryAtSoftware.CleanTests.Benchmark/CombinatorialMachineBenchmark.cs b/Tests/TryAtSoftware.CleanTests.Benchmark/CombinatorialMachineBenchmark.cs index 4384b3f..2909cde 100644 --- a/Tests/TryAtSoftware.CleanTests.Benchmark/CombinatorialMachineBenchmark.cs +++ b/Tests/TryAtSoftware.CleanTests.Benchmark/CombinatorialMachineBenchmark.cs @@ -21,7 +21,7 @@ | GenerateAllCombinations | Setup #8 | 22.56 us | 0.163 us | 0.153 us | | GenerateAllCombinations | Setup #9 | 80.94 us | 0.447 us | 0.396 us | */ -internal class CombinatorialMachineBenchmark +public class CombinatorialMachineBenchmark { private CombinatorialMachine _machine; diff --git a/Tests/TryAtSoftware.CleanTests.Benchmark/ConstructionManagerBenchmark.cs b/Tests/TryAtSoftware.CleanTests.Benchmark/ConstructionManagerBenchmark.cs index 2923984..b770600 100644 --- a/Tests/TryAtSoftware.CleanTests.Benchmark/ConstructionManagerBenchmark.cs +++ b/Tests/TryAtSoftware.CleanTests.Benchmark/ConstructionManagerBenchmark.cs @@ -20,7 +20,7 @@ | BuildConstructionGraphs | Setup #6 | 24.91 us | 0.175 us | 0.164 us | 6.0425 | 0.1221 | - | 49.47 KB | */ [MemoryDiagnoser] -internal class ConstructionManagerBenchmark +public class ConstructionManagerBenchmark { private CleanTestAssemblyData _assemblyData; diff --git a/Tests/TryAtSoftware.CleanTests.Benchmark/TryAtSoftware.CleanTests.Benchmark.csproj b/Tests/TryAtSoftware.CleanTests.Benchmark/TryAtSoftware.CleanTests.Benchmark.csproj index 84f392a..4361697 100644 --- a/Tests/TryAtSoftware.CleanTests.Benchmark/TryAtSoftware.CleanTests.Benchmark.csproj +++ b/Tests/TryAtSoftware.CleanTests.Benchmark/TryAtSoftware.CleanTests.Benchmark.csproj @@ -1,12 +1,12 @@ - net9.0 + net10.0 Exe - + diff --git a/Tests/TryAtSoftware.CleanTests.UnitTests/TryAtSoftware.CleanTests.UnitTests.csproj b/Tests/TryAtSoftware.CleanTests.UnitTests/TryAtSoftware.CleanTests.UnitTests.csproj index 0199507..8c1abb4 100644 --- a/Tests/TryAtSoftware.CleanTests.UnitTests/TryAtSoftware.CleanTests.UnitTests.csproj +++ b/Tests/TryAtSoftware.CleanTests.UnitTests/TryAtSoftware.CleanTests.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 latest enable enable @@ -14,28 +14,24 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - diff --git a/TryAtSoftware.CleanTests.Core/TryAtSoftware.CleanTests.Core.csproj b/TryAtSoftware.CleanTests.Core/TryAtSoftware.CleanTests.Core.csproj index 6950bbf..8fbaf9e 100644 --- a/TryAtSoftware.CleanTests.Core/TryAtSoftware.CleanTests.Core.csproj +++ b/TryAtSoftware.CleanTests.Core/TryAtSoftware.CleanTests.Core.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 latest enable false @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -34,24 +34,16 @@ - - - - - - - - - - - - + + + + diff --git a/TryAtSoftware.CleanTests.Sample.Mathematics/TryAtSoftware.CleanTests.Sample.Mathematics.csproj b/TryAtSoftware.CleanTests.Sample.Mathematics/TryAtSoftware.CleanTests.Sample.Mathematics.csproj index c2bdcba..bac446e 100644 --- a/TryAtSoftware.CleanTests.Sample.Mathematics/TryAtSoftware.CleanTests.Sample.Mathematics.csproj +++ b/TryAtSoftware.CleanTests.Sample.Mathematics/TryAtSoftware.CleanTests.Sample.Mathematics.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net10.0 latest enable diff --git a/TryAtSoftware.CleanTests.Sample/TryAtSoftware.CleanTests.Sample.csproj b/TryAtSoftware.CleanTests.Sample/TryAtSoftware.CleanTests.Sample.csproj index 4b529c1..ee1a83c 100644 --- a/TryAtSoftware.CleanTests.Sample/TryAtSoftware.CleanTests.Sample.csproj +++ b/TryAtSoftware.CleanTests.Sample/TryAtSoftware.CleanTests.Sample.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable @@ -9,17 +9,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all