.NET 8.0

Olgasn · Aug 26, 2024 · 375c815 · 375c815
1 parent 29ecbb8
commit 375c815
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 41 deletions.
diff --git a/FuelStation.Persistence/DbInitializer.cs b/FuelStation.Persistence/DbInitializer.cs
@@ -29,8 +29,8 @@ public static void Initialize(FuelStationDbContext context)
             Random randObj = new(1);
 
             //Заполнение таблицы емкостей
-            string[] tank_voc = { "Цистерна_", "Ведро_", "Бак_", "Фляга_", "Цистерна_" };//словарь названий емкостей
-            string[] material_voc = { "Сталь", "Платина", "Алюминий", "ПЭТ", "Чугун", "Алюминий", "Сталь" };//словарь названий видов топлива
+            string[] tank_voc = ["Цистерна_", "Ведро_", "Бак_", "Фляга_", "Цистерна_"];//словарь названий емкостей
+            string[] material_voc = ["Сталь", "Платина", "Алюминий", "ПЭТ", "Чугун", "Алюминий", "Сталь"];//словарь названий видов топлива
             int count_tank_voc = tank_voc.GetLength(0);
             int count_material_voc = material_voc.GetLength(0);
             for (int tankId = 1; tankId <= tanks_number; tankId++)
@@ -46,7 +46,7 @@ public static void Initialize(FuelStationDbContext context)
             context.SaveChanges();
 
             //Заполнение таблицы видов топлива
-            string[] fuel_voc = { "Нефть_", "Бензин_", "Керосин_", "Мазут_", "Спирт_" };
+            string[] fuel_voc = ["Нефть_", "Бензин_", "Керосин_", "Мазут_", "Спирт_"];
             int count_fuel_voc = fuel_voc.GetLength(0);
             for (int fuelId = 1; fuelId <= fuels_number; fuelId++)
             {

diff --git a/FuelStation.Persistence/DependencyInjection.cs b/FuelStation.Persistence/DependencyInjection.cs
@@ -10,7 +10,7 @@ public static class DependencyInjection
         public static IServiceCollection AddPersistence(this IServiceCollection
             services, IConfiguration configuration)
         {
-            string connectionString = configuration["DbConnection"];
+            string connectionString = configuration["DbConnection"] ?? "";
             services.AddDbContext<FuelStationDbContext>(options =>
             {
                 options.UseSqlite(connectionString);

diff --git a/FuelStation.Persistence/FuelStation.Persistence.csproj b/FuelStation.Persistence/FuelStation.Persistence.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FuelStation.Persistence/FuelStationDbContext.cs b/FuelStation.Persistence/FuelStationDbContext.cs
@@ -5,16 +5,11 @@
 
 namespace FuelStation.Persistence
 {
-    public class FuelStationDbContext : DbContext, IFuelStationDbContext
+    public class FuelStationDbContext(DbContextOptions<FuelStationDbContext> options) : DbContext(options), IFuelStationDbContext
     {
         public DbSet<Fuel> Fuels { get; set; } = null!;
         public DbSet<Tank> Tanks { get; set; } = null!;
         public DbSet<Operation> Operations { get; set; } = null!;
-        public FuelStationDbContext(DbContextOptions<FuelStationDbContext> options) : base(options)
-        {
-
-
-        }
 
         protected override void OnModelCreating(ModelBuilder builder)
         {

diff --git a/FuelStation.Tests/Common/FuelStationContextFactory.cs b/FuelStation.Tests/Common/FuelStationContextFactory.cs
@@ -32,8 +32,8 @@ public static FuelStationDbContext Create()
             Random randObj = new(1);
 
             //Заполнение таблицы емкостей
-            string[] tankDictionary = { "Цистерна_", "Ведро_", "Бак_", "Фляга_", "Цистерна_" };//словарь названий емкостей
-            string[] materialDictionary = { "Сталь", "Платина", "Алюминий", "ПЭТ", "Чугун", "Алюминий", "Сталь" };//словарь названий видов топлива
+            string[] tankDictionary = ["Цистерна_", "Ведро_", "Бак_", "Фляга_", "Цистерна_"];//словарь названий емкостей
+            string[] materialDictionary = ["Сталь", "Платина", "Алюминий", "ПЭТ", "Чугун", "Алюминий", "Сталь"];//словарь названий видов топлива
             int count_tankDictionary = tankDictionary.GetLength(0);
             int count_materialDictionary = materialDictionary.GetLength(0);
             for (int tankId = 1; tankId <= tanksNumber - 1; tankId++)
@@ -70,7 +70,7 @@ public static FuelStationDbContext Create()
             context.SaveChanges();
 
             //Заполнение таблицы видов топлива
-            string[] fuelDictionary = { "Нефть_", "Бензин_", "Керосин_", "Мазут_", "Спирт_" };
+            string[] fuelDictionary = ["Нефть_", "Бензин_", "Керосин_", "Мазут_", "Спирт_"];
             int count_fuelDictionary = fuelDictionary.GetLength(0);
             for (int fuelId = 1; fuelId <= fuelsNumber - 1; fuelId++)
             {

diff --git a/FuelStation.Tests/FuelStation.Tests.csproj b/FuelStation.Tests/FuelStation.Tests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
-	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
 	  <PackageReference Include="Shouldly" Version="4.2.1" />
-	  <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+	  <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/FuelStation.Tests/Tanks/Queries/GetTankListQueryHandlerTests.cs b/FuelStation.Tests/Tanks/Queries/GetTankListQueryHandlerTests.cs
@@ -7,16 +7,10 @@
 namespace FuelStation.Tests.Tanks.Queries
 {
     [Collection("QueryCollection")]
-    public class GetTankListQueryHandlerTests
+    public class GetTankListQueryHandlerTests(QueryTestFixture fixture)
     {
-        private readonly FuelStationDbContext Context;
-        private readonly IMapper Mapper;
-
-        public GetTankListQueryHandlerTests(QueryTestFixture fixture)
-        {
-            Context = fixture.Context;
-            Mapper = fixture.Mapper;
-        }
+        private readonly FuelStationDbContext Context = fixture.Context;
+        private readonly IMapper Mapper = fixture.Mapper;
 
         [Fact]
         public async Task GetTankListQueryHandler_Success()

diff --git a/FuelStation.Web/FuelStation.Web.csproj b/FuelStation.Web/FuelStation.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
-	  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+	  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FuelStationApplication/FuelStation.Application.csproj b/FuelStationApplication/FuelStation.Application.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
-    <PackageReference Include="FluentValidation" Version="11.7.1" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.7.1" />
-    <PackageReference Include="MediatR" Version="12.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="FluentValidation" Version="11.9.2" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
+    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FuelStationDomain/FuelStation.Domain.csproj b/FuelStationDomain/FuelStation.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>