From 7ca3e1ec22dcf3812c2114a502f977264cba1535 Mon Sep 17 00:00:00 2001
From: anjoy8 <3143422472@qq.com>
Date: Wed, 15 Nov 2023 16:15:21 +0800
Subject: [PATCH] feat: update to 8.0
---
.github/workflows/dotnetcore.yml | 2 +-
Blog.Core.Api/Blog.Core.Api.csproj | 8 ++--
Blog.Core.Api/Program.cs | 3 ++
Blog.Core.Common/Blog.Core.Common.csproj | 32 ++++++++--------
Blog.Core.EventBus/Blog.Core.EventBus.csproj | 14 +++----
.../Blog.Core.Extensions.csproj | 38 +++++++++----------
Blog.Core.Gateway/Blog.Core.Gateway.csproj | 12 +++---
Blog.Core.Model/Blog.Core.Model.csproj | 4 +-
.../Blog.Core.Repository.csproj | 8 ++--
.../Blog.Core.Serilog.Es.csproj | 12 +++---
Blog.Core.Serilog/Blog.Core.Serilog.csproj | 2 +-
Blog.Core.Tasks/Blog.Core.Tasks.csproj | 2 +-
Blog.Core.Tests/Blog.Core.Tests.csproj | 8 ++--
Dockerfile | 4 +-
Ocelot.Provider.Nacos/Nacos.cs | 11 +++---
.../Ocelot.Provider.Nacos.csproj | 10 ++---
build/common.targets | 2 +-
17 files changed, 88 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 2dd1ed9..f11fee1 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -12,7 +12,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 7.0.x
+ dotnet-version: 8.0.x
- name: Build with dotnet
run: dotnet build --configuration Release
- name: Build image
diff --git a/Blog.Core.Api/Blog.Core.Api.csproj b/Blog.Core.Api/Blog.Core.Api.csproj
index e022f1a..92a680d 100644
--- a/Blog.Core.Api/Blog.Core.Api.csproj
+++ b/Blog.Core.Api/Blog.Core.Api.csproj
@@ -61,11 +61,11 @@
-
+
-
-
-
+
+
+
diff --git a/Blog.Core.Api/Program.cs b/Blog.Core.Api/Program.cs
index 875b4f2..13d7cea 100644
--- a/Blog.Core.Api/Program.cs
+++ b/Blog.Core.Api/Program.cs
@@ -17,6 +17,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.IdentityModel.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
@@ -130,6 +131,8 @@ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
// 3、配置中间件
var app = builder.Build();
+IdentityModelEventSource.ShowPII = true;
+
app.ConfigureApplication();
app.UseApplicationSetup();
app.UseResponseBodyRead();
diff --git a/Blog.Core.Common/Blog.Core.Common.csproj b/Blog.Core.Common/Blog.Core.Common.csproj
index 457e572..ce966e5 100644
--- a/Blog.Core.Common/Blog.Core.Common.csproj
+++ b/Blog.Core.Common/Blog.Core.Common.csproj
@@ -14,29 +14,29 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/Blog.Core.EventBus/Blog.Core.EventBus.csproj b/Blog.Core.EventBus/Blog.Core.EventBus.csproj
index 8c50f8e..17bebf2 100644
--- a/Blog.Core.EventBus/Blog.Core.EventBus.csproj
+++ b/Blog.Core.EventBus/Blog.Core.EventBus.csproj
@@ -5,15 +5,15 @@
-
-
+
+
-
+
-
-
-
-
+
+
+
+
diff --git a/Blog.Core.Extensions/Blog.Core.Extensions.csproj b/Blog.Core.Extensions/Blog.Core.Extensions.csproj
index a68f7f1..96183e4 100644
--- a/Blog.Core.Extensions/Blog.Core.Extensions.csproj
+++ b/Blog.Core.Extensions/Blog.Core.Extensions.csproj
@@ -5,32 +5,32 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
diff --git a/Blog.Core.Gateway/Blog.Core.Gateway.csproj b/Blog.Core.Gateway/Blog.Core.Gateway.csproj
index ca3a7f7..8af7a7e 100644
--- a/Blog.Core.Gateway/Blog.Core.Gateway.csproj
+++ b/Blog.Core.Gateway/Blog.Core.Gateway.csproj
@@ -13,12 +13,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Blog.Core.Model/Blog.Core.Model.csproj b/Blog.Core.Model/Blog.Core.Model.csproj
index 6762bbc..841a466 100644
--- a/Blog.Core.Model/Blog.Core.Model.csproj
+++ b/Blog.Core.Model/Blog.Core.Model.csproj
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/Blog.Core.Repository/Blog.Core.Repository.csproj b/Blog.Core.Repository/Blog.Core.Repository.csproj
index 45931d9..84b5dfa 100644
--- a/Blog.Core.Repository/Blog.Core.Repository.csproj
+++ b/Blog.Core.Repository/Blog.Core.Repository.csproj
@@ -4,9 +4,9 @@
-
-
-
+
+
+
@@ -19,7 +19,7 @@
-
+
diff --git a/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj b/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj
index cd71cf2..a53e98f 100644
--- a/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj
+++ b/Blog.Core.Serilog.Es/Blog.Core.Serilog.Es.csproj
@@ -4,12 +4,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Blog.Core.Serilog/Blog.Core.Serilog.csproj b/Blog.Core.Serilog/Blog.Core.Serilog.csproj
index 70fe14f..9994dce 100644
--- a/Blog.Core.Serilog/Blog.Core.Serilog.csproj
+++ b/Blog.Core.Serilog/Blog.Core.Serilog.csproj
@@ -3,7 +3,7 @@
-
+
diff --git a/Blog.Core.Tasks/Blog.Core.Tasks.csproj b/Blog.Core.Tasks/Blog.Core.Tasks.csproj
index 3292ff0..abc0d33 100644
--- a/Blog.Core.Tasks/Blog.Core.Tasks.csproj
+++ b/Blog.Core.Tasks/Blog.Core.Tasks.csproj
@@ -3,7 +3,7 @@
-
+
diff --git a/Blog.Core.Tests/Blog.Core.Tests.csproj b/Blog.Core.Tests/Blog.Core.Tests.csproj
index 4db51c4..22c227e 100644
--- a/Blog.Core.Tests/Blog.Core.Tests.csproj
+++ b/Blog.Core.Tests/Blog.Core.Tests.csproj
@@ -18,10 +18,10 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Dockerfile b/Dockerfile
index c80e689..15ba36e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,11 +7,11 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["Blog.Core.Api/Blog.Core.Api.csproj", "Blog.Core.Api/"]
COPY ["Blog.Core.Extensions/Blog.Core.Extensions.csproj", "Blog.Core.Extensions/"]
diff --git a/Ocelot.Provider.Nacos/Nacos.cs b/Ocelot.Provider.Nacos/Nacos.cs
index d835792..b1d4cd4 100644
--- a/Ocelot.Provider.Nacos/Nacos.cs
+++ b/Ocelot.Provider.Nacos/Nacos.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Ocelot.ServiceDiscovery.Providers;
+using Ocelot.ServiceDiscovery.Providers;
using Ocelot.Values;
using Nacos.V2;
using Microsoft.Extensions.Options;
@@ -52,5 +48,10 @@ namespace Ocelot.Provider.Nacos
return await Task.FromResult(services);
}
+
+ public Task> GetAsync()
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj b/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
index 6bdeb84..541ee1e 100644
--- a/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
+++ b/Ocelot.Provider.Nacos/Ocelot.Provider.Nacos.csproj
@@ -11,10 +11,10 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/build/common.targets b/build/common.targets
index 5f03517..eeb3754 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -1,6 +1,6 @@
- net7.0
+ net8.0
enable
\ No newline at end of file