From d1505974d32e7257b2185acafef3e08e96b34395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E8=87=AA=E9=BE=99?= Date: Mon, 20 Nov 2023 10:55:59 +0800 Subject: [PATCH] .net8.0 --- .github/workflows/publish-beta.yml | 2 +- .github/workflows/test.yml | 2 +- NewLife.RocketMQ/MqBase.cs | 2 +- Readme.MD | 2 +- Test/Test.csproj | 2 +- XUnitTestRocketMQ/XUnitTestRocketMQ.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index 2160fdc..1ec6e47 100644 --- a/.github/workflows/publish-beta.yml +++ b/.github/workflows/publish-beta.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Restore run: | dotnet restore NewLife.RocketMQ/NewLife.RocketMQ.csproj diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d00ba75..4a5f041 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Build run: | dotnet build -c Release diff --git a/NewLife.RocketMQ/MqBase.cs b/NewLife.RocketMQ/MqBase.cs index d7b4549..761bbca 100644 --- a/NewLife.RocketMQ/MqBase.cs +++ b/NewLife.RocketMQ/MqBase.cs @@ -177,7 +177,7 @@ public virtual Boolean Start() var addr = Aliyun?.Server; if (!addr.IsNullOrEmpty() && addr.StartsWithIgnoreCase("http")) { - var http = new HttpClient(); + var http = new System.Net.Http.HttpClient(); var html = http.GetStringAsync(addr).Result; if (!html.IsNullOrWhiteSpace()) NameServerAddress = html.Trim(); diff --git a/Readme.MD b/Readme.MD index 96806b1..d16d8d4 100644 --- a/Readme.MD +++ b/Readme.MD @@ -11,7 +11,7 @@ RocketMQ,支持`.Net Framework/.netstandard/Mono`。 教程:[https://newlifex.com/core/rocketmq](https://newlifex.com/core/rocketmq) ## 新生命项目矩阵 -各项目默认支持net7.0/netstandard2.1/netstandard2.0/net4.61/net4.5,旧版(2023.0401)支持net4.0/net2.0 +各项目默认支持net8.0/net7.0/netstandard2.1/netstandard2.0/net4.61/net4.5,旧版(2023.0401)支持net4.0/net2.0 | 项目 | 年份 | 说明 | | :--------------------------------------------------------------: | :---: | -------------------------------------------------------------------------------------- | diff --git a/Test/Test.csproj b/Test/Test.csproj index b3bef9f..05ed216 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 ..\Bin\Test diff --git a/XUnitTestRocketMQ/XUnitTestRocketMQ.csproj b/XUnitTestRocketMQ/XUnitTestRocketMQ.csproj index 486ccb5..ca4addb 100644 --- a/XUnitTestRocketMQ/XUnitTestRocketMQ.csproj +++ b/XUnitTestRocketMQ/XUnitTestRocketMQ.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 ..\Bin\UnitTest false