Update to EF 6.3, including NS21.

Author: cincuranet

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

@@ -14,7 +14,6 @@
 	<ItemGroup>
 		<PackageReference Include="NUnit" Version="3.10.1" />
 		<PackageReference Include="NUnitLite" Version="3.10.1" />
-		<PackageReference Include="EntityFramework" Version="6.2.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net452</TargetFramework>
+		<TargetFrameworks>net452;netstandard2.1</TargetFrameworks>
 		<AssemblyName>EntityFramework.Firebird</AssemblyName>
 		<RootNamespace>EntityFramework.Firebird</RootNamespace>
 		<SignAssembly>true</SignAssembly>
@@ -44,13 +44,15 @@
 		<None Include="..\..\..\license.txt" Link="license.txt" Pack="true" PackagePath="" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="EntityFramework" Version="6.2.0" />
+		<PackageReference Include="EntityFramework" Version="6.3.0" />
 	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />
-	</ItemGroup>
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'=='net452'">
 		<Reference Include="System.Configuration" />
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />
+	</ItemGroup>
 </Project>

Provider/src/EntityFramework.Firebird/FbProviderManifest.cs

@@ -159,14 +159,14 @@ public override TypeUsage GetEdmType(TypeUsage storeType)
 				case "varchar":
 					newPrimitiveTypeKind = PrimitiveTypeKind.String;
 					isUnbounded = !TypeHelpers.TryGetMaxLength(storeType, out maxLength);
-					isUnicode = true; //TODO: hardcoded
+					isUnicode = true; //hardcoded
 					isFixedLen = false;
 					break;
 
 				case "char":
 					newPrimitiveTypeKind = PrimitiveTypeKind.String;
 					isUnbounded = !TypeHelpers.TryGetMaxLength(storeType, out maxLength);
-					isUnicode = true; //TODO: hardcoded
+					isUnicode = true; //hardcoded
 					isFixedLen = true;
 					break;
 
@@ -186,7 +186,7 @@ public override TypeUsage GetEdmType(TypeUsage storeType)
 				case "clob":
 					newPrimitiveTypeKind = PrimitiveTypeKind.String;
 					isUnbounded = true;
-					isUnicode = true; //TODO: hardcoded
+					isUnicode = true; //hardcoded
 					isFixedLen = false;
 					break;
 

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

@@ -19,14 +19,11 @@
 		<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />
 	</ItemGroup>
 	<Import Project="..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.projitems" Label="Shared" />
-
 	<ItemGroup Condition="'$(TargetFramework)'=='net452'">
 		<Reference Include="System.Transactions" />
 	</ItemGroup>
-
 	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
 	</ItemGroup>
-
 	<ItemGroup>
 	  <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>