Skip to content

Commit 68a225c

Browse files
David-HH-DevDavid-HH-Dev
committed
update to .net7
1 parent 51b1bbe commit 68a225c

File tree

11 files changed

+57
-85
lines changed

11 files changed

+57
-85
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
44
<AssemblyName>FirebirdSql.Data.FirebirdClient</AssemblyName>
55
<RootNamespace>FirebirdSql.Data</RootNamespace>
66
<SignAssembly>true</SignAssembly>
@@ -51,6 +51,8 @@
5151
</ItemGroup>
5252
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
5353
</ItemGroup>
54+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
55+
</ItemGroup>
5456
<ItemGroup>
5557
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
5658
<PrivateAssets>all</PrivateAssets>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>
@@ -10,8 +10,8 @@
1010
<AssemblyOriginatorKeyFile>..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.snk</AssemblyOriginatorKeyFile>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.11" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.4" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1515
<PackageReference Include="xunit" Version="2.4.2" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1717
<PrivateAssets>all</PrivateAssets>

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,18 +204,12 @@ public MigrationsFbTest(MigrationsFbFixture fixture)
204204
[Fact(Skip = SkipReason)]
205205
public override Task Rename_index() => base.Rename_index();
206206

207-
[Fact(Skip = SkipReason)]
208-
public override Task Add_primary_key() => base.Add_primary_key();
209-
210207
[Fact(Skip = SkipReason)]
211208
public override Task Add_primary_key_with_name() => base.Add_primary_key_with_name();
212209

213210
[Fact(Skip = SkipReason)]
214211
public override Task Add_primary_key_composite_with_name() => base.Add_primary_key_composite_with_name();
215212

216-
[Fact(Skip = SkipReason)]
217-
public override Task Drop_primary_key() => base.Drop_primary_key();
218-
219213
[Fact(Skip = SkipReason)]
220214
public override Task Add_foreign_key() => base.Add_foreign_key();
221215

@@ -300,7 +294,7 @@ public class MigrationsFbFixture : MigrationsFixtureBase
300294

301295
protected override ITestStoreFactory TestStoreFactory => FbTestStoreFactory.Instance;
302296

303-
public override TestHelpers TestHelpers => FbTestHelpers.Instance;
297+
public override RelationalTestHelpers TestHelpers => FbTestHelpers.Instance;
304298

305299
protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
306300
#pragma warning disable EF1001

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -557,25 +557,13 @@ public override Task GroupJoin_with_complex_subquery_with_joins_does_not_get_fla
557557
return base.GroupJoin_with_complex_subquery_with_joins_does_not_get_flattened3(isAsync);
558558
}
559559

560-
[GeneratedNameTooLongFact]
561-
public override void Include18()
562-
{
563-
base.Include18();
564-
}
565-
566560
[GeneratedNameTooLongTheory]
567561
[MemberData(nameof(IsAsyncData))]
568562
public override Task Include18_1_1(bool isAsync)
569563
{
570564
return base.Include18_1_1(isAsync);
571565
}
572566

573-
[GeneratedNameTooLongFact]
574-
public override void Include19()
575-
{
576-
base.Include19();
577-
}
578-
579567
[GeneratedNameTooLongTheory]
580568
[MemberData(nameof(IsAsyncData))]
581569
public override Task Join_navigation_deeply_nested_non_key_join(bool isAsync)
@@ -695,12 +683,6 @@ public override Task Include_reference_with_groupby_in_subquery(bool async)
695683
return base.Include_reference_with_groupby_in_subquery(async);
696684
}
697685

698-
[GeneratedNameTooLongTheory]
699-
[MemberData(nameof(IsAsyncData))]
700-
public override Task Project_shadow_properties(bool async)
701-
{
702-
return base.Project_shadow_properties(async);
703-
}
704686
[NotSupportedOnFirebirdTheory]
705687
[MemberData(nameof(IsAsyncData))]
706688
public override Task SelectMany_with_outside_reference_to_joined_table_correctly_translated_to_apply(bool isAsync)

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

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -81,47 +81,47 @@ public override async Task FromSql_Count_used_twice_with_parameters(bool async)
8181
: query.Count() > 0;
8282
}
8383

84-
[Theory]
85-
[MemberData(nameof(IsAsyncData))]
86-
public override async Task FromSql_used_twice_without_parameters(bool async)
87-
{
88-
using var context = CreateContext();
89-
90-
var query = context.Set<OrderQuery>()
91-
.FromSqlRaw(NormalizeDelimitersInRawString("SELECT 'ALFKI' AS [CustomerID] FROM RDB$DATABASE"))
92-
.IgnoreQueryFilters();
93-
94-
var result1 = async
95-
? await query.AnyAsync()
96-
: query.Any();
97-
98-
Assert.Equal(
99-
RelationalStrings.QueryFromSqlInsideExists,
100-
async
101-
? (await Assert.ThrowsAsync<InvalidOperationException>(() => query.AnyAsync())).Message
102-
: Assert.Throws<InvalidOperationException>(() => query.Any()).Message);
103-
}
104-
105-
[Theory]
106-
[MemberData(nameof(IsAsyncData))]
107-
public override async Task FromSql_used_twice_with_parameters(bool async)
108-
{
109-
using var context = CreateContext();
110-
111-
var query = context.Set<OrderQuery>()
112-
.FromSqlRaw(NormalizeDelimitersInRawString("SELECT CAST({0} AS CHAR(5)) AS [CustomerID] FROM RDB$DATABASE"), "ALFKI")
113-
.IgnoreQueryFilters();
114-
115-
var result1 = async
116-
? await query.AnyAsync()
117-
: query.Any();
118-
119-
Assert.Equal(
120-
RelationalStrings.QueryFromSqlInsideExists,
121-
async
122-
? (await Assert.ThrowsAsync<InvalidOperationException>(() => query.AnyAsync())).Message
123-
: Assert.Throws<InvalidOperationException>(() => query.Any()).Message);
124-
}
84+
//[Theory]
85+
//[MemberData(nameof(IsAsyncData))]
86+
//public override async Task FromSql_used_twice_without_parameters(bool async)
87+
//{
88+
// using var context = CreateContext();
89+
90+
// var query = context.Set<OrderQuery>()
91+
// .FromSqlRaw(NormalizeDelimitersInRawString("SELECT 'ALFKI' AS [CustomerID] FROM RDB$DATABASE"))
92+
// .IgnoreQueryFilters();
93+
94+
// var result1 = async
95+
// ? await query.AnyAsync()
96+
// : query.Any();
97+
98+
// Assert.Equal(
99+
// RelationalStrings.QueryFromSqlInsideExists,
100+
// async
101+
// ? (await Assert.ThrowsAsync<InvalidOperationException>(() => query.AnyAsync())).Message
102+
// : Assert.Throws<InvalidOperationException>(() => query.Any()).Message);
103+
//}
104+
105+
//[Theory]
106+
//[MemberData(nameof(IsAsyncData))]
107+
//public override async Task FromSql_used_twice_with_parameters(bool async)
108+
//{
109+
// using var context = CreateContext();
110+
111+
// var query = context.Set<OrderQuery>()
112+
// .FromSqlRaw(NormalizeDelimitersInRawString("SELECT CAST({0} AS CHAR(5)) AS [CustomerID] FROM RDB$DATABASE"), "ALFKI")
113+
// .IgnoreQueryFilters();
114+
115+
// var result1 = async
116+
// ? await query.AnyAsync()
117+
// : query.Any();
118+
119+
// Assert.Equal(
120+
// RelationalStrings.QueryFromSqlInsideExists,
121+
// async
122+
// ? (await Assert.ThrowsAsync<InvalidOperationException>(() => query.AnyAsync())).Message
123+
// : Assert.Throws<InvalidOperationException>(() => query.Any()).Message);
124+
//}
125125

126126
[Theory(Skip = "Provider does the casting.")]
127127
[MemberData(nameof(IsAsyncData))]

‎src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/TestUtilities/FbTestHelpers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.TestUtilities;
2626

27-
public class FbTestHelpers : TestHelpers
27+
public class FbTestHelpers : RelationalTestHelpers
2828
{
2929
protected FbTestHelpers()
3030
{ }
@@ -34,7 +34,7 @@ protected FbTestHelpers()
3434
public override IServiceCollection AddProviderServices(IServiceCollection services)
3535
=> services.AddEntityFrameworkFirebird();
3636

37-
public override void UseProviderOptions(DbContextOptionsBuilder optionsBuilder)
37+
public override DbContextOptionsBuilder UseProviderOptions(DbContextOptionsBuilder optionsBuilder)
3838
=> optionsBuilder.UseFirebird(new FbConnection("database=localhost:_.fdb;user=sysdba;password=masterkey;charset=utf8"));
3939

4040
#pragma warning disable EF1001

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests;
2626

27-
public class UpdatesFbFixture : UpdatesRelationalFixture
27+
public class UpdatesFbFixture : UpdatesRelationalTestBase<UpdatesFbFixture>.UpdatesRelationalFixture
2828
{
2929
protected override ITestStoreFactory TestStoreFactory => FbTestStoreFactory.Instance;
3030

‎src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.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>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFrameworks>net7.0</TargetFrameworks>
44
<AssemblyName>FirebirdSql.EntityFrameworkCore.Firebird</AssemblyName>
55
<RootNamespace>FirebirdSql.EntityFrameworkCore.Firebird</RootNamespace>
66
<SignAssembly>true</SignAssembly>
@@ -29,8 +29,8 @@
2929
<None Include="..\..\firebird-logo.png" Pack="true" PackagePath="" />
3030
</ItemGroup>
3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.11" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.11" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
3434
</ItemGroup>
3535
<ItemGroup>
3636
<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />

‎src/FirebirdSql.EntityFrameworkCore.Firebird/Update/Internal/FbUpdateSqlGenerator.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,9 @@ public FbUpdateSqlGenerator(UpdateSqlGeneratorDependencies dependencies)
3232
: base(dependencies)
3333
{ }
3434

35-
protected override void AppendIdentityWhereCondition(StringBuilder commandStringBuilder, IColumnModification columnModification)
36-
=> throw new InvalidOperationException();
37-
38-
protected override void AppendRowsAffectedWhereCondition(StringBuilder commandStringBuilder, int expectedRowsAffected)
39-
=> throw new InvalidOperationException();
40-
4135
public override ResultSetMapping AppendInsertOperation(StringBuilder commandStringBuilder, IReadOnlyModificationCommand command, int commandPosition)
4236
{
43-
var result = ResultSetMapping.NoResultSet;
37+
var result = ResultSetMapping.NoResults;
4438
var name = command.TableName;
4539
var operations = command.ColumnModifications;
4640
var writeOperations = operations.Where(o => o.IsWrite).ToList();

0 commit comments

Comments
 (0)