Skip to content

Commit 991c70d

Browse files
cincuranetcincuranet
authored
EF Core 11 (#135)
1 parent 4385c0f commit 991c70d

125 files changed

Lines changed: 1505 additions & 1317 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function Versions() {
2929
return (Get-Item $file).VersionInfo.ProductVersion -replace '(\d+)\.(\d+)\.(\d+)(-[a-z0-9]+)?.*','$1.$2.$3$4'
3030
}
3131
$script:versionProvider = v $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\net11.0\FirebirdSql.Data.FirebirdClient.dll
32-
$script:versionEFCore = v $baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird\bin\$Configuration\net10.0\FirebirdSql.EntityFrameworkCore.Firebird.dll
32+
$script:versionEFCore = v $baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird\bin\$Configuration\net11.0\FirebirdSql.EntityFrameworkCore.Firebird.dll
3333
$script:versionEF6 = v $baseDir\src\EntityFramework.Firebird\bin\$Configuration\net48\EntityFramework.Firebird.dll
3434
}
3535

‎src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/ComplianceFbTest.cs‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public class ComplianceFbTest : Microsoft.EntityFrameworkCore.RelationalComplian
6565
typeof(Microsoft.EntityFrameworkCore.PropertyValuesRelationalTestBase<>),
6666
typeof(Microsoft.EntityFrameworkCore.PropertyValuesTestBase<>),
6767
typeof(Microsoft.EntityFrameworkCore.QueryExpressionInterceptionTestBase),
68-
typeof(Microsoft.EntityFrameworkCore.AdHocManyToManyQueryTestBase),
6968
typeof(Microsoft.EntityFrameworkCore.SaveChangesInterceptionTestBase),
7069
typeof(Microsoft.EntityFrameworkCore.SeedingTestBase),
7170
typeof(Microsoft.EntityFrameworkCore.SerializationTestBase<>),
@@ -94,6 +93,11 @@ public class ComplianceFbTest : Microsoft.EntityFrameworkCore.RelationalComplian
9493
typeof(Microsoft.EntityFrameworkCore.TransactionInterceptionTestBase),
9594
typeof(Microsoft.EntityFrameworkCore.TransactionTestBase<>),
9695
typeof(Microsoft.EntityFrameworkCore.TwoDatabasesTestBase),
96+
typeof(Microsoft.EntityFrameworkCore.RuntimeMigrationTestBase<>),
97+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.TPCInheritanceTableSplittingQueryRelationalTestBase<>),
98+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.TPHInheritanceTableSplittingQueryRelationalTestBase<>),
99+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.TPTInheritanceTableSplittingQueryRelationalTestBase<>),
100+
typeof(Microsoft.EntityFrameworkCore.Query.Associations.Navigations.NavigationsBulkUpdateRelationalTestBase<>),
97101

98102
typeof(Microsoft.EntityFrameworkCore.ModelBuilding.ModelBuilderTest.ComplexCollectionTestBase),
99103
typeof(Microsoft.EntityFrameworkCore.ModelBuilding.ModelBuilderTest.ComplexTypeTestBase),
@@ -116,19 +120,19 @@ public class ComplianceFbTest : Microsoft.EntityFrameworkCore.RelationalComplian
116120
typeof(Microsoft.EntityFrameworkCore.ModelBuilding.RelationalModelBuilderTest.RelationalOwnedTypesTestBase),
117121

118122
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.BulkUpdatesTestBase<>),
119-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.FiltersInheritanceBulkUpdatesTestBase<>),
120-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.InheritanceBulkUpdatesTestBase<>),
123+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.FiltersInheritanceBulkUpdatesTestBase<>),
124+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.InheritanceBulkUpdatesTestBase<>),
121125
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.NonSharedModelBulkUpdatesTestBase),
122126
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.NorthwindBulkUpdatesTestBase<>),
123-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.FiltersInheritanceBulkUpdatesRelationalTestBase<>),
124-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.InheritanceBulkUpdatesRelationalTestBase<>),
127+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.FiltersInheritanceBulkUpdatesRelationalTestBase<>),
128+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.InheritanceBulkUpdatesRelationalTestBase<>),
125129
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.NonSharedModelBulkUpdatesRelationalTestBase),
126130
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.NorthwindBulkUpdatesRelationalTestBase<>),
127-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.TPCFiltersInheritanceBulkUpdatesTestBase<>),
128-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.TPCInheritanceBulkUpdatesTestBase<>),
129-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.TPHInheritanceBulkUpdatesTestBase<>),
130-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.TPTFiltersInheritanceBulkUpdatesTestBase<>),
131-
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.TPTInheritanceBulkUpdatesTestBase<>),
131+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.TPCFiltersInheritanceBulkUpdatesTestBase<>),
132+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.TPCInheritanceBulkUpdatesTestBase<>),
133+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.TPHInheritanceBulkUpdatesTestBase<>),
134+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.TPTFiltersInheritanceBulkUpdatesTestBase<>),
135+
typeof(Microsoft.EntityFrameworkCore.BulkUpdates.Inheritance.TPTInheritanceBulkUpdatesTestBase<>),
132136

133137
typeof(Microsoft.EntityFrameworkCore.Update.ComplexCollectionJsonUpdateTestBase<>),
134138
typeof(Microsoft.EntityFrameworkCore.Update.JsonUpdateTestBase<>),
@@ -146,8 +150,6 @@ public class ComplianceFbTest : Microsoft.EntityFrameworkCore.RelationalComplian
146150
// JSON not supported on FB
147151
typeof(Microsoft.EntityFrameworkCore.Query.JsonQueryTestBase<>),
148152
typeof(Microsoft.EntityFrameworkCore.Query.JsonQueryRelationalTestBase<>),
149-
typeof(Microsoft.EntityFrameworkCore.Query.AdHocJsonQueryRelationalTestBase),
150-
typeof(Microsoft.EntityFrameworkCore.Query.AdHocJsonQueryTestBase),
151153
typeof(Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson.ComplexJsonBulkUpdateRelationalTestBase<>),
152154
typeof(Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson.ComplexJsonCollectionRelationalTestBase<>),
153155
typeof(Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson.ComplexJsonMiscellaneousRelationalTestBase<>),
@@ -161,6 +163,11 @@ public class ComplianceFbTest : Microsoft.EntityFrameworkCore.RelationalComplian
161163
typeof(Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson.OwnedJsonPrimitiveCollectionRelationalTestBase<>),
162164
typeof(Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson.OwnedJsonProjectionRelationalTestBase<>),
163165
typeof(Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson.OwnedJsonStructuralEqualityRelationalTestBase<>),
166+
typeof(Microsoft.EntityFrameworkCore.Query.Translations.JsonTranslationsRelationalTestBase<>),
167+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.TPCInheritanceJsonQueryRelationalTestBase<>),
168+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.TPHInheritanceJsonQueryRelationalTestBase<>),
169+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.TPTInheritanceJsonQueryRelationalTestBase<>),
170+
typeof(Microsoft.EntityFrameworkCore.Query.Inheritance.InheritanceComplexTypesQueryTestBase<>),
164171

165172
// Spatial not supported on FB
166173
typeof(Microsoft.EntityFrameworkCore.Query.SpatialQueryTestBase<>),

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

Lines changed: 5 additions & 2 deletions
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+
<TargetFramework>net11.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>
@@ -9,11 +9,14 @@
99
<SignAssembly>true</SignAssembly>
1010
<AssemblyOriginatorKeyFile>..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.snk</AssemblyOriginatorKeyFile>
1111
<PreserveCompilationContext>true</PreserveCompilationContext>
12+
<OutputType>Exe</OutputType>
13+
<NoWarn>$(NoWarn);xUnit1051</NoWarn>
14+
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
1215
</PropertyGroup>
1316
<ItemGroup>
1417
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreReferencePackageVersion)" />
1518
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16-
<PackageReference Include="xunit" Version="2.9.3" />
19+
<PackageReference Include="xunit.v3" Version="4.0.1" />
1720
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1821
<PrivateAssets>all</PrivateAssets>
1922
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/AdHocManyToManyQueryFbTest.cs renamed to src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Helpers/SkipReasons.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515

1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

18-
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
19-
using Microsoft.EntityFrameworkCore;
20-
using Microsoft.EntityFrameworkCore.Query;
21-
using Microsoft.EntityFrameworkCore.TestUtilities;
18+
namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
2219

23-
namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Query;
24-
25-
public class AdHocManyToManyQueryFbTest(NonSharedFixture fixture) : AdHocManyToManyQueryRelationalTestBase(fixture)
20+
// xUnit v3 reads [Fact]/[Theory] attributes including the inherited ones, hence overrides
21+
// have to use the same attribute type (to replace the base one) with these reasons.
22+
public static class SkipReasons
2623
{
27-
protected override ITestStoreFactory TestStoreFactory => FbTestStoreFactory.Instance;
24+
public const string HasDataInTheSameTransactionAsDDL = "HasData is called in the same transaction as DDL commands.";
25+
public const string GeneratedNameTooLong = "Generated name in the query is too long.";
26+
public const string NotSupportedOnFirebird = "Not supported on Firebird.";
27+
public const string DoesNotHaveTheData = "Does not have the data.";
28+
public const string LongExecution = "Long execution.";
29+
public const string NotSupportedByProvider = "Not supported by provider.";
2830
}

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

Lines changed: 0 additions & 110 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

18-
using Xunit;
18+
using Xunit.Sdk;
19+
using Xunit.v3;
1920

20-
[assembly: CollectionBehavior(DisableTestParallelization = true)]
21+
[assembly: Parallelization(Mode = ParallelMode.None)]

‎src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/MigrationsFbTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

1818
using System.Threading.Tasks;
19+
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
1920
using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
2021
using FirebirdSql.EntityFrameworkCore.Firebird.Scaffolding.Internal;
2122
using Microsoft.EntityFrameworkCore.Migrations;
@@ -39,6 +40,9 @@ public MigrationsFbTest(MigrationsFbFixture fixture)
3940
[Fact(Skip = SkipReason)]
4041
public override Task Create_table() => base.Create_table();
4142

43+
[Fact(Skip = SkipReasons.NotSupportedOnFirebird)]
44+
public override Task Convert_owned_entity_with_no_schema_to_regular_entity() => base.Convert_owned_entity_with_no_schema_to_regular_entity();
45+
4246
[Fact(Skip = SkipReason)]
4347
public override Task Create_table_all_settings() => base.Create_table_all_settings();
4448

‎src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/AdHocAdvancedMappingsQueryFbTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Query;
2424

2525
public class AdHocAdvancedMappingsQueryFbTest(NonSharedFixture fixture) : AdHocAdvancedMappingsQueryRelationalTestBase(fixture)
2626
{
27-
protected override ITestStoreFactory TestStoreFactory => FbTestStoreFactory.Instance;
27+
protected override ITestStoreFactory NonSharedTestStoreFactory => FbTestStoreFactory.Instance;
2828
}

‎src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/AdHocComplexTypeQueryFbTest.cs‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)