chore: update dependencies

IntelliTect · Oct 21, 2024 · 752fa93 · 752fa93
1 parent 14806ca
commit 752fa93
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
-		<LangVersion>11.0</LangVersion>
+		<LangVersion>12.0</LangVersion>
 		<Company>IntelliTect</Company>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>

diff --git a/demo/DemoBlazorServer/DemoBlazorServer.csproj b/demo/DemoBlazorServer/DemoBlazorServer.csproj
@@ -1,8 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+	<TargetFrameworks>net8.0</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.0" />
   </ItemGroup>
-
+    
   <ItemGroup>
     <ProjectReference Include="..\..\src\IntelliTect.AspNetCore.SignalR.SqlServer\IntelliTect.AspNetCore.SignalR.SqlServer.csproj" />
   </ItemGroup>

diff --git a/demo/DemoServer/DemoServer.csproj b/demo/DemoServer/DemoServer.csproj
@@ -3,10 +3,11 @@
   <PropertyGroup>
     <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
 	<IsPackable>false</IsPackable>
+	<TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/IntelliTect.AspNetCore.SignalR.SqlServer/IntelliTect.AspNetCore.SignalR.SqlServer.csproj b/src/IntelliTect.AspNetCore.SignalR.SqlServer/IntelliTect.AspNetCore.SignalR.SqlServer.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
 		<!-- Sourcelink: -->
@@ -13,13 +14,8 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 
-		<PackageReference Include="MessagePack" Version="2.3.75" />
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="[3.0.0,)" />
-
-		<PackageReference Include="Nullable" Version="1.3.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
+		<PackageReference Include="MessagePack" Version="2.5.187" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/IntelliTect.AspNetCore.SignalR.SqlServer/Internal/SqlServerProtocol.cs b/src/IntelliTect.AspNetCore.SignalR.SqlServer/Internal/SqlServerProtocol.cs
@@ -133,7 +133,7 @@ private SqlServerInvocation ReadInvocationCore(ref MessagePackReader reader)
                 var ids = new string[idCount];
                 for (var i = 0; i < idCount; i++)
                 {
-                    ids[i] = reader.ReadString();
+                    ids[i] = reader.ReadString()!;
                 }
 
                 excludedConnectionIds = ids;
@@ -152,7 +152,7 @@ public SqlServerTargetedInvocation ReadTargetedInvocation(ReadOnlyMemory<byte> d
             ValidateArraySize(ref reader, 3, "TargetedInvocation");
 
             // Read target
-            var target = reader.ReadString();
+            var target = reader.ReadString()!;
 
             var invocation = ReadInvocationCore(ref reader);
 
@@ -190,7 +190,7 @@ public SqlServerAckMessage ReadAck(ReadOnlyMemory<byte> data)
             // See WriteAck for format
             reader.ReadByte(); // Skip header
             ValidateArraySize(ref reader, 2, "Ack");
-            return new SqlServerAckMessage(reader.ReadInt32(), reader.ReadString());
+            return new SqlServerAckMessage(reader.ReadInt32(), reader.ReadString()!);
         }
 
 
@@ -236,10 +236,10 @@ public SqlServerGroupCommand ReadGroupCommand(ReadOnlyMemory<byte> data)
             ValidateArraySize(ref reader, 5, "GroupCommand");
 
             var id = reader.ReadInt32();
-            var serverName = reader.ReadString();
+            var serverName = reader.ReadString()!;
             var action = (GroupAction)reader.ReadByte();
-            var groupName = reader.ReadString();
-            var connectionId = reader.ReadString();
+            var groupName = reader.ReadString()!;
+            var connectionId = reader.ReadString()!;
 
             return new SqlServerGroupCommand(id, serverName, action, groupName, connectionId);
         }
@@ -270,7 +270,7 @@ public static SerializedHubMessage ReadSerializedHubMessage(ref MessagePackReade
             var serializations = new SerializedMessage[count];
             for (var i = 0; i < count; i++)
             {
-                var protocol = reader.ReadString();
+                var protocol = reader.ReadString()!;
                 var serialized = reader.ReadBytes()?.ToArray() ?? Array.Empty<byte>();
 
                 serializations[i] = new SerializedMessage(protocol, serialized);

diff --git a/....AspNetCore.SignalR.SqlServer.Tests/IntelliTect.AspNetCore.SignalR.SqlServer.Tests.csproj b/....AspNetCore.SignalR.SqlServer.Tests/IntelliTect.AspNetCore.SignalR.SqlServer.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+	<TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.10" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.10" />
+    <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">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/IntelliTect.AspNetCore.SignalR.SqlServer.Tests/SqlServerEndToEndTests.cs b/test/IntelliTect.AspNetCore.SignalR.SqlServer.Tests/SqlServerEndToEndTests.cs
@@ -16,7 +16,7 @@ public class SqlServerEndToEndTests
     {
         private const string databaseName = "SignalRUnitTestsDb";
         private const string connectionString = 
-            "Server=localhost;Database=" + databaseName + ";Trusted_Connection=True;Timeout=5";
+            "Server=localhost;Database=" + databaseName + ";Trusted_Connection=True;Timeout=5;TrustServerCertificate=True";
 
         [SkippableFact]
         public async Task CanSendAndReceivePayloads_WithServiceBroker()