From bb8467c48c13bfb782e4af7c665197db6692c57c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Wed, 13 Nov 2024 14:04:23 +0800 Subject: [PATCH] v3.2.2024.1113 --- .github/workflows/publish-beta.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- .github/workflows/test.yml | 6 +++--- Demo/Demo.csproj | 2 +- .../NewLife.Remoting.Extensions.csproj | 4 ++-- .../Properties/launchSettings.json | 12 ++++++++++++ NewLife.Remoting/NewLife.Remoting.csproj | 4 ++-- Readme.MD | 2 +- Samples/IoTZero/IoTZero.csproj | 2 +- Samples/Zero.RpcServer/Zero.RpcServer.csproj | 2 +- Samples/ZeroServer/ZeroServer.csproj | 2 +- Test/Test.csproj | 4 ++-- XUnitTest/XUnitTest.csproj | 6 +++--- 13 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 NewLife.Remoting.Extensions/Properties/launchSettings.json diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index 8005e86..d1c6e68 100644 --- a/.github/workflows/publish-beta.yml +++ b/.github/workflows/publish-beta.yml @@ -20,9 +20,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup dotNET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.x - name: Get Version run: echo "VERSION=$(date '+%Y.%m%d-beta%H%M')" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c27880f..7520d61 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,9 +12,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup dotNET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.x - name: Get Version run: echo "VERSION=$(date '+%Y.%m%d')" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc25054..51b145a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup dotNET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.x - name: Build run: | dotnet build -c Release diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj index 0ab3a45..92da9af 100644 --- a/Demo/Demo.csproj +++ b/Demo/Demo.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/NewLife.Remoting.Extensions/NewLife.Remoting.Extensions.csproj b/NewLife.Remoting.Extensions/NewLife.Remoting.Extensions.csproj index 8d15064..910f014 100644 --- a/NewLife.Remoting.Extensions/NewLife.Remoting.Extensions.csproj +++ b/NewLife.Remoting.Extensions/NewLife.Remoting.Extensions.csproj @@ -2,12 +2,12 @@ Library - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 协议通信扩展库 提供WebApi应用级服务端 新生命开发团队 ©2002-2024 NewLife - 3.0 + 3.2 $([System.DateTime]::Now.ToString(`yyyy.MMdd`)) $(VersionPrefix).$(VersionSuffix) $(Version) diff --git a/NewLife.Remoting.Extensions/Properties/launchSettings.json b/NewLife.Remoting.Extensions/Properties/launchSettings.json new file mode 100644 index 0000000..05c1bb6 --- /dev/null +++ b/NewLife.Remoting.Extensions/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "NewLife.Remoting.Extensions": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:59975;http://localhost:59976" + } + } +} \ No newline at end of file diff --git a/NewLife.Remoting/NewLife.Remoting.csproj b/NewLife.Remoting/NewLife.Remoting.csproj index 1e71fc0..584d5cd 100644 --- a/NewLife.Remoting/NewLife.Remoting.csproj +++ b/NewLife.Remoting/NewLife.Remoting.csproj @@ -5,7 +5,7 @@ 提供高性能RPC客户端服务端，提供Http/WebSocket客户端服务端，提供应用级客户端 新生命开发团队 ©2002-2024 新生命开发团队 - 3.1 + 3.2 $([System.DateTime]::Now.ToString(`yyyy.MMdd`)) $(VersionPrefix).$(VersionSuffix) $(Version) @@ -52,7 +52,7 @@ - + diff --git a/Readme.MD b/Readme.MD index 90e6617..585c4e5 100644 --- a/Readme.MD +++ b/Readme.MD @@ -81,7 +81,7 @@ Nuget：NewLife.Remoting / NewLife.Remoting.Extensions ## 新生命项目矩阵 -各项目默认支持net8.0/net7.0/netstandard2.1/netstandard2.0/net4.5，旧版（2022.1225）支持net4.5/net4.0/net2.0 +各项目默认支持net9.0/netstandard2.1/netstandard2.0/net4.5，旧版（2022.1225）支持net4.5/net4.0/net2.0 | 项目 | 年份 | 说明 | | :--------------------------------------------------------------: | :---: | -------------------------------------------------------------------------------------- | diff --git a/Samples/IoTZero/IoTZero.csproj b/Samples/IoTZero/IoTZero.csproj index c10de6f..8c083b3 100644 --- a/Samples/IoTZero/IoTZero.csproj +++ b/Samples/IoTZero/IoTZero.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 物联网服务平台 IoT服务平台 新生命开发团队 diff --git a/Samples/Zero.RpcServer/Zero.RpcServer.csproj b/Samples/Zero.RpcServer/Zero.RpcServer.csproj index 5cb0720..664f3a9 100644 --- a/Samples/Zero.RpcServer/Zero.RpcServer.csproj +++ b/Samples/Zero.RpcServer/Zero.RpcServer.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 RPC服务端 高性能，长连接，数据接口 新生命开发团队 diff --git a/Samples/ZeroServer/ZeroServer.csproj b/Samples/ZeroServer/ZeroServer.csproj index 8d18823..974131f 100644 --- a/Samples/ZeroServer/ZeroServer.csproj +++ b/Samples/ZeroServer/ZeroServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 零代服务平台 CS架构服务端平台 新生命开发团队 diff --git a/Test/Test.csproj b/Test/Test.csproj index edb06c2..19d9669 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 ..\Bin\Test false enable @@ -10,7 +10,7 @@ - + diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj index 1a1aced..b207b01 100644 --- a/XUnitTest/XUnitTest.csproj +++ b/XUnitTest/XUnitTest.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 ..\Bin\UnitTest True ..\Doc\newlife.snk @@ -9,10 +9,10 @@ - + - +