Skip to content

Commit 3ee8fea

Browse files
ChrisJollyAUChrisJollyAU
authored
Update dependencies to EFC 9 GA (#273)
* update to match efc 9 ga * fix tests * fix odbc * fix another test * Add some missed tests in MigrationsInfrastructure
1 parent dd24f9a commit 3ee8fea

37 files changed

+776
-620
lines changed

‎Dependencies.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<DotNetVersion>[9.0.0-rc.2.24473.5,9.0.999]</DotNetVersion>
4-
<EFCoreVersion>[9.0.0-rc.2.24474.1,9.0.999]</EFCoreVersion>
5-
<MSLibVersion>[9.0.0-rc.2.24473.5,9.0.999]</MSLibVersion>
3+
<DotNetVersion>[9.0.0,9.0.999]</DotNetVersion>
4+
<EFCoreVersion>[9.0.0,9.0.999]</EFCoreVersion>
5+
<MSLibVersion>[9.0.0,9.0.999]</MSLibVersion>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -29,8 +29,8 @@
2929
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
3030
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(MSLibVersion)" />
3131
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
32-
<PackageReference Update="MSTest.TestAdapter" Version="3.6.1" />
33-
<PackageReference Update="MSTest.TestFramework" Version="3.6.1" />
32+
<PackageReference Update="MSTest.TestAdapter" Version="3.6.3" />
33+
<PackageReference Update="MSTest.TestFramework" Version="3.6.3" />
3434
<PackageReference Update="coverlet.collector" Version="6.0.2" />
3535
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
3636

‎EFCore.Jet.sln‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Odbc", "src\EFCo
5656
EndProject
5757
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.OleDb", "src\EFCore.Jet.OleDb\EFCore.Jet.OleDb.csproj", "{FFC89A2D-F68F-47E3-BA00-47E9C0BEDB71}"
5858
EndProject
59-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{05A38BCD-0042-446F-8E89-84090230BE76}"
60-
ProjectSection(SolutionItems) = preProject
61-
.editorconfig = .editorconfig
62-
EndProjectSection
63-
EndProject
6459
Global
6560
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6661
Debug|Any CPU = Debug|Any CPU

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.2.24474.11",
3+
"version": "9.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}

‎src/EFCore.Jet/Query/Sql/Internal/JetQuerySqlGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ private List<ColumnExpression> ExtractColumnExpressions(SqlUnaryExpression unary
347347

348348
return result;
349349
}
350-
350+
351351
protected override Expression VisitProjection(ProjectionExpression projectionExpression)
352352
{
353353
if (projectionExpression.Expression is SqlConstantExpression { Value: null } constantExpression && (constantExpression.Type == typeof(int) || constantExpression.Type == typeof(double) || constantExpression.Type == typeof(float) || constantExpression.Type == typeof(decimal) || constantExpression.Type == typeof(short)))

‎test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_odbc_x86.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8178,18 +8178,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTe
81788178
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_diff_against_2_2_ASP_NET_Identity_model
81798179
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_diff_against_2_2_model
81808180
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_diff_against_3_0_ASP_NET_Identity_model
8181-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_down_script_using_names
8182-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_down_scripts
8183-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_idempotent_down_scripts
8184-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_idempotent_up_scripts
8185-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_idempotent_up_scripts_noTransactions
81868181
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_migration_from_initial_database_to_initial
81878182
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_no_migration_script
8188-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_one_down_script
8189-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_one_up_script
8190-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_up_script_using_names
8191-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_up_scripts
8192-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_up_scripts_noTransactions
81938183
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_get_active_provider
81948184
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_revert_all_migrations
81958185
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_revert_one_migrations
@@ -10220,7 +10210,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Pus
1022010210
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Pushdown_does_not_add_grouping_key_to_projection_when_distinct_is_applied(async: True)
1022110211
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Query_cache_entries_are_evicted_as_necessary
1022210212
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.QueryBuffer_requirement_is_computed_when_querying_base_type_while_derived_type_has_shadow_prop
10223-
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.SaveChangesAsync_accepts_changes_with_ConfigureAwait_true
1022410213
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Shadow_property_with_inheritance
1022510214
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Subquery_first_member_compared_to_null(async: False)
1022610215
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Subquery_first_member_compared_to_null(async: True)

‎test/EFCore.Jet.FunctionalTests/GreenTests/ace_2010_oledb_x86.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8250,18 +8250,8 @@ EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTe
82508250
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_diff_against_2_2_ASP_NET_Identity_model
82518251
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_diff_against_2_2_model
82528252
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_diff_against_3_0_ASP_NET_Identity_model
8253-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_down_script_using_names
8254-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_down_scripts
8255-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_idempotent_down_scripts
8256-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_idempotent_up_scripts
8257-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_idempotent_up_scripts_noTransactions
82588253
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_migration_from_initial_database_to_initial
82598254
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_no_migration_script
8260-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_one_down_script
8261-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_one_up_script
8262-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_up_script_using_names
8263-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_up_scripts
8264-
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_generate_up_scripts_noTransactions
82658255
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_get_active_provider
82668256
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_revert_all_migrations
82678257
EntityFrameworkCore.Jet.FunctionalTests.Migrations.MigrationsInfrastructureJetTest.Can_revert_one_migrations
@@ -10333,7 +10323,6 @@ EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Que
1033310323
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.QueryBuffer_requirement_is_computed_when_querying_base_type_while_derived_type_has_shadow_prop
1033410324
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Relational_command_cache_creates_new_entry_when_parameter_nullability_changes
1033510325
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Repeated_parameters_in_generated_query_sql
10336-
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.SaveChangesAsync_accepts_changes_with_ConfigureAwait_true
1033710326
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Select_nested_projection
1033810327
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.Shadow_property_with_inheritance
1033910328
EntityFrameworkCore.Jet.FunctionalTests.Query.AdHocMiscellaneousQueryJetTest.StoreType_for_UDF_used(async: False)

‎test/EFCore.Jet.FunctionalTests/JetValueGenerationScenariosTestBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
11231123
}
11241124
}
11251125

1126-
[ConditionalFact]
1126+
[ConditionalFact(Skip = "Jet can't return server generated guid's when it is the key. Currently using client geerated guid's")]
11271127
public async Task Insert_with_server_generated_GUID_key()
11281128
{
11291129
using var testStore = await JetTestStore.CreateInitializedAsync(DatabaseName);

0 commit comments

Comments
 (0)