Skip to content

Commit 90f699b

Browse files
sebastienrosrojiNinoFloris
authored
Define TFM-specific dependencies (#6326)
Co-authored-by: Shay Rojansky <roji@roji.org> Co-authored-by: Nino Floris <mail@ninofloris.com>
1 parent fc0a675 commit 90f699b

4 files changed

Lines changed: 44 additions & 9 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,39 @@
11
<Project>
2+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
3+
<LoggingAbstractionsPackageVersion>10.0.0</LoggingAbstractionsPackageVersion>
4+
<DependencyInjectionAbstractionsPackageVersion>10.0.0</DependencyInjectionAbstractionsPackageVersion>
5+
6+
<!-- For tests only -->
7+
<DependencyInjectionPackageVersion>10.0.0</DependencyInjectionPackageVersion>
8+
<LoggingPackageVersion>10.0.0</LoggingPackageVersion>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
12+
<LoggingAbstractionsPackageVersion>9.0.0</LoggingAbstractionsPackageVersion>
13+
<DependencyInjectionAbstractionsPackageVersion>9.0.0</DependencyInjectionAbstractionsPackageVersion>
14+
15+
<!-- For tests only -->
16+
<DependencyInjectionPackageVersion>9.0.11</DependencyInjectionPackageVersion>
17+
<LoggingPackageVersion>9.0.11</LoggingPackageVersion>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
21+
<LoggingAbstractionsPackageVersion>8.0.0</LoggingAbstractionsPackageVersion>
22+
<DependencyInjectionAbstractionsPackageVersion>8.0.0</DependencyInjectionAbstractionsPackageVersion>
23+
24+
<!-- Note that we lift up DiagnosticSource for net8.0 to use the 9.0 version, since that supports histogram advice. -->
25+
<DiagnosticSourcePackageVersion>9.0.11</DiagnosticSourcePackageVersion>
26+
27+
<!-- For tests only -->
28+
<DependencyInjectionPackageVersion>8.0.1</DependencyInjectionPackageVersion>
29+
<LoggingPackageVersion>8.0.1</LoggingPackageVersion>
30+
</PropertyGroup>
31+
232
<ItemGroup>
3-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
4-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(LoggingAbstractionsPackageVersion)" />
34+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DependencyInjectionAbstractionsPackageVersion)" />
535
<PackageVersion Include="OpenTelemetry.API" Version="1.14.0" />
6-
7-
<!-- Compatibility -->
8-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
36+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(DiagnosticSourcePackageVersion)" />
937

1038
<!-- Plugin projects -->
1139
<PackageVersion Include="NetTopologySuite" Version="2.6.0" />
@@ -24,15 +52,15 @@
2452
<!-- Tests -->
2553
<PackageVersion Include="NUnit" Version="4.4.0" />
2654
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
27-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
55+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(DependencyInjectionPackageVersion)" />
56+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(LoggingPackageVersion)" />
57+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(LoggingPackageVersion)" />
2958
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3059
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
3160
<PackageVersion Include="xunit" Version="2.9.3" />
3261
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
3362
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
3463
<PackageVersion Include="AdoNet.Specification.Tests" Version="2.0.0-beta.2" />
35-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
3664

3765
<!-- Benchmarks -->
3866
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Authors>Shay Rojansky</Authors>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<PackageTags>npgsql;postgresql;postgres;ado;ado.net;database;sql;di;dependency injection</PackageTags>
77
<PackageReadmeFile>README.md</PackageReadmeFile>
88
</PropertyGroup>

‎src/Npgsql/Npgsql.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
18+
19+
<!-- We lift up DiagnosticSource for net8.0 to use the 9.0 version, since that supports histogram advice. -->
1820
<PackageReference Include="System.Diagnostics.DiagnosticSource" Condition="'$(TargetFramework)' == 'net8.0'" />
1921
</ItemGroup>
2022

‎test/Npgsql.Tests/Types/JsonTests.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,12 @@ public Task Roundtrip_JsonObject()
182182
[Test]
183183
public Task Roundtrip_JsonArray()
184184
=> AssertType(
185+
#if NET8_0
186+
// Necessary until we drop STJ 8.0, see https://github.com/dotnet/runtime/pull/103733
187+
new JsonArray { (JsonValue)1, (JsonValue)2, (JsonValue)3 },
188+
#else
185189
new JsonArray { 1, 2, 3 },
190+
#endif
186191
IsJsonb ? "[1, 2, 3]" : "[1,2,3]",
187192
PostgresType,
188193
NpgsqlDbType,

0 commit comments

Comments
 (0)