升级net9.0；升级NetHandlerContext，支持ProxyProtocol之后直接设置Remote。

NewLifeX · Nov 17, 2024 · 28c6b6f · 28c6b6f
1 parent 3018d99
commit 28c6b6f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+    - uses: actions/checkout@v4
+    - name: Setup dotNET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.x
     - name: Build
       run: |
         dotnet pack --version-suffix $(date "+%Y.%m%d-beta%H%M") -c Release -o out NewLife.MQTT/NewLife.MQTT.csproj

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,9 +13,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup dotNET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.x
+        dotnet-version: 9.x
     - name: Build
       run: |
         dotnet pack -c Release -o out NewLife.MQTT/NewLife.MQTT.csproj

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,9 +15,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup dotNET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.x
+        dotnet-version: 9.x
     - name: Build
       run: |
         dotnet build -c Release

diff --git a/NewLife.MQTT/ProxyProtocol/ProxyCodec.cs b/NewLife.MQTT/ProxyProtocol/ProxyCodec.cs
@@ -16,7 +16,7 @@ public class ProxyCodec : Handler
     /// <returns></returns>
     public override Object? Read(IHandlerContext context, Object message)
     {
-        if (message is IPacket pk && context is NetHandlerContext ctx && ctx.Data is ReceivedEventArgs e)
+        if (message is IPacket pk && context is NetHandlerContext ctx)
         {
             var data = pk.GetSpan();
             if (ProxyMessage.FastValidHeader(data))
@@ -30,7 +30,7 @@ public class ProxyCodec : Handler
                         ext["Proxy"] = msg;
 
                         // 修改远程地址
-                        e.Remote = msg.GetClient().EndPoint;
+                        ctx.Remote = msg.GetClient().EndPoint;
                     }
 
                     message = pk.Slice(rs);
@@ -50,7 +50,7 @@ public class ProxyCodec : Handler
                         ext["Proxy"] = msg;
 
                         // 修改远程地址
-                        e.Remote = msg.Client!.EndPoint;
+                        ctx.Remote = msg.Client!.EndPoint;
                     }
 
                     message = pk.Slice(rs);

diff --git a/NewLife.MqttServer/NewLife.MqttServer.csproj b/NewLife.MqttServer/NewLife.MqttServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyName>MqttServer</AssemblyName>
     <Namespace>NewLife.MQTTServer</Namespace>
     <AssemblyTitle>新生命MQTT服务器</AssemblyTitle>
@@ -16,13 +16,13 @@
     <AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
     <Deterministic>false</Deterministic>
     <OutputPath>..\Bin\Server</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NewLife.Core" Version="11.0.2024.1115" />
-    <PackageReference Include="NewLife.Stardust" Version="3.2.2024.1113" />
+    <PackageReference Include="NewLife.Stardust" Version="3.2.2024.1117" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2022 NewLife</Copyright>
     <VersionPrefix>1.0</VersionPrefix>

diff --git a/XUnitTestClient/XUnitTestClient.csproj b/XUnitTestClient/XUnitTestClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputPath>..\Bin\UnitTest</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <IsPackable>false</IsPackable>