From ff03c4a462459b4523cae744b5c3a58004486355 Mon Sep 17 00:00:00 2001
From: anjoy8 <3143422472@qq.com>
Date: Tue, 17 Jan 2023 17:00:31 +0800
Subject: [PATCH] feat:update to net 7.0
---
Blog.Core.Api/Blog.Core.Api.csproj | 14 ++++-----
Blog.Core.Api/Program.cs | 12 ++------
Blog.Core.Common/Blog.Core.Common.csproj | 20 ++++++-------
Blog.Core.Common/Helper/SM/SM4.cs | 1 -
Blog.Core.EventBus/Blog.Core.EventBus.csproj | 10 +++----
.../Blog.Core.Extensions.csproj | 30 +++++++++----------
.../Middlewares/RequRespLogMiddleware.cs | 1 -
.../ServiceExtensions/HttpRuntimeCache.cs | 3 +-
.../Blog.Core.FrameWork.csproj | 2 +-
Blog.Core.Gateway/Blog.Core.Gateway.csproj | 10 +++----
.../Blog.Core.IServices.csproj | 2 +-
Blog.Core.Model/Blog.Core.Model.csproj | 8 ++---
Blog.Core.Publish.Docker.Jenkins.sh | 2 +-
Blog.Core.Publish.bat | 4 +--
.../Blog.Core.Repository.csproj | 8 ++---
.../Blog.Core.Serilog.Es.csproj | 14 ++++-----
Blog.Core.Services/Blog.Core.Services.csproj | 2 +-
Blog.Core.Tasks/Blog.Core.Tasks.csproj | 4 +--
Blog.Core.Tests/Blog.Core.Tests.csproj | 6 ++--
.../Ocelot.Provider.Nacos.csproj | 12 ++++----
20 files changed, 78 insertions(+), 87 deletions(-)
diff --git a/Blog.Core.Api/Blog.Core.Api.csproj b/Blog.Core.Api/Blog.Core.Api.csproj
index 38575a5..9016c42 100644
--- a/Blog.Core.Api/Blog.Core.Api.csproj
+++ b/Blog.Core.Api/Blog.Core.Api.csproj
@@ -4,7 +4,7 @@
Exe
- net6.0
+ net7.0
enable
Linux
@@ -49,13 +49,13 @@
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/Blog.Core.Api/Program.cs b/Blog.Core.Api/Program.cs
index b3bf238..6f4cf04 100644
--- a/Blog.Core.Api/Program.cs
+++ b/Blog.Core.Api/Program.cs
@@ -13,7 +13,6 @@ using Blog.Core.Filter;
using Blog.Core.Hubs;
using Blog.Core.IServices;
using Blog.Core.Tasks;
-using FluentValidation.AspNetCore;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -170,15 +169,8 @@ app.UseAuthorization();
app.UseMiniProfilerMiddleware();
//app.UseExceptionHandlerMidd();
-app.UseEndpoints(endpoints =>
-{
- endpoints.MapControllerRoute(
- name: "default",
- pattern: "{controller=Home}/{action=Index}/{id?}");
-
- endpoints.MapHub("/api2/chatHub");
-});
-
+app.MapControllers();
+app.MapHub("/api2/chatHub");
var scope = app.Services.GetRequiredService().CreateScope();
var myContext = scope.ServiceProvider.GetRequiredService();
diff --git a/Blog.Core.Common/Blog.Core.Common.csproj b/Blog.Core.Common/Blog.Core.Common.csproj
index 43f65ab..b3d2013 100644
--- a/Blog.Core.Common/Blog.Core.Common.csproj
+++ b/Blog.Core.Common/Blog.Core.Common.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
@@ -16,21 +16,21 @@
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
diff --git a/Blog.Core.Common/Helper/SM/SM4.cs b/Blog.Core.Common/Helper/SM/SM4.cs
index 4b1f199..e098455 100644
--- a/Blog.Core.Common/Helper/SM/SM4.cs
+++ b/Blog.Core.Common/Helper/SM/SM4.cs
@@ -207,7 +207,6 @@ namespace Blog.Core.Common.Helper.SM
int length = input.Length;
SByte[] bins = new SByte[length];
SByte[] bous = new SByte[length];
- SByte[] output = null;
Array.Copy(input, 0, bins, 0, length);
diff --git a/Blog.Core.EventBus/Blog.Core.EventBus.csproj b/Blog.Core.EventBus/Blog.Core.EventBus.csproj
index 070c0a4..bb75b1b 100644
--- a/Blog.Core.EventBus/Blog.Core.EventBus.csproj
+++ b/Blog.Core.EventBus/Blog.Core.EventBus.csproj
@@ -1,20 +1,20 @@
- net6.0
+ net7.0
-
+
-
+
-
+
-
+
diff --git a/Blog.Core.Extensions/Blog.Core.Extensions.csproj b/Blog.Core.Extensions/Blog.Core.Extensions.csproj
index aca15b5..3323fd2 100644
--- a/Blog.Core.Extensions/Blog.Core.Extensions.csproj
+++ b/Blog.Core.Extensions/Blog.Core.Extensions.csproj
@@ -1,35 +1,35 @@
- net6.0
+ net7.0
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
diff --git a/Blog.Core.Extensions/Middlewares/RequRespLogMiddleware.cs b/Blog.Core.Extensions/Middlewares/RequRespLogMiddleware.cs
index 6ff8d04..4c61ed3 100644
--- a/Blog.Core.Extensions/Middlewares/RequRespLogMiddleware.cs
+++ b/Blog.Core.Extensions/Middlewares/RequRespLogMiddleware.cs
@@ -7,7 +7,6 @@ using Blog.Core.Common.LogHelper;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
-using Ubiety.Dns.Core.Common;
namespace Blog.Core.Extensions.Middlewares
{
diff --git a/Blog.Core.Extensions/ServiceExtensions/HttpRuntimeCache.cs b/Blog.Core.Extensions/ServiceExtensions/HttpRuntimeCache.cs
index b9b4d7b..ac7713f 100644
--- a/Blog.Core.Extensions/ServiceExtensions/HttpRuntimeCache.cs
+++ b/Blog.Core.Extensions/ServiceExtensions/HttpRuntimeCache.cs
@@ -38,7 +38,8 @@ namespace Blog.Core.Extensions
public IEnumerable GetAllKey()
{
const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
- var entries = _memoryCache.GetType().GetField("_entries", flags).GetValue(_memoryCache);
+ var coherentState = _memoryCache.GetType().GetField("_coherentState", flags).GetValue(_memoryCache);
+ var entries = coherentState.GetType().GetField("_entries", flags).GetValue(coherentState);
var cacheItems = entries as IDictionary;
var keys = new List();
if (cacheItems == null) return keys;
diff --git a/Blog.Core.FrameWork/Blog.Core.FrameWork.csproj b/Blog.Core.FrameWork/Blog.Core.FrameWork.csproj
index b167521..4f60a46 100644
--- a/Blog.Core.FrameWork/Blog.Core.FrameWork.csproj
+++ b/Blog.Core.FrameWork/Blog.Core.FrameWork.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
diff --git a/Blog.Core.Gateway/Blog.Core.Gateway.csproj b/Blog.Core.Gateway/Blog.Core.Gateway.csproj
index 4739852..819eaa3 100644
--- a/Blog.Core.Gateway/Blog.Core.Gateway.csproj
+++ b/Blog.Core.Gateway/Blog.Core.Gateway.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
@@ -15,13 +15,13 @@
-
-
-
+
+
+
-
+
diff --git a/Blog.Core.IServices/Blog.Core.IServices.csproj b/Blog.Core.IServices/Blog.Core.IServices.csproj
index 820e151..8ccfcc2 100644
--- a/Blog.Core.IServices/Blog.Core.IServices.csproj
+++ b/Blog.Core.IServices/Blog.Core.IServices.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
diff --git a/Blog.Core.Model/Blog.Core.Model.csproj b/Blog.Core.Model/Blog.Core.Model.csproj
index de7e646..120f322 100644
--- a/Blog.Core.Model/Blog.Core.Model.csproj
+++ b/Blog.Core.Model/Blog.Core.Model.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
@@ -16,9 +16,9 @@
-
-
-
+
+
+
diff --git a/Blog.Core.Publish.Docker.Jenkins.sh b/Blog.Core.Publish.Docker.Jenkins.sh
index 3c561c6..d82c2d2 100644
--- a/Blog.Core.Publish.Docker.Jenkins.sh
+++ b/Blog.Core.Publish.Docker.Jenkins.sh
@@ -4,7 +4,7 @@ cd Blog.Core.Api
dotnet publish
echo "Successfully!!!! ^ please see the file ."
-cd bin/Debug/net6.0/publish/
+cd bin/Debug/net7.0/publish/
#rm -f appsettings.json
#\cp -rf /var/jenkins_home/workspace/SecurityConfig/Blog.Core/appsettings.json appsettings.json
diff --git a/Blog.Core.Publish.bat b/Blog.Core.Publish.bat
index f022508..cebbbf5 100644
--- a/Blog.Core.Publish.bat
+++ b/Blog.Core.Publish.bat
@@ -8,11 +8,11 @@ dotnet build
cd Blog.Core.Api
-dotnet publish -o ..\Blog.Core.Api\bin\Debug\net6.0\
+dotnet publish -o ..\Blog.Core.Api\bin\Debug\net7.0\
md ..\.PublishFiles
-xcopy ..\Blog.Core.Api\bin\Debug\net6.0\*.* ..\.PublishFiles\ /s /e
+xcopy ..\Blog.Core.Api\bin\Debug\net7.0\*.* ..\.PublishFiles\ /s /e
echo "Successfully!!!! ^ please see the file .PublishFiles"
diff --git a/Blog.Core.Repository/Blog.Core.Repository.csproj b/Blog.Core.Repository/Blog.Core.Repository.csproj
index 5c9764b..3547007 100644
--- a/Blog.Core.Repository/Blog.Core.Repository.csproj
+++ b/Blog.Core.Repository/Blog.Core.Repository.csproj
@@ -1,14 +1,14 @@
- net6.0
+ net7.0
-
-
-
+
+
+
diff --git a/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj b/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj
index 5cf8202..d98cfaf 100644
--- a/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj
+++ b/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj
@@ -1,17 +1,17 @@
- net6.0
+ net7.0
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Blog.Core.Services/Blog.Core.Services.csproj b/Blog.Core.Services/Blog.Core.Services.csproj
index ae5e969..fbfa7bb 100644
--- a/Blog.Core.Services/Blog.Core.Services.csproj
+++ b/Blog.Core.Services/Blog.Core.Services.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
diff --git a/Blog.Core.Tasks/Blog.Core.Tasks.csproj b/Blog.Core.Tasks/Blog.Core.Tasks.csproj
index 5e17355..968fb79 100644
--- a/Blog.Core.Tasks/Blog.Core.Tasks.csproj
+++ b/Blog.Core.Tasks/Blog.Core.Tasks.csproj
@@ -1,11 +1,11 @@
- net6.0
+ net7.0
-
+
diff --git a/Blog.Core.Tests/Blog.Core.Tests.csproj b/Blog.Core.Tests/Blog.Core.Tests.csproj
index 2ceef16..fd48822 100644
--- a/Blog.Core.Tests/Blog.Core.Tests.csproj
+++ b/Blog.Core.Tests/Blog.Core.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
false
false
@@ -19,8 +19,8 @@
-
-
+
+
all
diff --git a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj b/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
index c713416..23fd3e3 100644
--- a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
+++ b/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
softlgl
softlgl
https://github.com/softlgl/Ocelot.Provider.Nacos
@@ -11,10 +11,10 @@
-
-
-
-
-
+
+
+
+
+