EFCore 3.1 support.

Author: cincuranet

Provider/build.ps1

@@ -4,6 +4,9 @@ param(
 $ErrorActionPreference = 'Stop'
 
 $baseDir = Split-Path -Parent $PSCommandPath
+
+. "$baseDir\include.ps1"
+
 $outDir = "$baseDir\out"
 $version = ''
 
@@ -22,9 +25,13 @@ function Clean() {
 }
 
 function Build() {
-	$solutionFile = "$baseDir\src\NETProvider.sln"
-	dotnet restore $solutionFile
-	dotnet msbuild /t:'Clean,Build' /p:Configuration=$Configuration $solutionFile /v:m /m
+	function b($target) {
+		dotnet msbuild /t:$target /p:Configuration=$Configuration "$baseDir\src\NETProvider.sln" /v:m /m
+		Check-ExitCode
+	}
+	b 'Clean'
+	b 'Restore'
+	b 'Build'
 	$script:version = (Get-Item $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\net452\FirebirdSql.Data.FirebirdClient.dll).VersionInfo.ProductVersion -replace '(\d+)\.(\d+)\.(\d+)(-[a-z0-9]+)?(.*)','$1.$2.$3$4'
 }
 
@@ -60,4 +67,4 @@ Clean
 Build
 Pack
 NuGets
-WiX
+WiX

Provider/include.ps1

@@ -0,0 +1,7 @@
+function Check-ExitCode() {
+	$exitCode = $LASTEXITCODE
+	if ($exitCode -ne 0) {
+		echo "Non-zero ($exitCode) exit code. Exiting..."
+		exit $exitCode
+	}
+}

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
+		<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
@@ -11,7 +11,7 @@
 		<OutputType>Exe</OutputType>
 		<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
 		<None Remove="app.config" />
 	</ItemGroup>
 	<ItemGroup>

Provider/src/EntityFramework.Firebird.Tests/EntityFrameworkTestsBase.cs

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

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
+		<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
@@ -22,7 +22,7 @@
 	<ItemGroup Condition="'$(TargetFramework)'=='net452'">
 		<Reference Include="System.Transactions" />
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
 	</ItemGroup>
 	<ItemGroup>
 	  <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbParameter.cs

@@ -482,7 +482,7 @@ internal static string NormalizeParameterName(string parameterName)
 
 		internal static bool IsNonAsciiParameterName(string parameterName)
 		{
-			return Encoding.UTF8.GetByteCount(parameterName) != parameterName.Length;
+			return string.IsNullOrEmpty(parameterName) || Encoding.UTF8.GetByteCount(parameterName) != parameterName.Length;
 		}
 
 		#endregion

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.0</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
@@ -10,7 +10,7 @@
 		<AssemblyOriginatorKeyFile>..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.2.6" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="3.1.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Helpers/ModelHelpers.cs

@@ -25,7 +25,7 @@ namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers
 {
 	public static class ModelHelpers
 	{
-		public static void SetStringLengths(ModelBuilder modelBuilder, DbContext context)
+		public static void SetStringLengths(ModelBuilder modelBuilder)
 		{
 			foreach (var entityType in modelBuilder.Model.GetEntityTypes())
 			{
@@ -39,23 +39,25 @@ public static void SetStringLengths(ModelBuilder modelBuilder, DbContext context
 			}
 		}
 
-		public static void SimpleTableNames(ModelBuilder modelBuilder, DbContext context)
+		public static void SimpleTableNames(ModelBuilder modelBuilder)
 		{
 			var names = new HashSet<string>(StringComparer.InvariantCulture);
 			foreach (var entityType in modelBuilder.Model.GetEntityTypes())
 			{
-				var name = new string(entityType.Relational().TableName.Where(char.IsUpper).ToArray());
+				if (entityType.BaseType != null)
+					continue;
+				var name = new string(entityType.GetTableName().Where(char.IsUpper).ToArray());
 				var cnt = 1;
 				while (names.Contains(name))
 				{
-					name = name + cnt++;
+					name += cnt++;
 				}
 				names.Add(name);
-				entityType.Relational().TableName = name;
+				entityType.SetTableName(name);
 			}
 		}
 
-		public static void SetPrimaryKeyGeneration(ModelBuilder modelBuilder, DbContext context, FbValueGenerationStrategy valueGenerationStrategy = FbValueGenerationStrategy.SequenceTrigger)
+		public static void SetPrimaryKeyGeneration(ModelBuilder modelBuilder, FbValueGenerationStrategy valueGenerationStrategy = FbValueGenerationStrategy.SequenceTrigger)
 		{
 			foreach (var entityType in modelBuilder.Model.GetEntityTypes())
 			{
@@ -65,10 +67,10 @@ public static void SetPrimaryKeyGeneration(ModelBuilder modelBuilder, DbContext
 				var properties = pk.Properties;
 				if (properties.Count() != 1)
 					continue;
-				var fbPropertyAnnotations = properties[0].Firebird();
-				if (fbPropertyAnnotations.ValueGenerationStrategy == null)
+				var property = properties[0];
+				if (property.GetValueGenerationStrategy() == FbValueGenerationStrategy.None)
 				{
-					properties[0].Firebird().ValueGenerationStrategy = valueGenerationStrategy;
+					property.SetValueGenerationStrategy(valueGenerationStrategy);
 				}
 			}
 		}

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Helpers/SkippingAttributes.cs

@@ -19,18 +19,25 @@
 
 namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers
 {
-	public class HasDataInTheSameTransactionAsDDLAttribute : FactAttribute
+	public class HasDataInTheSameTransactionAsDDLFactAttribute : FactAttribute
 	{
-		public HasDataInTheSameTransactionAsDDLAttribute()
+		public HasDataInTheSameTransactionAsDDLFactAttribute()
+		{
+			Skip = "HasData is called in the same transaction as DDL commands.";
+		}
+	}
+	public class HasDataInTheSameTransactionAsDDLTheoryAttribute : TheoryAttribute
+	{
+		public HasDataInTheSameTransactionAsDDLTheoryAttribute()
 		{
 			Skip = "HasData is called in the same transaction as DDL commands.";
 		}
 	}
 
 #warning Can I somehow handle it in SQL generation?
-	public class GeneratedNameTooLongAttribute : FactAttribute
+	public class GeneratedNameTooLongFactAttribute : FactAttribute
 	{
-		public GeneratedNameTooLongAttribute()
+		public GeneratedNameTooLongFactAttribute()
 		{
 			Skip = "Generated name in the query is too long.";
 		}
@@ -43,9 +50,9 @@ public GeneratedNameTooLongTheoryAttribute()
 		}
 	}
 
-	public class NotSupportedOnFirebirdAttribute : FactAttribute
+	public class NotSupportedOnFirebirdFactAttribute : FactAttribute
 	{
-		public NotSupportedOnFirebirdAttribute()
+		public NotSupportedOnFirebirdFactAttribute()
 		{
 			Skip = "Not supported on Firebird.";
 		}
@@ -57,4 +64,19 @@ public NotSupportedOnFirebirdTheoryAttribute()
 			Skip = "Not supported on Firebird.";
 		}
 	}
+
+	public class DoesNotHaveTheDataFactAttribute : FactAttribute
+	{
+		public DoesNotHaveTheDataFactAttribute()
+		{
+			Skip = "Does not have the data.";
+		}
+	}
+	public class DoesNotHaveTheDataTheoryAttribute : TheoryAttribute
+	{
+		public DoesNotHaveTheDataTheoryAttribute()
+		{
+			Skip = "Does not have the data.";
+		}
+	}
 }

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Helpers/Xunit.cs

@@ -0,0 +1,3 @@
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]