Skip to content

Commit 042f843

Browse files
ChrisJollyAUChrisJollyAU
authored
Merge pull request #134 from ChrisJollyAU/ef7
Update to EF Core 7
2 parents 9597fbc + cef8109 commit 042f843

128 files changed

Lines changed: 4159 additions & 2080 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.

‎Dependencies.targets‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project>
22
<PropertyGroup>
33
<DotnetRuntimeVersion>6.0.10</DotnetRuntimeVersion>
4-
<EFCoreVersion>[$(DotnetRuntimeVersion), 7.0.0)</EFCoreVersion>
4+
<EFCoreVersion>[7.0.0, 8.0.0)</EFCoreVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<!-- Common -->
9-
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
10-
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
9+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
10+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
1111
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
1212
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
1313
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
14-
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
14+
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
1515
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
1616
<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
1717
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
@@ -24,7 +24,7 @@
2424
<!-- EFCore.Jet -->
2525
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
2626
<PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.0" />
27-
<PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
27+
<PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
2828
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
2929
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
3030
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
@@ -37,14 +37,14 @@
3737
<!--<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />-->
3838

3939
<!-- Tests -->
40-
<PackageReference Update="System.Data.Odbc" Version="6.0.1" />
41-
<PackageReference Update="System.Data.OleDb" Version="6.0.0" />
40+
<PackageReference Update="System.Data.Odbc" Version="7.0.0" />
41+
<PackageReference Update="System.Data.OleDb" Version="7.0.0" />
4242
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
4343
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
44-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
44+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.0" />
4545
<PackageReference Update="MSTest.TestAdapter" Version="2.2.10" />
4646
<PackageReference Update="MSTest.TestFramework" Version="2.2.10" />
47-
<PackageReference Update="coverlet.collector" Version="3.1.2" />
47+
<PackageReference Update="coverlet.collector" Version="3.2.0" />
4848
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
4949

5050
<!-- EntityFrameworkCore.Jet.Data.Tests -->
@@ -60,7 +60,7 @@
6060
<PackageReference Update="xunit.assert" Version="2.4.2" />
6161
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
6262
<PackageReference Update="xunit.runner.console" Version="2.4.2" />
63-
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
63+
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
6464
<!--<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />-->
6565
<!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
6666
<!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
@@ -82,7 +82,7 @@
8282

8383
<!-- EFCore.Jet.Tests -->
8484
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
85-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
85+
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
8686
<PackageReference Update="Moq" Version="4.18.2" />
8787
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />-->
8888
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->

‎Version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- "rtm"
99
- "servicing"
1010
-->
11-
<VersionPrefix>6.0.0</VersionPrefix>
11+
<VersionPrefix>7.0.0</VersionPrefix>
1212
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
1313
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
1414

‎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": "6.0.403",
3+
"version": "7.0.100",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

‎src/EFCore.Jet.Data/AdoxDatabaseCreator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public override void CreateDatabase(
1010
string fileNameOrConnectionString,
1111
DatabaseVersion version = DatabaseVersion.NewestSupported,
1212
CollatingOrder collatingOrder = CollatingOrder.General,
13-
string databasePassword = null)
13+
string? databasePassword = null)
1414
{
1515
if (databasePassword != null &&
1616
databasePassword.Length > 20)
@@ -40,7 +40,7 @@ public override void CreateDatabase(
4040
}
4141
}
4242

43-
private static string GetConnectionString(string filePath, DatabaseVersion version, CollatingOrder collatingOrder, string databasePassword)
43+
private static string GetConnectionString(string filePath, DatabaseVersion version, CollatingOrder collatingOrder, string? databasePassword)
4444
{
4545
var connectionString = JetConnection.GetConnectionString(filePath, DataAccessProviderType.OleDb);
4646

‎src/EFCore.Jet.Data/ComObject.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public object Detach()
7777
return instance;
7878
}
7979

80-
public override bool TryGetMember(GetMemberBinder binder, out object result)
80+
public override bool TryGetMember(GetMemberBinder binder, out object? result)
8181
{
8282
result = WrapIfRequired(
8383
_instance.GetType()
@@ -91,7 +91,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
9191
return true;
9292
}
9393

94-
public override bool TrySetMember(SetMemberBinder binder, object value)
94+
public override bool TrySetMember(SetMemberBinder binder, object? value)
9595
{
9696
_instance.GetType()
9797
.InvokeMember(
@@ -109,7 +109,7 @@ value is ComObject comObject
109109
return true;
110110
}
111111

112-
public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
112+
public override bool TryInvokeMember(InvokeMemberBinder binder, object?[]? args, out object? result)
113113
{
114114
result = WrapIfRequired(
115115
_instance.GetType()

‎src/EFCore.Jet.Data/DaoDatabaseCreator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public override void CreateDatabase(
1111
string fileNameOrConnectionString,
1212
DatabaseVersion version = DatabaseVersion.NewestSupported,
1313
CollatingOrder collatingOrder = CollatingOrder.General,
14-
string databasePassword = null)
14+
string? databasePassword = null)
1515
{
1616
if (databasePassword != null &&
1717
databasePassword.Length > 20)

‎src/EFCore.Jet.Data/DaoSchema.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public override DataTable GetColumns()
162162
// Therefore, either ADO has to be used, or DAO together with the GetSchema()
163163
// method (that contains precision and scale, but no default value when using ODBC, because again, looks
164164
// like someone at Microsoft just forgot to implement it).
165-
Dictionary<(string TableName, string ColumnName), int?> numericScales = null;
165+
Dictionary<(string TableName, string ColumnName), int?>? numericScales = null;
166166

167167
if (!_naturalOnly)
168168
{

‎src/EFCore.Jet.Data/DbConnectionStringBuilderExtensions.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace EntityFrameworkCore.Jet.Data
77
{
88
public static class DbConnectionStringBuilderExtensions
99
{
10-
public static string GetProvider(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
10+
public static string? GetProvider(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
1111
{
1212
if (providerType == DataAccessProviderType.OleDb ||
1313
IsOleDb(builder))
@@ -48,7 +48,7 @@ public static void SetProvider(this DbConnectionStringBuilder builder, string va
4848
throw new InvalidOperationException("This extension method only supports OdbcConnectionStringBuilder and OleDbConnectionStringBuilder.");
4949
}
5050

51-
public static string GetDataSource(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
51+
public static string? GetDataSource(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
5252
{
5353
if (providerType == DataAccessProviderType.OleDb ||
5454
IsOleDb(builder))
@@ -89,7 +89,7 @@ public static void SetDataSource(this DbConnectionStringBuilder builder, string
8989
throw new InvalidOperationException("This extension method only supports OdbcConnectionStringBuilder and OleDbConnectionStringBuilder.");
9090
}
9191

92-
public static string GetUserId(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
92+
public static string? GetUserId(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
9393
{
9494
if (IsOleDb(builder))
9595
{
@@ -129,7 +129,7 @@ public static void SetUserId(this DbConnectionStringBuilder builder, string valu
129129
throw new InvalidOperationException("This extension method only supports OdbcConnectionStringBuilder and OleDbConnectionStringBuilder.");
130130
}
131131

132-
public static string GetPassword(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
132+
public static string? GetPassword(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
133133
{
134134
if (providerType == DataAccessProviderType.OleDb ||
135135
IsOleDb(builder))
@@ -179,7 +179,7 @@ public static void SetPassword(this DbConnectionStringBuilder builder, string va
179179
throw new InvalidOperationException("This extension method only supports OdbcConnectionStringBuilder and OleDbConnectionStringBuilder.");
180180
}
181181

182-
public static string GetSystemDatabase(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
182+
public static string? GetSystemDatabase(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
183183
{
184184
if (providerType == DataAccessProviderType.OleDb ||
185185
IsOleDb(builder))
@@ -220,7 +220,7 @@ public static void SetSystemDatabase(this DbConnectionStringBuilder builder, str
220220
throw new InvalidOperationException("This extension method only supports OdbcConnectionStringBuilder and OleDbConnectionStringBuilder.");
221221
}
222222

223-
public static string GetDatabasePassword(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
223+
public static string? GetDatabasePassword(this DbConnectionStringBuilder builder, DataAccessProviderType? providerType = null)
224224
{
225225
if (providerType == DataAccessProviderType.OleDb ||
226226
IsOleDb(builder))

‎src/EFCore.Jet.Data/EFCore.Jet.Data.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
88
<RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>
99
<PackageTags>$(PackageTags);System.Data.Jet</PackageTags>
10+
<Nullable>annotations</Nullable>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎src/EFCore.Jet.Data/IJetDatabaseCreator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ void CreateDatabase(
4747
string fileNameOrConnectionString,
4848
DatabaseVersion version = DatabaseVersion.NewestSupported,
4949
CollatingOrder collatingOrder = CollatingOrder.General,
50-
string databasePassword = null);
50+
string? databasePassword = null);
5151
}
5252
}

0 commit comments

Comments
 (0)