From 666d2810b337001896b0771dd3f0059bd8ad3877 Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Fri, 19 Nov 2021 12:26:09 +0330
Subject: [PATCH] #244 upgrading back-end projects to .NET 6

---
 RMuseum/RMuseum.csproj                                        | 3 ++-
 .../GanjoorService-Partials/GanjoorService-Stats.cs           | 4 ++--
 RMuseum/Startup.cs                                            | 2 +-
 RSecurityBackend/RSecurityBackend.csproj                      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RMuseum/RMuseum.csproj b/RMuseum/RMuseum.csproj
index d37628b3..2897da6e 100644
--- a/RMuseum/RMuseum.csproj
+++ b/RMuseum/RMuseum.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <UserSecretsId>c9ed8ad2-c9c8-4d81-91ba-6865a4acbf13</UserSecretsId>
+    <StartupObject>RMuseum.Program</StartupObject>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Stats.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Stats.cs
index c8b250a2..b8b5d0e0 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Stats.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Stats.cs
@@ -69,7 +69,7 @@ namespace RMuseum.Services.Implementation
 
                 htmlText += $"<td class=\"c1\">{(i + 1).ToPersianNumbers()}</td>{Environment.NewLine}";
                 string rhythm = rhythmsCoupletCounts[i].GanjoorMetreId == null ? "وزنیابی نشده" :
-                                $"<a href=\"/vazn/?v={Uri.EscapeUriString(rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm)}&amp;a={poet.Id}\">{rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm}</a>";
+                                $"<a href=\"/vazn/?v={Uri.EscapeDataString(rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm)}&amp;a={poet.Id}\">{rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm}</a>";
                 htmlText += $"<td class=\"c2\">{rhythm}</td>{Environment.NewLine}";
                 htmlText += $"<td class=\"c3\">{LanguageUtils.FormatMoney(rhythmsCoupletCounts[i].Count)}</td>{Environment.NewLine}";
                 htmlText += $"<td class=\"c4\">{(rhythmsCoupletCounts[i].Count * 100.0 / sumRhythmsCouplets).ToString("N2", new CultureInfo("fa-IR")).ToPersianNumbers()}</td>{Environment.NewLine}";
@@ -213,7 +213,7 @@ namespace RMuseum.Services.Implementation
 
                                             htmlText += $"<td class=\"c1\">{(i + 1).ToPersianNumbers()}</td>{Environment.NewLine}";
                                             string rhythm = rhythmsCoupletCounts[i].GanjoorMetreId == null ? "وزنیابی نشده" :
-                                                         $"<a href=\"/vazn/?v={Uri.EscapeUriString(rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm)}\">{rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm}</a>";
+                                                         $"<a href=\"/vazn/?v={Uri.EscapeDataString(rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm)}\">{rhythms.Where(r => r.Id == rhythmsCoupletCounts[i].GanjoorMetreId).Single().Rhythm}</a>";
                                             htmlText += $"<td class=\"c2\">{rhythm}</td>{Environment.NewLine}";
                                             htmlText += $"<td class=\"c3\">{LanguageUtils.FormatMoney(rhythmsCoupletCounts[i].Count)}</td>{Environment.NewLine}";
                                             htmlText += $"<td class=\"c4\">{(rhythmsCoupletCounts[i].Count * 100.0 / sumRhythmsCouplets).ToString("N2", new CultureInfo("fa-IR")).ToPersianNumbers()}</td>{Environment.NewLine}";
diff --git a/RMuseum/Startup.cs b/RMuseum/Startup.cs
index 7da12a8c..595856a5 100644
--- a/RMuseum/Startup.cs
+++ b/RMuseum/Startup.cs
@@ -112,7 +112,7 @@ namespace RMuseum
                     .IncludeHeaders(ctx => !ctx.ModelState.IsValid)
                     .IncludeRequestBody()
                     .IncludeModelState()
-                )).SetCompatibilityVersion(CompatibilityVersion.Latest);
+                ));
 
             services.AddMemoryCache();
 
diff --git a/RSecurityBackend/RSecurityBackend.csproj b/RSecurityBackend/RSecurityBackend.csproj
index 906ce455..b84dcf36 100644
--- a/RSecurityBackend/RSecurityBackend.csproj
+++ b/RSecurityBackend/RSecurityBackend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">