Skip to content

Commit 9573229

Browse files
ChrisJollyAUChrisJollyAU
authored
Merge pull request #131 from ChrisJollyAU/net6
Update to .Net6
2 parents 6a8ccd2 + 4219015 commit 9573229

File tree

120 files changed

+6824
-6219
lines changed

Some content is hidden

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

120 files changed

+6824
-6219
lines changed

‎Dependencies.targets

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

77
<ItemGroup>
88
<!-- Common -->
9-
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
10-
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
11-
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
9+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
10+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
11+
<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="5.0.1" />
14+
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.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" />
1818

1919
<!-- EntityFrameworkCore.Jet.Data -->
2020
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
2121
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
22-
<PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
22+
<PackageReference Update="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
2323

2424
<!-- EFCore.Jet -->
25-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
26-
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
27-
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
28-
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
25+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
26+
<PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.0" />
27+
<PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
28+
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
2929
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
30-
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
31-
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
30+
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
31+
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0" />
3232
<!--<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />-->
3333
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
3434
<!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
@@ -37,13 +37,13 @@
3737
<!--<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />-->
3838

3939
<!-- Tests -->
40-
<PackageReference Update="System.Data.Odbc" Version="5.0.0" />
41-
<PackageReference Update="System.Data.OleDb" Version="5.0.0" />
40+
<PackageReference Update="System.Data.Odbc" Version="6.0.1" />
41+
<PackageReference Update="System.Data.OleDb" Version="6.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.0.0" />
45-
<PackageReference Update="MSTest.TestAdapter" Version="2.2.8" />
46-
<PackageReference Update="MSTest.TestFramework" Version="2.2.8" />
44+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
45+
<PackageReference Update="MSTest.TestAdapter" Version="2.2.10" />
46+
<PackageReference Update="MSTest.TestFramework" Version="2.2.10" />
4747
<PackageReference Update="coverlet.collector" Version="3.1.2" />
4848
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
4949

@@ -56,11 +56,11 @@
5656
<!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
5757

5858
<!-- EFCore.Jet.FunctionalTests -->
59-
<PackageReference Update="xunit.core" Version="2.4.1" />
60-
<PackageReference Update="xunit.assert" Version="2.4.1" />
61-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
62-
<PackageReference Update="xunit.runner.console" Version="2.4.1" />
63-
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
59+
<PackageReference Update="xunit.core" Version="2.4.2" />
60+
<PackageReference Update="xunit.assert" Version="2.4.2" />
61+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
62+
<PackageReference Update="xunit.runner.console" Version="2.4.2" />
63+
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="6.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)" />-->
@@ -81,9 +81,9 @@
8181
<!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
8282

8383
<!-- EFCore.Jet.Tests -->
84-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
85-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
86-
<PackageReference Update="Moq" Version="4.16.1" />
84+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
85+
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
86+
<PackageReference Update="Moq" Version="4.18.2" />
8787
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />-->
8888
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
8989
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion)" />-->

‎Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
</PropertyGroup>
2424

2525
<PropertyGroup>
26-
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
27-
<WindowsOnlyNetCoreTargetFramework>net5.0-windows</WindowsOnlyNetCoreTargetFramework>
28-
<DefaultNetCoreLegacyTargetFramework>netcoreapp5.0</DefaultNetCoreLegacyTargetFramework>
26+
<DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
27+
<WindowsOnlyNetCoreTargetFramework>net6.0-windows</WindowsOnlyNetCoreTargetFramework>
28+
<DefaultNetCoreLegacyTargetFramework>netcoreapp6.0</DefaultNetCoreLegacyTargetFramework>
2929
<DefaultNetStandardTargetFramework>netstandard2.1</DefaultNetStandardTargetFramework>
3030
</PropertyGroup>
3131

‎EFCore.Jet.sln

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29806.167
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.32916.344
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F68095EE-6CD1-43A2-B498-6CA72CE2A0CB}"
77
ProjectSection(SolutionItems) = preProject
@@ -30,18 +30,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B7FF1850-2
3030
EndProjectSection
3131
EndProject
3232
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
33-
ProjectSection(SolutionItems) = preProject
34-
Directory.Build.props = Directory.Build.props
35-
NuGet.Config = NuGet.Config
36-
Directory.Build.targets = Directory.Build.targets
37-
global.json = global.json
38-
Dependencies.targets = Dependencies.targets
39-
Version.props = Version.props
40-
Development.props = Development.props
41-
Development.props.sample = Development.props.sample
42-
Key.snk = Key.snk
43-
docs\README.md = docs\README.md
44-
EndProjectSection
33+
ProjectSection(SolutionItems) = preProject
34+
Dependencies.targets = Dependencies.targets
35+
Development.props = Development.props
36+
Development.props.sample = Development.props.sample
37+
Directory.Build.props = Directory.Build.props
38+
Directory.Build.targets = Directory.Build.targets
39+
global.json = global.json
40+
Key.snk = Key.snk
41+
NuGet.Config = NuGet.Config
42+
docs\README.md = docs\README.md
43+
Version.props = Version.props
44+
EndProjectSection
4545
EndProject
4646
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
4747
EndProject
@@ -52,9 +52,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{84E4151A
5252
tools\Resources.tt = tools\Resources.tt
5353
EndProjectSection
5454
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Odbc", "src\EFCore.Jet.Odbc\EFCore.Jet.Odbc.csproj", "{1E0729DA-B861-46EA-B1F1-3AE20EA1E00A}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Odbc", "src\EFCore.Jet.Odbc\EFCore.Jet.Odbc.csproj", "{1E0729DA-B861-46EA-B1F1-3AE20EA1E00A}"
5656
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.OleDb", "src\EFCore.Jet.OleDb\EFCore.Jet.OleDb.csproj", "{FFC89A2D-F68F-47E3-BA00-47E9C0BEDB71}"
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.OleDb", "src\EFCore.Jet.OleDb\EFCore.Jet.OleDb.csproj", "{FFC89A2D-F68F-47E3-BA00-47E9C0BEDB71}"
5858
EndProject
5959
Global
6060
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -130,8 +130,8 @@ Global
130130
{770A076B-A448-499C-BB86-A37994C04523}.Debug|Any CPU.Build.0 = Debug|Any CPU
131131
{770A076B-A448-499C-BB86-A37994C04523}.Debug|x64.ActiveCfg = Debug|Any CPU
132132
{770A076B-A448-499C-BB86-A37994C04523}.Debug|x64.Build.0 = Debug|Any CPU
133-
{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.ActiveCfg = Debug|Any CPU
134-
{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.Build.0 = Debug|Any CPU
133+
{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.ActiveCfg = Debug|x86
134+
{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.Build.0 = Debug|x86
135135
{770A076B-A448-499C-BB86-A37994C04523}.Release|Any CPU.ActiveCfg = Release|Any CPU
136136
{770A076B-A448-499C-BB86-A37994C04523}.Release|Any CPU.Build.0 = Release|Any CPU
137137
{770A076B-A448-499C-BB86-A37994C04523}.Release|x64.ActiveCfg = Release|Any CPU

‎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>5.0.0</VersionPrefix>
11+
<VersionPrefix>6.0.0</VersionPrefix>
1212
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
1313
<PreReleaseVersionIteration>1</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": "5.0.405",
3+
"version": "6.0.403",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ public override DataTable GetRelations()
424424
referencingTableName,
425425
principalTableName,
426426
relationType,
427-
onUpdate,
428427
onDelete,
428+
onUpdate,
429429
isEnforced,
430430
isInherited);
431431
}

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ public override DataTable GetRelations()
435435
referencingTableName,
436436
principalTableName,
437437
relationType,
438-
onUpdate,
439438
onDelete,
439+
onUpdate,
440440
isEnforced,
441441
isInherited);
442442
}
@@ -682,6 +682,33 @@ protected static Dictionary<string, object> GetProperties(dynamic properties)
682682
return ordinalPositions;
683683
}
684684

685+
public Dictionary<string,(string relationType,bool isEnforced,bool isInherited)> GetRelationTypes()
686+
{
687+
var result = new Dictionary<string, (string,bool,bool)>();
688+
using var relations = _database.Relations;
689+
var relationCount = (int)relations.Count;
690+
691+
for (var i = 0; i < relationCount; i++)
692+
{
693+
using var relation = relations[i];
694+
695+
var relationName = (string)relation.Name;
696+
var attributes = (RelationAttributeEnum)relation.Attributes;
697+
698+
var relationType = (attributes & RelationAttributeEnum.dbRelationUnique) == RelationAttributeEnum.dbRelationUnique
699+
? "ONE"
700+
: "MANY";
701+
702+
var isEnforced = (attributes & RelationAttributeEnum.dbRelationDontEnforce) != RelationAttributeEnum.dbRelationDontEnforce;
703+
704+
var isInherited = (attributes & RelationAttributeEnum.dbRelationInherited) != RelationAttributeEnum.dbRelationInherited;
705+
706+
result.Add(relationName, (relationType,isEnforced,isInherited));
707+
}
708+
709+
return result;
710+
}
711+
685712
public override void Dispose()
686713
{
687714
_database.Dispose();

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

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

33
<PropertyGroup>
44
<Description>Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files).</Description>
5-
<TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<Platforms>AnyCPU;x86;x64</Platforms>
77
<AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
88
<RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ protected virtual IReadOnlyList<JetCommand> SplitCommands()
398398
var commandText = CommandText.Trim();
399399
if (!string.IsNullOrEmpty(commandText))
400400
{
401-
CommandText = commandText;
402401
commands.Add(this);
403402
}
404403
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ namespace EntityFrameworkCore.Jet.Data
99
/// </summary>
1010
public class JetFactory : DbProviderFactory
1111
{
12-
public static readonly Version MinimumRequiredOdbcVersion = new Version(5, 0, 0);
13-
public static readonly Version MinimumRequiredOleDbVersion = new Version(5, 0, 0);
12+
public static readonly Version MinimumRequiredOdbcVersion = new Version(6, 0, 0);
13+
public static readonly Version MinimumRequiredOleDbVersion = new Version(6, 0, 0);
1414

1515
public static readonly JetFactory Instance = new JetFactory(null, null);
1616

0 commit comments

Comments
 (0)