Updated to .NET 6.0

pmachapman · Nov 10, 2021 · adb39b3 · adb39b3
1 parent 1bf0f9b
commit adb39b3
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 245 deletions.
diff --git a/GoToBible.Engine/GoToBible.Engine.csproj b/GoToBible.Engine/GoToBible.Engine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>GoToBible.Engine.snk</AssemblyOriginatorKeyFile>
     <Nullable>enable</Nullable>

diff --git a/GoToBible.Engine/Renderer.cs b/GoToBible.Engine/Renderer.cs
@@ -209,7 +209,7 @@ public async Task<RenderedPassage> RenderAsync(RenderingParameters parameters, b
                     for (int i = 0; i < lines1.Count; i++)
                     {
                         int expectedVerseNumber = i + 1;
-                        if (int.TryParse(lines1[i].Substring(0, lines1[i].IndexOf(' ')), out int verseNumber) && verseNumber > expectedVerseNumber)
+                        if (int.TryParse(lines1[i].AsSpan(0, lines1[i].IndexOf(' ')), out int verseNumber) && verseNumber > expectedVerseNumber)
                         {
                             lines1.Insert(i, $"{expectedVerseNumber}  ");
                         }
@@ -218,7 +218,7 @@ public async Task<RenderedPassage> RenderAsync(RenderingParameters parameters, b
                     for (int i = 0; i < lines2.Count; i++)
                     {
                         int expectedVerseNumber = i + 1;
-                        if (int.TryParse(lines2[i].Substring(0, lines2[i].IndexOf(' ')), out int verseNumber) && verseNumber > expectedVerseNumber)
+                        if (int.TryParse(lines2[i].AsSpan(0, lines2[i].IndexOf(' ')), out int verseNumber) && verseNumber > expectedVerseNumber)
                         {
                             lines2.Insert(i, $"{expectedVerseNumber}  ");
                         }
@@ -227,15 +227,15 @@ public async Task<RenderedPassage> RenderAsync(RenderingParameters parameters, b
                     // Add a superscription, if missing
                     if (lines1.Count > lines2.Count
                         && lines2.Count > 0
-                        && int.TryParse(lines2[0].Substring(0, lines2[0].IndexOf(' ')), out int _)
-                        && !int.TryParse(lines1[0].Substring(0, lines1[0].IndexOf(' ')), out int _))
+                        && int.TryParse(lines2[0].AsSpan(0, lines2[0].IndexOf(' ')), out int _)
+                        && !int.TryParse(lines1[0].AsSpan(0, lines1[0].IndexOf(' ')), out int _))
                     {
                         lines2.Insert(0, string.Empty);
                     }
                     else if (lines2.Count > lines1.Count
                         && lines1.Count > 0
-                        && int.TryParse(lines1[0].Substring(0, lines1[0].IndexOf(' ')), out int _)
-                        && !int.TryParse(lines2[0].Substring(0, lines2[0].IndexOf(' ')), out int _))
+                        && int.TryParse(lines1[0].AsSpan(0, lines1[0].IndexOf(' ')), out int _)
+                        && !int.TryParse(lines2[0].AsSpan(0, lines2[0].IndexOf(' ')), out int _))
                     {
                         lines1.Insert(0, string.Empty);
                     }

diff --git a/GoToBible.Model/ChapterReference.cs b/GoToBible.Model/ChapterReference.cs
@@ -56,7 +56,7 @@ public ChapterReference(string bookAndChapter)
                 {
                     this.Book = bookAndChapter[..lastSpaceIndex];
                     string chapter = bookAndChapter[(lastSpaceIndex + 1)..];
-                    if (chapter.Contains(":", StringComparison.OrdinalIgnoreCase))
+                    if (chapter.Contains(':'))
                     {
                         chapter = chapter[..chapter.IndexOf(":", StringComparison.OrdinalIgnoreCase)];
                     }

diff --git a/GoToBible.Model/ExtensionMethods.cs b/GoToBible.Model/ExtensionMethods.cs
@@ -293,7 +293,7 @@ public static PassageReference AsPassageReference(this string passage, int defau
                                 sb.Append('-');
                                 continue;
                             }
-                            else if (displayRange.Contains(":", StringComparison.OrdinalIgnoreCase))
+                            else if (displayRange.Contains(':'))
                             {
                                 string[] displayRangeParts = displayRange.Split(":", StringSplitOptions.RemoveEmptyEntries);
                                 if (int.TryParse(displayRangeParts.First(), out int displayRangeChapter) && displayRangeChapter == chapter)
@@ -657,7 +657,7 @@ internal static string NormaliseCommas(this string rangePart)
         internal static string NormaliseSingleChapterReference(this string passage)
         {
             string[] semiParts = passage.Split(';');
-            if (!semiParts[0].Contains(":"))
+            if (!semiParts[0].Contains(':'))
             {
                 Regex numberStartRegex = new Regex(@"[\w\s]\d", RegexOptions.Compiled);
                 int numberStart = numberStartRegex.Match(semiParts[0]).Index + 1;

diff --git a/GoToBible.Model/GoToBible.Model.csproj b/GoToBible.Model/GoToBible.Model.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>GoToBible.Model.snk</AssemblyOriginatorKeyFile>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
@@ -27,16 +27,16 @@
     <ApplicationIcon>App.ico</ApplicationIcon>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <PackageReleaseNotes>Bug fixes for one chapter books</PackageReleaseNotes>
-    <Version>1.1.8</Version>
+    <PackageReleaseNotes>.NET 6.0 support</PackageReleaseNotes>
+    <Version>1.1.9</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\GoToBible.Model.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\README.md" Pack="true" PackagePath="\"/>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
     <None Include="App.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>

diff --git a/GoToBible.Providers/GoToBible.Providers.csproj b/GoToBible.Providers/GoToBible.Providers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>GoToBible.Providers.snk</AssemblyOriginatorKeyFile>
     <Nullable>enable</Nullable>
@@ -46,9 +46,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/GoToBible.Tests.Model/GoToBible.Tests.Model.csproj b/GoToBible.Tests.Model/GoToBible.Tests.Model.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -10,6 +10,8 @@
     <AssemblyOriginatorKeyFile>GoToBible.Tests.Model.snk</AssemblyOriginatorKeyFile>
 
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
+
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/GoToBible.Web/Client/GoToBible.Web.Client.csproj b/GoToBible.Web/Client/GoToBible.Web.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <Nullable>enable</Nullable>
     <SignAssembly>true</SignAssembly>
@@ -29,13 +29,13 @@
 
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.11" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/GoToBible.Web/Server/Controllers/RenderPassageController.cs b/GoToBible.Web/Server/Controllers/RenderPassageController.cs
@@ -107,7 +107,12 @@ public async Task<IActionResult> Post(RenderingParameters parameters, bool rende
                 // Log the URL, with details to help us debug
                 RequestHeaders header = this.Request.GetTypedHeaders();
                 string renderingParameters = JsonSerializer.Serialize(parameters);
-                this.logger.LogError(ex, $"URL: {this.Request.GetDisplayUrl()}{Environment.NewLine}Referer: {header.Referer}{Environment.NewLine}RenderingParameters: {renderingParameters}");
+                this.logger.LogError(
+                    ex,
+                    "URL: {DisplayUrl}\r\nReferer: {Referer}\r\nRenderingParameters: {RenderingParameters}",
+                    this.Request.GetDisplayUrl(),
+                    header.Referer,
+                    renderingParameters);
                 return this.Problem();
             }
         }

diff --git a/GoToBible.Web/Server/GoToBible.Web.Server.csproj b/GoToBible.Web/Server/GoToBible.Web.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <StartupObject>GoToBible.Web.Server.Program</StartupObject>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <SignAssembly>true</SignAssembly>
@@ -23,11 +23,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="5.0.1" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
     <PackageReference Include="Pomelo.Extensions.Caching.MySql" Version="2.1.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>

diff --git a/GoToBible.Web/Server/Pages/Error.cshtml.cs b/GoToBible.Web/Server/Pages/Error.cshtml.cs
@@ -58,7 +58,7 @@ public ErrorModel(ILogger<ErrorModel> logger)
         public void OnGet()
         {
             this.RequestId = Activity.Current?.Id ?? this.HttpContext.TraceIdentifier;
-            this.logger.LogError($"Error in Request #{this.RequestId}");
+            this.logger.LogError("Error in Request #{RequestId}", this.RequestId);
         }
     }
 }
diff --git a/GoToBible.Windows.Designer/GoToBible.Windows.Designer.csproj b/GoToBible.Windows.Designer/GoToBible.Windows.Designer.csproj
diff --git a/GoToBible.Windows.Designer/Properties/AssemblyInfo.cs b/GoToBible.Windows.Designer/Properties/AssemblyInfo.cs