Add changes to make it work on .NET 8 RC 2

krompaco · Oct 19, 2023 · c45b1b6 · c45b1b6
1 parent fea4e92
commit c45b1b6
Show file tree

Hide file tree

Showing 31 changed files with 52 additions and 89 deletions.
diff --git a/src/Krompaco.RecordCollector.Content/Krompaco.RecordCollector.Content.csproj b/src/Krompaco.RecordCollector.Content/Krompaco.RecordCollector.Content.csproj
@@ -15,19 +15,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23364.2">
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0-2.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23472.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.7.23375.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-rc.2.23479.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="8.0.0-preview.7.23375.6" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0-rc.2.23479.6" />
     <PackageReference Include="Tomlyn" Version="0.16.2" />
-    <PackageReference Include="YamlDotNet" Version="13.3.1" />
+    <PackageReference Include="YamlDotNet" Version="13.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Krompaco.RecordCollector.Generator/Krompaco.RecordCollector.Generator.csproj b/src/Krompaco.RecordCollector.Generator/Krompaco.RecordCollector.Generator.csproj
@@ -8,14 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23364.2">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23472.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.7.23375.9" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.2.23480.2" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Krompaco.RecordCollector.Generator/Workers.cs b/src/Krompaco.RecordCollector.Generator/Workers.cs
@@ -1,19 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Krompaco.RecordCollector.Content.IO;
 using Krompaco.RecordCollector.Content.Languages;
 using Krompaco.RecordCollector.Content.Models;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 using Xunit.Abstractions;

diff --git a/...cordCollector.Web/Shared/SingleData.razor → ...r.Web/Components/Content/SingleData.razor b/...cordCollector.Web/Shared/SingleData.razor → ...r.Web/Components/Content/SingleData.razor
diff --git a/...cordCollector.Web/Shared/MainLayout.razor → ...or.Web/Components/Layout/MainLayout.razor b/...cordCollector.Web/Shared/MainLayout.razor → ...or.Web/Components/Layout/MainLayout.razor
diff --git a/...RecordCollector.Web/Shared/MenuItem.razor → ....Web/Components/Navigation/MenuItem.razor b/...RecordCollector.Web/Shared/MenuItem.razor → ....Web/Components/Navigation/MenuItem.razor
diff --git a/...cordCollector.Web/Shared/Pagination.razor → ...eb/Components/Navigation/Pagination.razor b/...cordCollector.Web/Shared/Pagination.razor → ...eb/Components/Navigation/Pagination.razor
diff --git a/...ordCollector.Web/Pages/ListTemplate.razor → ...r.Web/Components/Pages/ListTemplate.razor b/...ordCollector.Web/Pages/ListTemplate.razor → ...r.Web/Components/Pages/ListTemplate.razor
diff --git a/...dCollector.Web/Pages/SingleTemplate.razor → ...Web/Components/Pages/SingleTemplate.razor b/...dCollector.Web/Pages/SingleTemplate.razor → ...Web/Components/Pages/SingleTemplate.razor
diff --git a/...ompaco.RecordCollector.Web/_Imports.razor → ...rdCollector.Web/Components/_Imports.razor b/...ompaco.RecordCollector.Web/_Imports.razor → ...rdCollector.Web/Components/_Imports.razor
@@ -3,7 +3,10 @@
 @using Krompaco.RecordCollector.Content.Models;
 @using Krompaco.RecordCollector.Web.Extensions
 @using Krompaco.RecordCollector.Web.Models
-@using Krompaco.RecordCollector.Web.Shared
+@using Krompaco.RecordCollector.Web.Components
+@using Krompaco.RecordCollector.Web.Components.Content
+@using Krompaco.RecordCollector.Web.Components.Layout
+@using Krompaco.RecordCollector.Web.Components.Navigation
 @using Markdig;
 @using Microsoft.Extensions.Caching.Distributed
 @using Microsoft.AspNetCore.Authorization

diff --git a/src/Krompaco.RecordCollector.Web/Controllers/ContentController.cs b/src/Krompaco.RecordCollector.Web/Controllers/ContentController.cs
@@ -6,12 +6,13 @@
 using Krompaco.RecordCollector.Content.IO;
 using Krompaco.RecordCollector.Content.Languages;
 using Krompaco.RecordCollector.Content.Models;
+using Krompaco.RecordCollector.Web.Components.Pages;
 using Krompaco.RecordCollector.Web.Extensions;
 using Krompaco.RecordCollector.Web.ModelBuilders;
 using Krompaco.RecordCollector.Web.Models;
-using Krompaco.RecordCollector.Web.Pages;
 using Krompaco.RecordCollector.Web.Resources;
-using Microsoft.AspNetCore.Components.Endpoints;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.StaticFiles;
@@ -140,6 +141,14 @@ public IResult Properties()
     [HttpGet]
     public IResult Files(string? path)
     {
+        // Hack to avoid error in large pages (?) with .NET 8 RC 1
+        var syncIOFeature = this.HttpContext.Features.Get<IHttpBodyControlFeature>();
+
+        if (syncIOFeature != null)
+        {
+            syncIOFeature.AllowSynchronousIO = true;
+        }
+
         var siteUrl = this.config.GetAppSettingsSiteUrl();
         var rqf = this.Request.HttpContext.Features.Get<IRequestCultureFeature>();
         this.currentCulture = rqf?.RequestCulture.Culture ?? CultureInfo.CurrentCulture;

diff --git a/src/Krompaco.RecordCollector.Web/Extensions/HtmlTableWithWrapperExtension.cs b/src/Krompaco.RecordCollector.Web/Extensions/HtmlTableWithWrapperExtension.cs
@@ -1,6 +1,5 @@
 using Markdig;
 using Markdig.Extensions.Tables;
-using Markdig.Parsers;
 using Markdig.Renderers;
 
 namespace Krompaco.RecordCollector.Web.Extensions;

diff --git a/src/Krompaco.RecordCollector.Web/Extensions/HtmlTableWithWrapperRenderer.cs b/src/Krompaco.RecordCollector.Web/Extensions/HtmlTableWithWrapperRenderer.cs
@@ -1,5 +1,4 @@
-using System;
-using Markdig.Extensions.Tables;
+using Markdig.Extensions.Tables;
 using Markdig.Renderers;
 
 namespace Krompaco.RecordCollector.Web.Extensions;

diff --git a/src/Krompaco.RecordCollector.Web/Extensions/StringExtensions.cs b/src/Krompaco.RecordCollector.Web/Extensions/StringExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Globalization;
-using System.Linq;
+using System.Globalization;
 
 namespace Krompaco.RecordCollector.Web.Extensions;
 

diff --git a/src/Krompaco.RecordCollector.Web/Krompaco.RecordCollector.Web.csproj b/src/Krompaco.RecordCollector.Web/Krompaco.RecordCollector.Web.csproj
@@ -16,17 +16,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.52" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
     <PackageReference Include="Markdig.Signed" Version="0.33.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23364.2">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23472.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0-preview.7.23375.6" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0-rc.2.23479.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Krompaco.RecordCollector.Web/ModelBuilders/PaginationViewModelBuilder.cs b/src/Krompaco.RecordCollector.Web/ModelBuilders/PaginationViewModelBuilder.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using Krompaco.RecordCollector.Web.Models;
 

diff --git a/src/Krompaco.RecordCollector.Web/Models/CategoryItemViewModel.cs b/src/Krompaco.RecordCollector.Web/Models/CategoryItemViewModel.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Krompaco.RecordCollector.Web.Models;
+namespace Krompaco.RecordCollector.Web.Models;
 
 public class CategoryItemViewModel
 {

diff --git a/src/Krompaco.RecordCollector.Web/Models/LayoutViewModel.cs b/src/Krompaco.RecordCollector.Web/Models/LayoutViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Globalization;
 using Krompaco.RecordCollector.Content.Models;
 using Markdig;

diff --git a/src/Krompaco.RecordCollector.Web/Models/ListPageViewModel.cs b/src/Krompaco.RecordCollector.Web/Models/ListPageViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Krompaco.RecordCollector.Content.Models;
+using Krompaco.RecordCollector.Content.Models;
 
 namespace Krompaco.RecordCollector.Web.Models;
 

diff --git a/src/Krompaco.RecordCollector.Web/Models/PaginationItemViewModel.cs b/src/Krompaco.RecordCollector.Web/Models/PaginationItemViewModel.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Krompaco.RecordCollector.Web.Models;
+namespace Krompaco.RecordCollector.Web.Models;
 
 public class PaginationItemViewModel
 {

diff --git a/src/Krompaco.RecordCollector.Web/Models/PaginationViewModel.cs b/src/Krompaco.RecordCollector.Web/Models/PaginationViewModel.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Krompaco.RecordCollector.Web.Models;
+namespace Krompaco.RecordCollector.Web.Models;
 
 public class PaginationViewModel
 {

diff --git a/src/Krompaco.RecordCollector.Web/Models/SinglePageViewModel.cs b/src/Krompaco.RecordCollector.Web/Models/SinglePageViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Krompaco.RecordCollector.Content.Models;
+using Krompaco.RecordCollector.Content.Models;
 
 namespace Krompaco.RecordCollector.Web.Models;
 

diff --git a/src/Krompaco.RecordCollector.Web/Program.cs b/src/Krompaco.RecordCollector.Web/Program.cs
@@ -133,7 +133,7 @@
     pattern: "rc-content-properties",
     defaults: new { controller = "Content", action = "Properties" });
 
-// This is the catch all action used to serve the correct content or static file
+// This is the catch all action used to serve the correct content, image or document
 app.MapControllerRoute(
     name: "files",
     pattern: "{**path}",

diff --git a/src/Krompaco.RecordCollector.Web/SiteRequestCultureProvider.cs b/src/Krompaco.RecordCollector.Web/SiteRequestCultureProvider.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Globalization;
 using Krompaco.RecordCollector.Content.IO;
 using Krompaco.RecordCollector.Content.Languages;
 using Krompaco.RecordCollector.Web.Extensions;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Krompaco.RecordCollector.Web;

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/Converters/StringToStream.cs b/tests/Krompaco.RecordCollector.Content.Tests/Converters/StringToStream.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace Krompaco.RecordCollector.Content.Tests.Converters;
+namespace Krompaco.RecordCollector.Content.Tests.Converters;
 
 public class StringToStreamConverter
 {

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/JsonTests.cs b/tests/Krompaco.RecordCollector.Content.Tests/JsonTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Krompaco.RecordCollector.Content.FrontMatterParsers;
+using Krompaco.RecordCollector.Content.FrontMatterParsers;
 using Krompaco.RecordCollector.Content.Models;
 using Xunit;
 

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/Krompaco.RecordCollector.Content.Tests.csproj b/tests/Krompaco.RecordCollector.Content.Tests/Krompaco.RecordCollector.Content.Tests.csproj
@@ -8,15 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.7.23375.9" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.7.23375.9" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23364.2">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.2.23480.2" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-rc.2.23480.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23472.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/SummaryExtractorTests.cs b/tests/Krompaco.RecordCollector.Content.Tests/SummaryExtractorTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Krompaco.RecordCollector.Content.FrontMatterParsers;
+using Krompaco.RecordCollector.Content.FrontMatterParsers;
 using Krompaco.RecordCollector.Content.Models;
 using Krompaco.RecordCollector.Content.Tests.Converters;
 using Xunit;

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/TomlTests.cs b/tests/Krompaco.RecordCollector.Content.Tests/TomlTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Krompaco.RecordCollector.Content.FrontMatterParsers;
+using Krompaco.RecordCollector.Content.FrontMatterParsers;
 using Krompaco.RecordCollector.Content.Models;
 using Xunit;
 

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/TypeDetectorTests.cs b/tests/Krompaco.RecordCollector.Content.Tests/TypeDetectorTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Krompaco.RecordCollector.Content.FrontMatterParsers;
+using Krompaco.RecordCollector.Content.FrontMatterParsers;
 using Krompaco.RecordCollector.Content.Models;
 using Krompaco.RecordCollector.Content.Tests.Converters;
 using Xunit;

diff --git a/tests/Krompaco.RecordCollector.Content.Tests/YamlTests.cs b/tests/Krompaco.RecordCollector.Content.Tests/YamlTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Krompaco.RecordCollector.Content.FrontMatterParsers;
+using Krompaco.RecordCollector.Content.FrontMatterParsers;
 using Krompaco.RecordCollector.Content.Models;
 using Xunit;