升级.NET10

src/Masuit.MyBlogs.Core/Controllers/DashboardController.cs

@@ -87,7 +87,6 @@ public sealed class DashboardController(IWebHostEnvironment env) : AdminControll
             }
         }
 
-        Response.Body.Close();
         return Ok();
     }
 

src/Masuit.MyBlogs.Core/Controllers/DefaultController.cs

@@ -54,7 +54,6 @@ public sealed class DefaultController(IRedisClient redis) : Controller
             }
         }
         await redis.SRemAsync("GlobalOnline", ip);
-        Response.Body.Close();
         return Ok();
     }
 }

src/Masuit.MyBlogs.Core/Controllers/MsgController.cs

@@ -388,7 +388,6 @@ public sealed class MsgController : BaseController
             }
         }
 
-        Response.Body.Close();
         return Ok();
     }
 

src/Masuit.MyBlogs.Core/Controllers/PostController.cs

@@ -545,7 +545,7 @@ public sealed class PostController : BaseController
                 await Response.Body.FlushAsync(HttpContext.RequestAborted);
                 await Task.Delay(5000, HttpContext.RequestAborted);
             }
-            catch (OperationCanceledException e)
+            catch (OperationCanceledException)
             {
                 await RedisHelper.SRemAsync(key, ClientIP.ToString());
                 break;
@@ -553,7 +553,7 @@ public sealed class PostController : BaseController
         }
 
         await RedisHelper.SRemAsync(key, ClientIP.ToString());
-        Response.Body.Close();
+
         return Ok();
     }
 
@@ -1215,7 +1215,7 @@ public sealed class PostController : BaseController
         }
 
         Response.Body.Close();
-        return Ok();
+        return new EmptyResult();
     }
 
     /// <summary>

src/Masuit.MyBlogs.Core/Extensions/MiddlewareExtension.cs

@@ -24,7 +24,9 @@ public static class MiddlewareExtension
         {
             options.ReturnHttpNotAcceptable = true;
             options.Filters.Add<ExceptionFilter>();
+#if DEBUG
             options.Filters.Add<PerfCounterFilterAttribute>();
+#endif
         }).AddNewtonsoftJson(options =>
         {
             options.SerializerSettings.ContractResolver = new DefaultContractResolver();

src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ServerGarbageCollection>false</ServerGarbageCollection>
         <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
         <TieredPGO>true</TieredPGO>
@@ -45,29 +45,27 @@
         <PackageReference Include="CHTCHSConv" Version="1.0.0" />
         <PackageReference Include="CLRStats" Version="1.0.0" />
         <PackageReference Include="Dispose.Scope.AspNetCore" Version="0.0.3" />
-        <PackageReference Include="EFCoreSecondLevelCacheInterceptor" Version="5.3.3" />
+        <PackageReference Include="EFCoreSecondLevelCacheInterceptor" Version="5.3.4" />
         <PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
-        <PackageReference Include="FreeRedis" Version="1.5.0" />
-        <PackageReference Include="Hangfire" Version="1.8.21" />
+        <PackageReference Include="FreeRedis" Version="1.5.2" />
+        <PackageReference Include="Hangfire" Version="1.8.22" />
         <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.2" />
         <PackageReference Include="Karambolo.AspNetCore.Bundling.NUglify" Version="3.9.1" />
         <PackageReference Include="Mammoth.Core" Version="1.0.1" />
         <PackageReference Include="Markdig" Version="0.43.0" />
-        <PackageReference Include="MaxMind.GeoIP2" Version="5.3.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.10" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.10" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.10" />
+        <PackageReference Include="MaxMind.GeoIP2" Version="5.4.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
         <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
         <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
         <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.5.4" />
         <PackageReference Include="PanGu.HighLight" Version="1.0.0" />
         <PackageReference Include="Riok.Mapperly" Version="4.3.0" />
         <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.9" />
-        <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.7.0" />
         <PackageReference Include="System.Text.Encodings.Web" Version="9.0.10" />
-        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
         <PackageReference Include="TimeZoneConverter" Version="7.2.0" />
         <PackageReference Include="WilderMinds.RssSyndication" Version="1.7.1" />
         <PackageReference Include="Yarp.ReverseProxy" Version="2.3.0" />

src/Masuit.MyBlogs.Core/PrepareStartup.cs

@@ -142,7 +142,7 @@ namespace Masuit.MyBlogs.Core
                 options.ForwardLimit = null;
                 options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
                 options.ForwardedForHeaderName = AppConfig.TrueClientIPHeader;
-                options.KnownNetworks.Clear();
+                options.KnownIPNetworks.Clear();
                 options.KnownProxies.Clear();
             });
             services.Configure<StaticFileOptions>(options =>

src/Masuit.MyBlogs.Core/Properties/PublishProfiles/FolderProfile.pubxml

@@ -12,7 +12,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <ExcludeApp_Data>false</ExcludeApp_Data>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ProjectGuid>2f8270e4-5e57-4ce4-ab5f-8008f9fc8c7c</ProjectGuid>
     <SelfContained>false</SelfContained>
     <publishUrl>bin\Release\publish\</publishUrl>

src/Masuit.MyBlogs.Core/Views/Msg/Index.cshtml

@@ -51,7 +51,7 @@
     <n-pagination :page-count="Math.ceil(pageConfig.total / pageConfig.size)" :page-sizes="[10, 20, 30, 50]" show-size-picker v-model:page="pageConfig.page" v-model:page-size="pageConfig.size"/>
   </div>
   <n-modal :mask-closable="false" :title="`回复：${reply.for?.NickName}`" @@positive-click="submit(reply)" negative-text="取消回复" positive-text="回复留言" preset="dialog" style="width:70vw;min-width:400px" v-model:show="showPopup">
-    <div class="comment-item">
+    <div class="comment-item" style="max-height: 50vh;overflow-y: scroll;">
       <div class="comment-meta-row">
         <div>
           <span class="comment-author">{{reply.for?.NickName}}</span>

src/Masuit.MyBlogs.Core/Views/Msg/Index_Admin.cshtml

@@ -29,7 +29,7 @@
     <n-pagination :page-count="Math.ceil(pageConfig.total / pageConfig.size)" :page-sizes="[10, 20, 30, 50]" show-size-picker v-model:page="pageConfig.page" v-model:page-size="pageConfig.size"/>
   </div>
   <n-modal :mask-closable="false" :title="`回复：${reply.for?.NickName}`" @@positive-click="submit(reply)" negative-text="取消回复" positive-text="回复留言" preset="dialog" style="width:70vw;min-width:400px" v-model:show="showPopup">
-    <div class="comment-item">
+    <div class="comment-item" style="max-height: 50vh;overflow-y: scroll;">
       <div class="comment-meta-row">
         <div>
           <span class="comment-author">{{reply.for?.NickName}}</span>

src/Masuit.MyBlogs.Core/Views/Post/Details.cshtml

@@ -245,7 +245,7 @@
     </section>
   </div>
   <n-modal :mask-closable="false" :title="`回复：${reply.for?.NickName}`" @@positive-click="submit(reply)" negative-text="取消回复" positive-text="回复评论" preset="dialog" style="width:70vw;min-width:400px" v-model:show="showPopup">
-    <div class="comment-item">
+    <div class="comment-item" style="max-height: 50vh;overflow-y: scroll;">
       <div class="comment-meta-row">
         <div>
           <span class="comment-author">{{reply.for?.NickName}}</span>

src/Masuit.MyBlogs.Core/Views/Post/Details_Admin.cshtml

@@ -249,7 +249,7 @@
     </section>
   </div>
   <n-modal :mask-closable="false" :title="`回复：${reply.for?.NickName}`" @@positive-click="submit(reply)" negative-text="取消回复" positive-text="回复评论" preset="dialog" style="width:70vw;min-width:400px" v-model:show="showPopup">
-    <div class="comment-item">
+    <div class="comment-item" style="max-height: 50vh;overflow-y: scroll;">
       <div class="comment-meta-row">
         <div>
           <span class="comment-author">{{reply.for?.NickName}}</span>

src/Masuit.MyBlogs.Core/wwwroot/Content/common/reset.css

@@ -147,4 +147,10 @@ iframe {
 img {
   max-width: 100%;
   height: auto;
+}
+
+pre {
+  white-space: break-spaces;
+  word-wrap: break-word;
+  word-break: break-all;
 }