EFCore 7.0 and around (#124)

Author: cincuranet

.github/workflows/ci.yml

@@ -19,10 +19,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: .NET 6.0
+      - name: .NET 7.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Build
         run: |

header.ps1

@@ -32,7 +32,7 @@ gci $baseDir -Recurse -Filter *.cs | %{
 		}		
 	}
 	if (!$started) {
-		//echo $_.FullName
+		#echo $_.FullName
 		return
 	}
 

include.ps1

@@ -7,5 +7,5 @@ function Check-ExitCode() {
 }
 
 function Get-UsedTargetFramework() {
-	return 'net6.0'
+	return 'net7.0'
 }

src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<!-- Figure out a way to run it on net4.8 (FirebirdSql.Data.TestsBase uses IAsyncDisposable) -->
+		<TargetFramework>net7.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
@@ -11,7 +12,7 @@
 		<OutputType>Exe</OutputType>
 		<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
 		<None Remove="app.config" />
 	</ItemGroup>
 	<ItemGroup>
@@ -25,7 +26,7 @@
 		<ProjectReference Include="..\EntityFramework.Firebird\EntityFramework.Firebird.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 	<Import Project="..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.projitems" Label="Shared" />
 </Project>

src/EntityFramework.Firebird.Tests/EntityFrameworkTestsBase.cs

@@ -27,7 +27,7 @@ public abstract class EntityFrameworkTestsBase : FbTestsBase
 {
 	static EntityFrameworkTestsBase()
 	{
-#if NET6_0_OR_GREATER
+#if !NETFRAMEWORK
 		System.Data.Common.DbProviderFactories.RegisterFactory(FbProviderServices.ProviderInvariantName, FirebirdClientFactory.Instance);
 #endif
 		DbConfiguration.SetConfiguration(new FbTestDbContext.Conf());

src/EntityFramework.Firebird/EntityFramework.Firebird.csproj

@@ -10,7 +10,7 @@
 	</PropertyGroup>
 	<PropertyGroup>
 		<AssemblyTitle>NETProvider - Entity Framework Provider</AssemblyTitle>
-		<Copyright>(c) 2014-2021</Copyright>
+		<Copyright>(c) 2014-2023</Copyright>
 	</PropertyGroup>
 	<PropertyGroup>
 		<PackageId>EntityFramework.Firebird</PackageId>

src/EntityFramework.Firebird/SqlGen/SqlGenerator.cs

@@ -2552,7 +2552,7 @@ private static ISqlFragment HandleCanonicalFunctionBitwiseAnd(SqlGenerator sqlge
 
 	private static ISqlFragment HandleCanonicalFunctionBitwiseNot(SqlGenerator sqlgen, DbFunctionExpression e)
 	{
-		throw new NotSupportedException("BitwiseNot is not supported by Firebird.");
+		return sqlgen.HandleFunctionDefaultGivenName(e, "BIN_NOT");
 	}
 
 	private static ISqlFragment HandleCanonicalFunctionBitwiseOr(SqlGenerator sqlgen, DbFunctionExpression e)

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
@@ -22,6 +22,6 @@
 	</ItemGroup>
 	<Import Project="..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.projitems" Label="Shared" />
 	<ItemGroup>
-	  <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
 </Project>

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
 		<AssemblyName>FirebirdSql.Data.FirebirdClient</AssemblyName>
 		<RootNamespace>FirebirdSql.Data</RootNamespace>
 		<SignAssembly>true</SignAssembly>
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 	<PropertyGroup>
 		<AssemblyTitle>NETProvider - ADO.NET Data Provider</AssemblyTitle>
-		<Copyright>(c) 2002-2021</Copyright>
+		<Copyright>(c) 2002-2023</Copyright>
 	</PropertyGroup>
 	<PropertyGroup>
 		<PackageId>FirebirdSql.Data.FirebirdClient</PackageId>
@@ -51,6 +51,8 @@
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
+	</ItemGroup>
 	<ItemGroup>
 	  <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
 	    <PrivateAssets>all</PrivateAssets>

src/FirebirdSql.Data.FirebirdClient/Logging/LogMessages.cs

@@ -286,4 +286,4 @@ public static void TransactionRolledBackRetaining(IFbLogger log, FbTransaction t
 	}
 
 	static bool IsNullParameterValue(object value) => value == DBNull.Value || value == null;
-}
+}