Remove support for net6.0 (npgsql#5947)

Closes npgsql#5946

Author: roji

global.json

@@ -2,6 +2,6 @@
   "sdk": {
     "version": "9.0.100",
     "rollForward": "latestMajor",
-    "allowPrerelease": "false"
+    "allowPrerelease": false
   }
 }

src/Directory.Build.props

@@ -3,14 +3,8 @@
 
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <!-- Compatible from net6.0 onwards (we get warnings otherwise). This implies IsTrimmable as well -->
-    <IsAotCompatible Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0')) ">true</IsAotCompatible>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Shared\*.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>

src/Npgsql.DependencyInjection/Npgsql.DependencyInjection.csproj

@@ -2,10 +2,7 @@
 
     <PropertyGroup>
         <Authors>Shay Rojansky</Authors>
-        <!-- DbDataSource was introduced to .NET in net7.0. Before that Npgsql has its own built-in copy. -->
-        <!-- This is why we have to build against both frameworks. -->
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-        <TargetFrameworks Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <PackageTags>npgsql;postgresql;postgres;ado;ado.net;database;sql;di;dependency injection</PackageTags>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>

src/Npgsql.GeoJSON/Npgsql.GeoJSON.csproj

@@ -3,8 +3,7 @@
     <Authors>Yoh Deadfall;Shay Rojansky</Authors>
     <Description>GeoJSON plugin for Npgsql, allowing mapping of PostGIS geometry types to GeoJSON types.</Description>
     <PackageTags>npgsql;postgresql;postgres;postgis;geojson;spatial;ado;ado.net;database;sql</PackageTags>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>$(NoWarn);NPG9001</NoWarn> <!-- Converter-related APIs are experimental -->
   </PropertyGroup>
 

src/Npgsql.Json.NET/Npgsql.Json.NET.csproj

@@ -3,8 +3,7 @@
     <Authors>Shay Rojansky</Authors>
     <Description>Json.NET plugin for Npgsql, allowing transparent serialization/deserialization of JSON objects directly to and from the database.</Description>
     <PackageTags>npgsql;postgresql;json;postgres;ado;ado.net;database;sql</PackageTags>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);NPG9001</NoWarn> <!-- Converter-related APIs are experimental -->
   </PropertyGroup>

src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj

@@ -4,8 +4,7 @@
     <Description>NetTopologySuite plugin for Npgsql, allowing mapping of PostGIS geometry types to NetTopologySuite types.</Description>
     <PackageTags>npgsql;postgresql;postgres;postgis;spatial;nettopologysuite;nts;ado;ado.net;database;sql</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
     <NoWarn>$(NoWarn);NPG9001</NoWarn> <!-- Converter-related APIs are experimental -->
   </PropertyGroup>

src/Npgsql.NodaTime/Npgsql.NodaTime.csproj

@@ -4,8 +4,7 @@
     <Description>NodaTime plugin for Npgsql, allowing mapping of PostgreSQL date/time types to NodaTime types.</Description>
     <PackageTags>npgsql;postgresql;postgres;nodatime;date;time;ado;ado;net;database;sql</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>$(NoWarn);NPG9001</NoWarn> <!-- Converter-related APIs are experimental -->
   </PropertyGroup>
 

src/Npgsql.OpenTelemetry/Npgsql.OpenTelemetry.csproj

@@ -2,8 +2,7 @@
 
     <PropertyGroup>
         <Authors>Shay Rojansky</Authors>
-        <TargetFramework>net6.0</TargetFramework>
-        <TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <PackageTags>npgsql;postgresql;postgres;ado;ado.net;database;sql;opentelemetry;tracing;diagnostics;instrumentation</PackageTags>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>

src/Npgsql/Internal/Converters/Internal/InternalCharConverter.cs

@@ -4,40 +4,14 @@
 // ReSharper disable once CheckNamespace
 namespace Npgsql.Internal.Converters;
 
-sealed class InternalCharConverter<T> : PgBufferedConverter<T>
-#if NET7_0_OR_GREATER
-    where T : INumberBase<T>
-#endif
+sealed class InternalCharConverter<T> : PgBufferedConverter<T> where T : INumberBase<T>
 {
     public override bool CanConvert(DataFormat format, out BufferRequirements bufferRequirements)
     {
         bufferRequirements = BufferRequirements.CreateFixedSize(sizeof(byte));
         return format is DataFormat.Binary;
     }
 
-#if NET7_0_OR_GREATER
     protected override T ReadCore(PgReader reader) => T.CreateChecked(reader.ReadByte());
     protected override void WriteCore(PgWriter writer, T value) => writer.WriteByte(byte.CreateChecked(value));
-#else
-    protected override T ReadCore(PgReader reader)
-    {
-        var value = reader.ReadByte();
-        if (typeof(byte) == typeof(T))
-            return (T)(object)value;
-        if (typeof(char) == typeof(T))
-            return (T)(object)(char)value;
-
-        throw new NotSupportedException();
-    }
-
-    protected override void WriteCore(PgWriter writer, T value)
-    {
-        if (typeof(byte) == typeof(T))
-            writer.WriteByte((byte)(object)value!);
-        else if (typeof(char) == typeof(T))
-            writer.WriteByte(checked((byte)(char)(object)value!));
-        else
-            throw new NotSupportedException();
-    }
-#endif
 }

src/Npgsql/Internal/Converters/MoneyConverter.cs

@@ -3,72 +3,17 @@
 
 namespace Npgsql.Internal.Converters;
 
-sealed class MoneyConverter<T> : PgBufferedConverter<T>
-#if NET7_0_OR_GREATER
-    where T : INumberBase<T>
-#endif
+sealed class MoneyConverter<T> : PgBufferedConverter<T> where T : INumberBase<T>
 {
     public override bool CanConvert(DataFormat format, out BufferRequirements bufferRequirements)
     {
         bufferRequirements = BufferRequirements.CreateFixedSize(sizeof(long));
         return format is DataFormat.Binary;
     }
+
     protected override T ReadCore(PgReader reader) => ConvertTo(new PgMoney(reader.ReadInt64()));
     protected override void WriteCore(PgWriter writer, T value) => writer.WriteInt64(ConvertFrom(value).GetValue());
 
-    static PgMoney ConvertFrom(T value)
-    {
-#if !NET7_0_OR_GREATER
-        if (typeof(short) == typeof(T))
-            return new PgMoney((decimal)(short)(object)value!);
-        if (typeof(int) == typeof(T))
-            return new PgMoney((decimal)(int)(object)value!);
-        if (typeof(long) == typeof(T))
-            return new PgMoney((decimal)(long)(object)value!);
-
-        if (typeof(byte) == typeof(T))
-            return new PgMoney((decimal)(byte)(object)value!);
-        if (typeof(sbyte) == typeof(T))
-            return new PgMoney((decimal)(sbyte)(object)value!);
-
-        if (typeof(float) == typeof(T))
-            return new PgMoney((decimal)(float)(object)value!);
-        if (typeof(double) == typeof(T))
-            return new PgMoney((decimal)(double)(object)value!);
-        if (typeof(decimal) == typeof(T))
-            return new PgMoney((decimal)(object)value!);
-
-        throw new NotSupportedException();
-#else
-        return new PgMoney(decimal.CreateChecked(value));
-#endif
-    }
-
-    static T ConvertTo(PgMoney money)
-    {
-#if !NET7_0_OR_GREATER
-        if (typeof(short) == typeof(T))
-            return (T)(object)(short)money.ToDecimal();
-        if (typeof(int) == typeof(T))
-            return (T)(object)(int)money.ToDecimal();
-        if (typeof(long) == typeof(T))
-            return (T)(object)(long)money.ToDecimal();
-
-        if (typeof(byte) == typeof(T))
-            return (T)(object)(byte)money.ToDecimal();
-        if (typeof(sbyte) == typeof(T))
-            return (T)(object)(sbyte)money.ToDecimal();
-
-        if (typeof(float) == typeof(T))
-            return (T)(object)(float)money.ToDecimal();
-        if (typeof(double) == typeof(T))
-            return (T)(object)(double)money.ToDecimal();
-        if (typeof(decimal) == typeof(T))
-            return (T)(object)money.ToDecimal();
-
-        throw new NotSupportedException();
-#else
-        return T.CreateChecked(money.ToDecimal());
-#endif
-    }
+    static PgMoney ConvertFrom(T value) => new(decimal.CreateChecked(value));
+    static T ConvertTo(PgMoney money) => T.CreateChecked(money.ToDecimal());
 }

src/Npgsql/Internal/Converters/Networking/IPNetworkConverter.cs

@@ -1,6 +1,4 @@
-#if NET8_0_OR_GREATER
-
-using System.Net;
+using System.Net;
 
 // ReSharper disable once CheckNamespace
 namespace Npgsql.Internal.Converters;
@@ -22,5 +20,3 @@ protected override IPNetwork ReadCore(PgReader reader)
     protected override void WriteCore(PgWriter writer, IPNetwork value)
         => NpgsqlInetConverter.WriteImpl(writer, (value.BaseAddress, (byte)value.PrefixLength), isCidr: true);
 }
-
-#endif

src/Npgsql/Internal/Converters/Primitive/DoubleConverter.cs

@@ -4,40 +4,14 @@
 // ReSharper disable once CheckNamespace
 namespace Npgsql.Internal.Converters;
 
-sealed class DoubleConverter<T> : PgBufferedConverter<T>
-#if NET7_0_OR_GREATER
-    where T : INumberBase<T>
-#endif
+sealed class DoubleConverter<T> : PgBufferedConverter<T> where T : INumberBase<T>
 {
     public override bool CanConvert(DataFormat format, out BufferRequirements bufferRequirements)
     {
         bufferRequirements = BufferRequirements.CreateFixedSize(sizeof(double));
         return format is DataFormat.Binary;
     }
 
-#if NET7_0_OR_GREATER
     protected override T ReadCore(PgReader reader) => T.CreateChecked(reader.ReadDouble());
     protected override void WriteCore(PgWriter writer, T value) => writer.WriteDouble(double.CreateChecked(value));
-#else
-    protected override T ReadCore(PgReader reader)
-    {
-        var value = reader.ReadDouble();
-        if (typeof(float) == typeof(T))
-            return (T)(object)value;
-        if (typeof(double) == typeof(T))
-            return (T)(object)value;
-
-        throw new NotSupportedException();
-    }
-
-    protected override void WriteCore(PgWriter writer, T value)
-    {
-        if (typeof(float) == typeof(T))
-            writer.WriteDouble((float)(object)value!);
-        else if (typeof(double) == typeof(T))
-            writer.WriteDouble((double)(object)value!);
-        else
-            throw new NotSupportedException();
-    }
-#endif
 }

src/Npgsql/Internal/Converters/Primitive/GuidUuidConverter.cs

@@ -11,35 +11,15 @@ public override bool CanConvert(DataFormat format, out BufferRequirements buffer
         bufferRequirements = BufferRequirements.CreateFixedSize(16 * sizeof(byte));
         return format is DataFormat.Binary;
     }
+
     protected override Guid ReadCore(PgReader reader)
-    {
-#if NET8_0_OR_GREATER
-        return new Guid(reader.ReadBytes(16).FirstSpan, bigEndian: true);
-#else
-        return new GuidRaw
-        {
-            Data1 = reader.ReadInt32(),
-            Data2 = reader.ReadInt16(),
-            Data3 = reader.ReadInt16(),
-            Data4 = BitConverter.IsLittleEndian ? BinaryPrimitives.ReverseEndianness(reader.ReadInt64()) : reader.ReadInt64()
-        }.Value;
-#endif
-    }
+        => new(reader.ReadBytes(16).FirstSpan, bigEndian: true);
 
     protected override void WriteCore(PgWriter writer, Guid value)
     {
-#if NET8_0_OR_GREATER
         Span<byte> bytes = stackalloc byte[16];
         value.TryWriteBytes(bytes, bigEndian: true, out _);
         writer.WriteBytes(bytes);
-#else
-        var raw = new GuidRaw(value);
-
-        writer.WriteInt32(raw.Data1);
-        writer.WriteInt16(raw.Data2);
-        writer.WriteInt16(raw.Data3);
-        writer.WriteInt64(BitConverter.IsLittleEndian ? BinaryPrimitives.ReverseEndianness(raw.Data4) : raw.Data4);
-#endif
     }
 
 #if !NET8_0_OR_GREATER

src/Npgsql/Internal/Converters/Primitive/Int2Converter.cs

@@ -4,67 +4,14 @@
 // ReSharper disable once CheckNamespace
 namespace Npgsql.Internal.Converters;
 
-sealed class Int2Converter<T> : PgBufferedConverter<T>
-#if NET7_0_OR_GREATER
-    where T : INumberBase<T>
-#endif
+sealed class Int2Converter<T> : PgBufferedConverter<T> where T : INumberBase<T>
 {
     public override bool CanConvert(DataFormat format, out BufferRequirements bufferRequirements)
     {
         bufferRequirements = BufferRequirements.CreateFixedSize(sizeof(short));
         return format is DataFormat.Binary;
     }
-#if NET7_0_OR_GREATER
+
     protected override T ReadCore(PgReader reader) => T.CreateChecked(reader.ReadInt16());
     protected override void WriteCore(PgWriter writer, T value) => writer.WriteInt16(short.CreateChecked(value));
-#else
-    protected override T ReadCore(PgReader reader)
-    {
-        var value = reader.ReadInt16();
-        if (typeof(short) == typeof(T))
-            return (T)(object)value;
-        if (typeof(int) == typeof(T))
-            return (T)(object)(int)value;
-        if (typeof(long) == typeof(T))
-            return (T)(object)(long)value;
-
-        if (typeof(byte) == typeof(T))
-            return (T)(object)checked((byte)value);
-        if (typeof(sbyte) == typeof(T))
-            return (T)(object)checked((sbyte)value);
-
-        if (typeof(float) == typeof(T))
-            return (T)(object)(float)value;
-        if (typeof(double) == typeof(T))
-            return (T)(object)(double)value;
-        if (typeof(decimal) == typeof(T))
-            return (T)(object)(decimal)value;
-
-        throw new NotSupportedException();
-    }
-
-    protected override void WriteCore(PgWriter writer, T value)
-    {
-        if (typeof(short) == typeof(T))
-            writer.WriteInt16((short)(object)value!);
-        else if (typeof(int) == typeof(T))
-            writer.WriteInt16(checked((short)(int)(object)value!));
-        else if (typeof(long) == typeof(T))
-            writer.WriteInt16(checked((short)(long)(object)value!));
-
-        else if (typeof(byte) == typeof(T))
-            writer.WriteInt16((byte)(object)value!);
-        else if (typeof(sbyte) == typeof(T))
-            writer.WriteInt16((sbyte)(object)value!);
-
-        else if (typeof(float) == typeof(T))
-            writer.WriteInt16(checked((short)(float)(object)value!));
-        else if (typeof(double) == typeof(T))
-            writer.WriteInt16(checked((short)(double)(object)value!));
-        else if (typeof(decimal) == typeof(T))
-            writer.WriteInt16((short)(decimal)(object)value!);
-        else
-            throw new NotSupportedException();
-    }
-#endif
 }