Skip to content

Commit 0ad0d61

Browse files
vonzshikvonzshik
authored
Drop NETSTANDARD (#5434)
Closes #5296 It's time 🔥
1 parent 63aed35 commit 0ad0d61

86 files changed

Lines changed: 57 additions & 1709 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ jobs:
3838
pg_major: 16
3939
config: Debug
4040
test_tfm: net8.0
41-
- os: ubuntu-22.04
42-
pg_major: 16
43-
config: Release
44-
test_tfm: netcoreapp3.1
4541
- os: macos-12
4642
pg_major: 14
4743
config: Release

‎src/Npgsql.DependencyInjection/Npgsql.DependencyInjection.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<PropertyGroup>
44
<Authors>Shay Rojansky</Authors>
55
<!-- DbDataSource was introduced to .NET in net7.0. Before that Npgsql has its own built-in copy. -->
6-
<TargetFrameworks Condition="'$(DeveloperBuild)' != 'True'">netstandard2.0;net7.0</TargetFrameworks>
6+
<!-- This is why we have to build against both frameworks. -->
7+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
78
<TargetFrameworks Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFrameworks>
89
<PackageTags>npgsql;postgresql;postgres;ado;ado.net;database;sql;di;dependency injection</PackageTags>
910
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -12,13 +13,10 @@
1213
<ItemGroup>
1314
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />
1415
</ItemGroup>
15-
16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
17-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
18-
</ItemGroup>
1916

2017
<ItemGroup>
2118
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
2220
</ItemGroup>
2321

2422
<ItemGroup>

‎src/Npgsql.DependencyInjection/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
using System.Runtime.CompilerServices;
22

3-
#if NET5_0_OR_GREATER
43
[module: SkipLocalsInit]
5-
#endif

‎src/Npgsql.GeoJSON/Internal/GeoJSONConverter.cs‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,17 @@ public override ValueTask WriteAsync(PgWriter writer, T value, CancellationToken
5151
if (crsType == GeoJSONOptions.None)
5252
return null;
5353

54-
#if NETSTANDARD2_0
55-
return cachedCrs.GetOrAdd(srid, srid =>
54+
return cachedCrs.GetOrAdd(srid, static (srid, state) =>
5655
{
56+
var (crsMap, crsType) = state;
5757
var authority = crsMap.GetAuthority(srid);
5858

5959
return authority is null
6060
? throw new InvalidOperationException($"SRID {srid} unknown in spatial_ref_sys table")
6161
: new NamedCRS(crsType == GeoJSONOptions.LongCRS
6262
? "urn:ogc:def:crs:" + authority + "::" + srid
6363
: authority + ":" + srid);
64-
});
65-
#else
66-
return cachedCrs.GetOrAdd(srid, static (srid, state) =>
67-
{
68-
var (crsMap, crsType) = state;
69-
var authority = crsMap.GetAuthority(srid);
70-
71-
return authority is null
72-
? throw new InvalidOperationException($"SRID {srid} unknown in spatial_ref_sys table")
73-
: new NamedCRS(crsType == GeoJSONOptions.LongCRS
74-
? "urn:ogc:def:crs:" + authority + "::" + srid
75-
: authority + ":" + srid);
76-
}, (crsMap, crsType));
77-
#endif
64+
}, (crsMap, crsType));
7865
};
7966
}
8067

‎src/Npgsql.GeoJSON/Npgsql.GeoJSON.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Authors>Yoh Deadfall;Shay Rojansky</Authors>
44
<Description>GeoJSON plugin for Npgsql, allowing mapping of PostGIS geometry types to GeoJSON types.</Description>
55
<PackageTags>npgsql;postgresql;postgres;postgis;geojson;spatial;ado;ado.net;database;sql</PackageTags>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
88
</PropertyGroup>
99

‎src/Npgsql.GeoJSON/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
using System.Runtime.CompilerServices;
22

3-
#if NET5_0_OR_GREATER
43
[module: SkipLocalsInit]
5-
#endif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Authors>Shay Rojansky</Authors>
44
<Description>Json.NET plugin for Npgsql, allowing transparent serialization/deserialization of JSON objects directly to and from the database.</Description>
55
<PackageTags>npgsql;postgresql;json;postgres;ado;ado.net;database;sql</PackageTags>
6-
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
7-
<TargetFrameworks Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFrameworks>
6+
<TargetFramework>net6.0</TargetFramework>
7+
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

‎src/Npgsql.Json.NET/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
using System.Runtime.CompilerServices;
22

3-
#if NET5_0_OR_GREATER
43
[module: SkipLocalsInit]
5-
#endif

‎src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
<Description>NetTopologySuite plugin for Npgsql, allowing mapping of PostGIS geometry types to NetTopologySuite types.</Description>
55
<PackageTags>npgsql;postgresql;postgres;postgis;spatial;nettopologysuite;nts;ado;ado.net;database;sql</PackageTags>
66
<PackageReadmeFile>README.md</PackageReadmeFile>
7-
<TargetFramework>netstandard2.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
99
<NoWarn>$(NoWarn);NU5104</NoWarn>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
1313
<PackageReference Include="NetTopologySuite.IO.PostGIS" />
1414
<PackageReference Include="NetTopologySuite" />
15-
</ItemGroup>
16-
17-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
1815
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
1916
</ItemGroup>
2017

‎src/Npgsql.NetTopologySuite/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
using System.Runtime.CompilerServices;
22

3-
#if NET5_0_OR_GREATER
43
[module: SkipLocalsInit]
5-
#endif

0 commit comments

Comments
 (0)