From cdf7dc97124915495928f13ecb8d16a80a932bfb Mon Sep 17 00:00:00 2001
From: Sergey Karmanov <ppoocpel8888@gmail.com>
Date: Fri, 21 Jun 2024 08:32:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=83=D1=8F=D0=B7=D0=B2=D0=B8=D0=BC=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Features/DevFeature/ServicesExtensions.cs        |  4 ++--
 .../HackathonPreparing.ApiService.csproj             |  5 ++++-
 .../HackathonPreparing.ServiceDefaults.csproj        | 12 ++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs b/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs
index c52bde9..110b3fc 100644
--- a/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs
+++ b/HackathonPreparing/HackathonPreparing.ApiService/Features/DevFeature/ServicesExtensions.cs
@@ -7,8 +7,8 @@ public static class ServicesExtensions
 
     public static void AddDbContextWithDefaultConfiguration<TDbContext>(this WebApplicationBuilder builder) where TDbContext : DbContext
     {
-        builder.AddNpgsqlDbContext<TDbContext>("prod", null,
-        optionsBuilder => optionsBuilder.UseNpgsql(npgsqlBuilder =>
+        builder.Services.AddDbContext<TDbContext>(
+        optionsBuilder => optionsBuilder.UseNpgsql("prod", npgsqlBuilder =>
             npgsqlBuilder.MigrationsAssembly(typeof(Program).Assembly.GetName().Name)));
     }
 
diff --git a/HackathonPreparing/HackathonPreparing.ApiService/HackathonPreparing.ApiService.csproj b/HackathonPreparing/HackathonPreparing.ApiService/HackathonPreparing.ApiService.csproj
index 8e5049d..334fd5d 100644
--- a/HackathonPreparing/HackathonPreparing.ApiService/HackathonPreparing.ApiService.csproj
+++ b/HackathonPreparing/HackathonPreparing.ApiService/HackathonPreparing.ApiService.csproj
@@ -12,7 +12,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.1" />
       <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
       <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
       <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
@@ -20,9 +19,13 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
       <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
       <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
       <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
+      <!-- Фикс уязвимых пакетов -->
+      <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+      <PackageReference Include="System.Net.Http" Version="4.3.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/HackathonPreparing/HackathonPreparing.ServiceDefaults/HackathonPreparing.ServiceDefaults.csproj b/HackathonPreparing/HackathonPreparing.ServiceDefaults/HackathonPreparing.ServiceDefaults.csproj
index 0bdf402..d1e4b9a 100644
--- a/HackathonPreparing/HackathonPreparing.ServiceDefaults/HackathonPreparing.ServiceDefaults.csproj
+++ b/HackathonPreparing/HackathonPreparing.ServiceDefaults/HackathonPreparing.ServiceDefaults.csproj
@@ -10,13 +10,13 @@
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App"/>
 
-        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0"/>
+        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.6.0" />
         <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.1"/>
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1"/>
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1"/>
-        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1"/>
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1"/>
-        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0"/>
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
     </ItemGroup>
 
 </Project>