From 1aaed378a17e38a1af7cf97e26311170bd97efa9 Mon Sep 17 00:00:00 2001
From: Ian Cooper <ian.cooper@justeattakeaway.com>
Date: Thu, 28 Nov 2024 21:48:53 +0000
Subject: [PATCH] chore: fix net6 references

---
 .../WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs    | 1 -
 .../SalutationAnalytics/SalutationAnalytics.csproj         | 6 ------
 .../Paramore.Brighter.Extensions.Diagnostics.csproj        | 2 +-
 .../Paramore.Brighter.MessagingGateway.MQTT.csproj         | 2 +-
 .../Paramore.Brighter.MsSql.Dapper.csproj                  | 2 +-
 .../Paramore.Brighter.Outbox.Sqlite.csproj                 | 2 +-
 src/Paramore.Brighter.Outbox.Sqlite/SqliteOutbox.cs        | 2 +-
 .../Paramore.Brighter.Sqlite.csproj                        | 2 +-
 .../Paramore.Brighter.Core.Tests.csproj                    | 2 +-
 .../Paramore.Brighter.MQTT.Tests.csproj                    | 2 +-
 .../Paramore.Brighter.PostgresSQL.Tests.csproj             | 7 -------
 11 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs b/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs
index d0a9995f3a..3ffa60a81c 100644
--- a/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs
+++ b/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs
@@ -16,7 +16,6 @@
 using Paramore.Brighter.Extensions.Diagnostics;
 using Paramore.Brighter.MsSql;
 using Paramore.Brighter.MySql;
-using Paramore.Brighter.Observability;
 using Paramore.Brighter.PostgreSql;
 using Paramore.Brighter.ServiceActivator.Extensions.DependencyInjection;
 using Paramore.Brighter.ServiceActivator.Extensions.Hosting;
diff --git a/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/SalutationAnalytics.csproj b/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/SalutationAnalytics.csproj
index c6bb2647a4..264b4cc002 100644
--- a/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/SalutationAnalytics.csproj
+++ b/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/SalutationAnalytics.csproj
@@ -40,10 +40,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Npgsql">
-      <HintPath>..\..\..\libs\Npgsql\net6.0\Npgsql.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Paramore.Brighter.Extensions.Diagnostics/Paramore.Brighter.Extensions.Diagnostics.csproj b/src/Paramore.Brighter.Extensions.Diagnostics/Paramore.Brighter.Extensions.Diagnostics.csproj
index 05b9e9428a..2f2cc0ab66 100644
--- a/src/Paramore.Brighter.Extensions.Diagnostics/Paramore.Brighter.Extensions.Diagnostics.csproj
+++ b/src/Paramore.Brighter.Extensions.Diagnostics/Paramore.Brighter.Extensions.Diagnostics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Paramore.Brighter.MessagingGateway.MQTT/Paramore.Brighter.MessagingGateway.MQTT.csproj b/src/Paramore.Brighter.MessagingGateway.MQTT/Paramore.Brighter.MessagingGateway.MQTT.csproj
index 67cb0a9802..9b1a7bbb56 100644
--- a/src/Paramore.Brighter.MessagingGateway.MQTT/Paramore.Brighter.MessagingGateway.MQTT.csproj
+++ b/src/Paramore.Brighter.MessagingGateway.MQTT/Paramore.Brighter.MessagingGateway.MQTT.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Provides an implementation of the messaging gateway for decoupled invocation in the Paramore.Brighter pipeline, using MQTT&lt;</Description>
     <Authors>Tim van Wijk</Authors>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
     <PackageTags>MQTT;Command;Event;Service Activator;Decoupled;Invocation;Messaging;Remote;Command Dispatcher;Command Processor;Request;Service;Task Queue;Work Queue;Retry;Circuit Breaker;Availability</PackageTags>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
diff --git a/src/Paramore.Brighter.MsSql.Dapper/Paramore.Brighter.MsSql.Dapper.csproj b/src/Paramore.Brighter.MsSql.Dapper/Paramore.Brighter.MsSql.Dapper.csproj
index c269bf9f53..dd47f670f5 100644
--- a/src/Paramore.Brighter.MsSql.Dapper/Paramore.Brighter.MsSql.Dapper.csproj
+++ b/src/Paramore.Brighter.MsSql.Dapper/Paramore.Brighter.MsSql.Dapper.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
     </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" />
diff --git a/src/Paramore.Brighter.Outbox.Sqlite/Paramore.Brighter.Outbox.Sqlite.csproj b/src/Paramore.Brighter.Outbox.Sqlite/Paramore.Brighter.Outbox.Sqlite.csproj
index 8429acfd0e..2254084588 100644
--- a/src/Paramore.Brighter.Outbox.Sqlite/Paramore.Brighter.Outbox.Sqlite.csproj
+++ b/src/Paramore.Brighter.Outbox.Sqlite/Paramore.Brighter.Outbox.Sqlite.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>This is an implementation of the outbox used for decoupled invocation of commands by Paramore.Brighter, using Sqlite</Description>
     <Authors>Francesco Pighi</Authors>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <PackageTags>RabbitMQ;AMQP;Command;Event;Service Activator;Decoupled;Invocation;Messaging;Remote;Command Dispatcher;Command Processor;Request;Service;Task Queue;Work Queue;Retry;Circuit Breaker;Availability</PackageTags>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Paramore.Brighter.Outbox.Sqlite/SqliteOutbox.cs b/src/Paramore.Brighter.Outbox.Sqlite/SqliteOutbox.cs
index 947fde02e9..9f2c32f65b 100644
--- a/src/Paramore.Brighter.Outbox.Sqlite/SqliteOutbox.cs
+++ b/src/Paramore.Brighter.Outbox.Sqlite/SqliteOutbox.cs
@@ -395,7 +395,7 @@ private byte[] GetBodyAsBytes(DbDataReader dr)
             var i = dr.GetOrdinal("Body");
             var body = dr.GetStream(i);
             var buffer = new byte[body.Length];
-            body.Read(buffer, 0, (int)body.Length);
+            body.ReadExactly(buffer, 0, (int)body.Length);
             return buffer;
         }
 
diff --git a/src/Paramore.Brighter.Sqlite/Paramore.Brighter.Sqlite.csproj b/src/Paramore.Brighter.Sqlite/Paramore.Brighter.Sqlite.csproj
index 5244491a16..c4fabad311 100644
--- a/src/Paramore.Brighter.Sqlite/Paramore.Brighter.Sqlite.csproj
+++ b/src/Paramore.Brighter.Sqlite/Paramore.Brighter.Sqlite.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Authors>Ian Cooper</Authors>
         <PackageTags>RabbitMQ;AMQP;Command;Event;Service Activator;Decoupled;Invocation;Messaging;Remote;Command Dispatcher;Command Processor;Request;Service;Task Queue;Work Queue;Retry;Circuit Breaker;Availability</PackageTags>
-      <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
     </PropertyGroup>
   
      <ItemGroup>
diff --git a/tests/Paramore.Brighter.Core.Tests/Paramore.Brighter.Core.Tests.csproj b/tests/Paramore.Brighter.Core.Tests/Paramore.Brighter.Core.Tests.csproj
index 4e7e7214f8..3815c79100 100644
--- a/tests/Paramore.Brighter.Core.Tests/Paramore.Brighter.Core.Tests.csproj
+++ b/tests/Paramore.Brighter.Core.Tests/Paramore.Brighter.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Paramore.Brighter.Extensions.DependencyInjection\Paramore.Brighter.Extensions.DependencyInjection.csproj" />
diff --git a/tests/Paramore.Brighter.MQTT.Tests/Paramore.Brighter.MQTT.Tests.csproj b/tests/Paramore.Brighter.MQTT.Tests/Paramore.Brighter.MQTT.Tests.csproj
index 3cf98879ad..1acf5b2694 100644
--- a/tests/Paramore.Brighter.MQTT.Tests/Paramore.Brighter.MQTT.Tests.csproj
+++ b/tests/Paramore.Brighter.MQTT.Tests/Paramore.Brighter.MQTT.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/tests/Paramore.Brighter.PostgresSQL.Tests/Paramore.Brighter.PostgresSQL.Tests.csproj b/tests/Paramore.Brighter.PostgresSQL.Tests/Paramore.Brighter.PostgresSQL.Tests.csproj
index f0ef229189..89eb31e481 100644
--- a/tests/Paramore.Brighter.PostgresSQL.Tests/Paramore.Brighter.PostgresSQL.Tests.csproj
+++ b/tests/Paramore.Brighter.PostgresSQL.Tests/Paramore.Brighter.PostgresSQL.Tests.csproj
@@ -26,11 +26,4 @@
       <ProjectReference Include="..\..\src\Paramore.Brighter.Locking.PostgresSql\Paramore.Brighter.Locking.PostgresSql.csproj" />
       <ProjectReference Include="..\..\src\Paramore.Brighter.Outbox.PostgreSql\Paramore.Brighter.Outbox.PostgreSql.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Npgsql">
-        <HintPath>..\..\libs\Npgsql\net6.0\Npgsql.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
 </Project>