Skip to content

Commit 24faf82

Browse files
committed
Add net11.0 target framework
- Provider: add net11.0 to TargetFrameworks. No Microsoft.Extensions.Logging.Abstractions package reference is needed for net11.0: the assembly ships in the .NET 11 shared framework, and NuGet prunes the reference (the nuspec net11.0 group is empty). - Tests: multi-target FirebirdSql.Data.FirebirdClient.Tests to net10.0;net11.0 so TFM-specific code paths are exercised on both. - tests.ps1: copy the Firebird binaries into, and run the FirebirdClient suites from, every provider test TFM output. - CI: install the .NET 11 SDK (preview quality until 11.0 GA).
1 parent 683cc93 commit 24faf82

4 files changed

Lines changed: 22 additions & 11 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ jobs:
2424
with:
2525
dotnet-version: 10.0.x
2626

27+
- name: .NET 11.0
28+
uses: actions/setup-dotnet@v5
29+
with:
30+
dotnet-version: 11.0.x
31+
dotnet-quality: preview
32+
2733
- name: Build
2834
run: |
2935
try {

‎src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net10.0</TargetFramework>
3+
<TargetFrameworks>net10.0;net11.0</TargetFrameworks>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

‎src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
44
<AssemblyName>FirebirdSql.Data.FirebirdClient</AssemblyName>
55
<RootNamespace>FirebirdSql.Data</RootNamespace>
66
<SignAssembly>true</SignAssembly>

‎tests.ps1‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ $FirebirdConfiguration = @{
2929
}
3030

3131
$frameworkVersion = 'net10.0'
32+
$providerTestsFrameworkVersions = @('net10.0', 'net11.0')
3233
$testsBaseDir = "$baseDir\src\FirebirdSql.Data.FirebirdClient.Tests"
33-
$testsProviderDir = "$testsBaseDir\bin\$Configuration\$frameworkVersion"
3434

3535
$firebirdProcess = $null
3636

@@ -59,7 +59,9 @@ function Prepare() {
5959
echo "Extracting $fbDownloadName"
6060
7z x -bsp0 -bso0 $fbDownloadName
6161
rm $fbDownloadName
62-
cp -Recurse -Force .\* $testsProviderDir
62+
foreach ($providerTestsFrameworkVersion in $providerTestsFrameworkVersions) {
63+
cp -Recurse -Force .\* "$testsBaseDir\bin\$Configuration\$providerTestsFrameworkVersion"
64+
}
6365

6466
ni firebird.log -ItemType File | Out-Null
6567

@@ -120,13 +122,16 @@ function Tests-FirebirdClient-Embedded() {
120122
Tests-FirebirdClient 'Embedded' $False 'Disabled'
121123
}
122124
function Tests-FirebirdClient($serverType, $compression, $wireCrypt) {
123-
pushd $testsProviderDir
124-
try {
125-
.\FirebirdSql.Data.FirebirdClient.Tests.exe --labels=All "--where=(ServerType==$serverType && Compression==$compression && WireCrypt==$wireCrypt) || Category==NoServer"
126-
Check-ExitCode
127-
}
128-
finally {
129-
popd
125+
foreach ($providerTestsFrameworkVersion in $providerTestsFrameworkVersions) {
126+
echo "=== FirebirdClient tests ($providerTestsFrameworkVersion) ==="
127+
pushd "$testsBaseDir\bin\$Configuration\$providerTestsFrameworkVersion"
128+
try {
129+
.\FirebirdSql.Data.FirebirdClient.Tests.exe --labels=All "--where=(ServerType==$serverType && Compression==$compression && WireCrypt==$wireCrypt) || Category==NoServer"
130+
Check-ExitCode
131+
}
132+
finally {
133+
popd
134+
}
130135
}
131136
}
132137

0 commit comments

Comments
 (0)