From 29de3d0bfeb166df6c4d69e38e920af451827275 Mon Sep 17 00:00:00 2001
From: Denis Prokhorchik <live-dev@hotmail.com>
Date: Sun, 30 Oct 2022 23:20:00 +0300
Subject: [PATCH 1/2] feat(issue-474): upgrade .net core to 6.0 of auth service

---
 .../O2NextGen.Auth.Web.csproj                 | 19 +++++++++----------
 ...IntegrationTests.O2NextGen.Auth.Web.csproj |  6 +-----
 .../Tests.O2NextGen.Auth.Web.csproj           | 14 +++++---------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
index dc363832..c874a75b 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
+++ b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
     <DockerComposeProjectPath>../../../docker-compose.dcproj</DockerComposeProjectPath>
     <UserSecretsId>adca6dac-ab6b-4a1a-b8c4-03f600c16f45</UserSecretsId>
@@ -12,23 +12,22 @@
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'O2NextGen.Auth' " />
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1">
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1">
     </PackageReference>
-    <PackageReference Include="Serilog.Settings.Configuration" Version="2.2.0">
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0">
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0">
     </PackageReference>
-    <PackageReference Include="Serilog.Sinks.Console" Version="2.1.0">
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0">
     </PackageReference>
-    <PackageReference Include="Serilog.Sinks.File" Version="2.2.0">
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0">
     </PackageReference>
-    <PackageReference Include="SkiaSharp.QrCode" Version="0.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Resources\Pages\Account\Register.en.resx">
diff --git a/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj b/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj
index 5008fa28..7d2378ce 100644
--- a/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj
+++ b/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -18,8 +18,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\O2NextGen.Auth.Web\O2NextGen.Auth.Web.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
index 632f6e8f..a82c0e2e 100644
--- a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
+++ b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
@@ -1,23 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\O2NextGen.Auth.Web\O2NextGen.Auth.Web.csproj" />
-  </ItemGroup>
-
 </Project>

From 33763af371641684e2d6793b34600336fdc3453d Mon Sep 17 00:00:00 2001
From: Denis Prokharhcyk <live-dev@hotmail.com>
Date: Sun, 30 Oct 2022 23:32:56 +0300
Subject: [PATCH 2/2] feat(issue-474): update auth.web project

---
 .../Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
index a82c0e2e..ee818bad 100644
--- a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
+++ b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
@@ -16,4 +16,7 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.Auth.Web\O2NextGen.Auth.Web.csproj" />
+  </ItemGroup>
 </Project>