Update to .NET 8 and 9

davidfowl · Nov 18, 2024 · a5a8552 · a5a8552
1 parent a911300
commit a5a8552
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 48 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,16 +8,18 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - uses: aarnott/[email protected]
       with:
         setAllVars: true
 
     - name: Setup .NET Core SDK
-      uses: actions/setup-dotnet@v1.7.2
+      uses: actions/setup-dotnet@v4
       with:
-        version: 3.1.100
+        dotnet-version: |
+          8.0.x
+          9.0.x
      
     - name: dotnet build
       run: dotnet build BedrockFramework.sln -c Release

diff --git a/BedrockFramework.sln b/BedrockFramework.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29112.163
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35410.144 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientApplication", "samples\ClientApplication\ClientApplication.csproj", "{44A257ED-D3A7-4170-BE67-4392F2A6FE18}"
 EndProject
@@ -20,6 +20,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA6E96E9-C7CC-4051-8E3A-28236CE32CFD}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		global.json = global.json
+		nuget.config = nuget.config
+		version.json = version.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bedrock.Framework.Experimental", "src\Bedrock.Framework.Experimental\Bedrock.Framework.Experimental.csproj", "{B77439AE-01C0-4877-AF91-180D521F6E55}"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,9 +12,9 @@
   </PropertyGroup>
   <ItemGroup Condition="$(IsPackable) == 'true'">
     <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>3.3.37</Version>
+      <Version>3.6.146</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "9.0.100"
+  }
+}
diff --git a/samples/ClientApplication/ClientApplication.csproj b/samples/ClientApplication/ClientApplication.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.5" />
-    <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
+    <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.7.1207" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ClientApplication/Program.cs b/samples/ClientApplication/Program.cs
@@ -268,7 +268,7 @@ private static async Task EchoServerWithTls(ServiceProvider serviceProvider)
                                             o.TargetHost = "foo";
                                         };
 
-                                        options.LocalCertificate = new X509Certificate2("testcert.pfx", "testcert");
+                                        options.LocalCertificate = X509CertificateLoader.LoadPkcs12FromFile("testcert.pfx", "testcert");
 
                                         // NOTE: Do not do this in a production environment
                                         options.AllowAnyRemoteCertificate();
@@ -360,7 +360,7 @@ private static async Task DockerDaemon(IServiceProvider serviceProvider)
                         .UseConnectionLogging()
                         .Build();
 
-            await using var connection = await client.ConnectAsync(new NamedPipeEndPoint("docker_engine"));
+            await using var connection = await client.ConnectAsync(new Bedrock.Framework.NamedPipeEndPoint("docker_engine"));
 
             // Use the HTTP/1.1 protocol
             var httpProtocol = new HttpClientProtocol(connection);

diff --git a/samples/ServerApplication/MqttApplication.cs b/samples/ServerApplication/MqttApplication.cs
@@ -1,18 +1,24 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Connections;
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
 namespace ServerApplication
 {
-    public class MqttApplication : MqttConnectionHandler
+    public class MqttApplication : ConnectionHandler
     {
+        private MqttConnectionHandler _mqttHandler = new();
+
         public MqttApplication()
         {
-            ClientHandler = OnClientConnectedAsync;
+            _mqttHandler.ClientHandler = OnClientConnectedAsync;
+        }
+
+        public override async Task OnConnectedAsync(ConnectionContext connection)
+        {
+            await _mqttHandler.OnConnectedAsync(connection);
         }
 
         private async Task OnClientConnectedAsync(IMqttChannelAdapter adapter)
@@ -43,8 +49,7 @@ await adapter.SendPacketAsync(new MqttConnAckPacket
                     case MqttSubscribePacket mqttSubscribePacket:
                         var ack = new MqttSubAckPacket
                         {
-                            PacketIdentifier = mqttSubscribePacket.PacketIdentifier,
-                            ReturnCodes = new List<MqttSubscribeReturnCode> { MqttSubscribeReturnCode.SuccessMaximumQoS0 }
+                            PacketIdentifier = mqttSubscribePacket.PacketIdentifier
                         };
                         ack.ReasonCodes.Add(MqttSubscribeReasonCode.GrantedQoS0);
 

diff --git a/samples/ServerApplication/Program.cs b/samples/ServerApplication/Program.cs
@@ -49,7 +49,7 @@ public static async Task Main(string[] args)
                             sockets.Listen(IPAddress.Loopback, 5004,
                                 builder => builder.UseServerTls(options =>
                                 {
-                                    options.LocalCertificate = new X509Certificate2("testcert.pfx", "testcert");
+                                    options.LocalCertificate = X509CertificateLoader.LoadPkcs12FromFile("testcert.pfx", "testcert");
 
                                     // NOTE: Do not do this in a production environment
                                     options.AllowAnyRemoteCertificate();

diff --git a/samples/ServerApplication/ServerApplication.csproj b/samples/ServerApplication/ServerApplication.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="..\Certs\testcert.pfx" Link="testcert.pfx" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" />
+    <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.7.1207" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Bedrock.Framework.Experimental/Bedrock.Framework.Experimental.csproj b/src/Bedrock.Framework.Experimental/Bedrock.Framework.Experimental.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>Experimental protocols and transports for Bedrock.Framework.</PackageDescription>
     <Authors>David Fowler</Authors>
@@ -18,20 +18,21 @@
   </ItemGroup>
 
   <Choose>
-    <When Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <When Condition="'$(TargetFramework)' == 'net8.0'">
       <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="8.0.11" />
        </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.5"  />
+        <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="9.0.0" />
        </ItemGroup>
     </Otherwise>
   </Choose>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Bedrock.Framework/Bedrock.Framework.csproj b/src/Bedrock.Framework/Bedrock.Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <PackageDescription>High performance, low level networking APIs for building custom severs and clients.</PackageDescription>
     <Authors>David Fowler</Authors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -11,11 +11,21 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
-  </ItemGroup>
+  <Choose>
+  	<When Condition="'$(TargetFramework)' == 'net8.0'">
+  		<ItemGroup>
+			<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
+  		</ItemGroup>
+  	</When>
+  	<Otherwise>
+  		<ItemGroup>
+			<PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
+  		</ItemGroup>
+  	</Otherwise>
+  </Choose>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146" />
   </ItemGroup>
 </Project>
diff --git a/src/Bedrock.Framework/Protocols/WebSockets/WebSocketFrameException.cs b/src/Bedrock.Framework/Protocols/WebSockets/WebSocketFrameException.cs
@@ -16,12 +16,5 @@ public class WebSocketFrameException : Exception
         /// </summary>
         /// <param name="message">The message containing the description of the frame error.</param>
         public WebSocketFrameException(string message) : base(message) { }
-
-        /// <summary>
-        /// Creates an instance of a WebSocketFrameException.
-        /// </summary>
-        /// <param name="info">The info object required to serialize the exception.</param>
-        /// <param name="context">The streaming context required to serialize the exception.</param>
-        protected WebSocketFrameException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
diff --git a/src/Bedrock.Framework/Protocols/WebSockets/WebSocketFrameWriter.cs b/src/Bedrock.Framework/Protocols/WebSockets/WebSocketFrameWriter.cs
@@ -81,7 +81,7 @@ public unsafe void WriteMessage(WebSocketWriteFrame message, IBufferWriter<byte>
                 headerSpan[1] |= 0b1000_0000;
 
                 var maskingKey = message.Header.MaskingKey;               
-                MemoryMarshal.Write(headerSpan.Slice(maskPosition), ref maskingKey);
+                MemoryMarshal.Write(headerSpan.Slice(maskPosition), in maskingKey);
 
                 if (!message.MaskingComplete)
                 {

diff --git a/tests/Bedrock.Framework.Benchmarks/Bedrock.Framework.Benchmarks.csproj b/tests/Bedrock.Framework.Benchmarks/Bedrock.Framework.Benchmarks.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Bedrock.Framework.Tests/Bedrock.Framework.Tests.csproj b/tests/Bedrock.Framework.Tests/Bedrock.Framework.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.1-alpha",
+    "version": "0.2-alpha",
     "nugetPackageVersion": {
         "semVer": 2 
     }