From b25c5756a2f13f84817e897ea0687fd73700f030 Mon Sep 17 00:00:00 2001
From: ilitirit <ilitirit@gmail.com>
Date: Sat, 6 Jul 2024 15:00:44 +0200
Subject: [PATCH] Upgrade plugin

---
 Expedience.Api/Expedience.Api.csproj               | 13 ++++++-------
 .../Expedience.Infrastructure.csproj               | 11 +++++++----
 Expedience.Models/Expedience.Models.csproj         |  2 +-
 Expedience.Web/Expedience.Web.csproj               |  4 ++--
 Expedience.Web/Pages/_DutyTable.cshtml             |  2 +-
 Expedience.sln                                     | 14 ++------------
 6 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/Expedience.Api/Expedience.Api.csproj b/Expedience.Api/Expedience.Api.csproj
index 4816cdf..b48e096 100644
--- a/Expedience.Api/Expedience.Api.csproj
+++ b/Expedience.Api/Expedience.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -17,12 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
-    <PackageReference Include="MassTransit.RabbitMQ" Version="8.0.14" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="MassTransit.RabbitMQ" Version="8.2.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Expedience.Infrastructure/Expedience.Infrastructure.csproj b/Expedience.Infrastructure/Expedience.Infrastructure.csproj
index ec8a6bf..47f4a68 100644
--- a/Expedience.Infrastructure/Expedience.Infrastructure.csproj
+++ b/Expedience.Infrastructure/Expedience.Infrastructure.csproj
@@ -1,14 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EnyimMemcachedCore" Version="2.6.4" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
-  </ItemGroup>
+    <PackageReference Include="EnyimMemcachedCore" Version="3.2.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
+   </ItemGroup>
 
 </Project>
diff --git a/Expedience.Models/Expedience.Models.csproj b/Expedience.Models/Expedience.Models.csproj
index cfadb03..30402ac 100644
--- a/Expedience.Models/Expedience.Models.csproj
+++ b/Expedience.Models/Expedience.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Expedience.Web/Expedience.Web.csproj b/Expedience.Web/Expedience.Web.csproj
index ae59c19..7a05f1f 100644
--- a/Expedience.Web/Expedience.Web.csproj
+++ b/Expedience.Web/Expedience.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>8f64764f-0760-4b08-a74e-38815cf81f2f</UserSecretsId>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Expedience.Web/Pages/_DutyTable.cshtml b/Expedience.Web/Pages/_DutyTable.cshtml
index 3807c79..16985d8 100644
--- a/Expedience.Web/Pages/_DutyTable.cshtml
+++ b/Expedience.Web/Pages/_DutyTable.cshtml
@@ -29,7 +29,7 @@
 		{
 			<tr>
 				<td>@record.Level</td>
-				<td>@record.ContentName</td>
+				<td><a href="./@record.TerritoryId">@record.ContentName</a></td>
 				<td>@record.MinNormal.Format()</td>
 				<td>@record.AvgNormal.Format()</td>
 				<td>@record.MinSolo.Format()</td>
diff --git a/Expedience.sln b/Expedience.sln
index 484f388..be432d5 100644
--- a/Expedience.sln
+++ b/Expedience.sln
@@ -9,11 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Expedience.Api", "Expedienc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Expedience.Models", "Expedience.Models\Expedience.Models.csproj", "{1775D9CD-9FD3-4433-8D0A-C405EA8D7E46}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{04E95950-527E-46BC-9A4D-08587AA1B7DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Expedience.Web", "Expedience.Web\Expedience.Web.csproj", "{F0C4E623-C9D0-470A-A7CE-423D84261C82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Expedience.Web", "Expedience.Web\Expedience.Web.csproj", "{F0C4E623-C9D0-470A-A7CE-423D84261C82}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Expedience.Infrastructure", "Expedience.Infrastructure\Expedience.Infrastructure.csproj", "{22193E16-7B41-44A7-8A40-523963CF2963}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Expedience.Infrastructure", "Expedience.Infrastructure\Expedience.Infrastructure.csproj", "{22193E16-7B41-44A7-8A40-523963CF2963}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,14 +45,6 @@ Global
 		{1775D9CD-9FD3-4433-8D0A-C405EA8D7E46}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1775D9CD-9FD3-4433-8D0A-C405EA8D7E46}.Release|x64.ActiveCfg = Release|Any CPU
 		{1775D9CD-9FD3-4433-8D0A-C405EA8D7E46}.Release|x64.Build.0 = Release|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Debug|x64.Build.0 = Debug|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Release|x64.ActiveCfg = Release|Any CPU
-		{04E95950-527E-46BC-9A4D-08587AA1B7DA}.Release|x64.Build.0 = Release|Any CPU
 		{F0C4E623-C9D0-470A-A7CE-423D84261C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F0C4E623-C9D0-470A-A7CE-423D84261C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0C4E623-C9D0-470A-A7CE-423D84261C82}.Debug|x64.ActiveCfg = Debug|Any CPU