Update to .Net6

Dependencies.targets

@@ -1,34 +1,34 @@
 <Project>
   <PropertyGroup>
-    <DotnetRuntimeVersion>5.0.14</DotnetRuntimeVersion>
-    <EFCoreVersion>[$(DotnetRuntimeVersion), 6.0.0)</EFCoreVersion>
+    <DotnetRuntimeVersion>6.0.10</DotnetRuntimeVersion>
+    <EFCoreVersion>[$(DotnetRuntimeVersion), 7.0.0)</EFCoreVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- Common -->
-    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
     <PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 
     <!-- EntityFrameworkCore.Jet.Data -->
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />
     <PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
 
     <!-- EFCore.Jet -->
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
-    <PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
-    <PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
+    <PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0" />
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />-->
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
     <!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
@@ -37,13 +37,13 @@
     <!--<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />-->
 
     <!-- Tests -->
-    <PackageReference Update="System.Data.Odbc" Version="5.0.0" />
-    <PackageReference Update="System.Data.OleDb" Version="5.0.0" />
+    <PackageReference Update="System.Data.Odbc" Version="6.0.1" />
+    <PackageReference Update="System.Data.OleDb" Version="6.0.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Update="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Update="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Update="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Update="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Update="coverlet.collector" Version="3.1.2" />
     <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 
@@ -56,11 +56,11 @@
     <!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
 
     <!-- EFCore.Jet.FunctionalTests -->
-    <PackageReference Update="xunit.core" Version="2.4.1" />
-    <PackageReference Update="xunit.assert" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Update="xunit.runner.console" Version="2.4.1" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+    <PackageReference Update="xunit.core" Version="2.4.2" />
+    <PackageReference Update="xunit.assert" Version="2.4.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageReference Update="xunit.runner.console" Version="2.4.2" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
     <!--<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />-->
     <!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
     <!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
@@ -81,9 +81,9 @@
     <!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
 
     <!-- EFCore.Jet.Tests -->
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
-    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
-    <PackageReference Update="Moq" Version="4.16.1" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
+    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
+    <PackageReference Update="Moq" Version="4.18.2" />
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />-->
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion)" />-->

Directory.Build.props

@@ -23,9 +23,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
-    <WindowsOnlyNetCoreTargetFramework>net5.0-windows</WindowsOnlyNetCoreTargetFramework>
-    <DefaultNetCoreLegacyTargetFramework>netcoreapp5.0</DefaultNetCoreLegacyTargetFramework>
+    <DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
+    <WindowsOnlyNetCoreTargetFramework>net6.0-windows</WindowsOnlyNetCoreTargetFramework>
+    <DefaultNetCoreLegacyTargetFramework>netcoreapp6.0</DefaultNetCoreLegacyTargetFramework>
     <DefaultNetStandardTargetFramework>netstandard2.1</DefaultNetStandardTargetFramework>
   </PropertyGroup>
 

EFCore.Jet.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29806.167
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32916.344
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F68095EE-6CD1-43A2-B498-6CA72CE2A0CB}"
 	ProjectSection(SolutionItems) = preProject
@@ -30,18 +30,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B7FF1850-2
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
-ProjectSection(SolutionItems) = preProject
-	Directory.Build.props = Directory.Build.props
-	NuGet.Config = NuGet.Config
-	Directory.Build.targets = Directory.Build.targets
-	global.json = global.json
-	Dependencies.targets = Dependencies.targets
-	Version.props = Version.props
-	Development.props = Development.props
-	Development.props.sample = Development.props.sample
-	Key.snk = Key.snk
-	docs\README.md = docs\README.md
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		Dependencies.targets = Dependencies.targets
+		Development.props = Development.props
+		Development.props.sample = Development.props.sample
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		global.json = global.json
+		Key.snk = Key.snk
+		NuGet.Config = NuGet.Config
+		docs\README.md = docs\README.md
+		Version.props = Version.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
 EndProject
@@ -52,9 +52,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{84E4151A
 		tools\Resources.tt = tools\Resources.tt
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Odbc", "src\EFCore.Jet.Odbc\EFCore.Jet.Odbc.csproj", "{1E0729DA-B861-46EA-B1F1-3AE20EA1E00A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Odbc", "src\EFCore.Jet.Odbc\EFCore.Jet.Odbc.csproj", "{1E0729DA-B861-46EA-B1F1-3AE20EA1E00A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.OleDb", "src\EFCore.Jet.OleDb\EFCore.Jet.OleDb.csproj", "{FFC89A2D-F68F-47E3-BA00-47E9C0BEDB71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.OleDb", "src\EFCore.Jet.OleDb\EFCore.Jet.OleDb.csproj", "{FFC89A2D-F68F-47E3-BA00-47E9C0BEDB71}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -130,8 +130,8 @@ Global
 		{770A076B-A448-499C-BB86-A37994C04523}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{770A076B-A448-499C-BB86-A37994C04523}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{770A076B-A448-499C-BB86-A37994C04523}.Debug|x64.Build.0 = Debug|Any CPU
-		{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.Build.0 = Debug|Any CPU
+		{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.ActiveCfg = Debug|x86
+		{770A076B-A448-499C-BB86-A37994C04523}.Debug|x86.Build.0 = Debug|x86
 		{770A076B-A448-499C-BB86-A37994C04523}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{770A076B-A448-499C-BB86-A37994C04523}.Release|Any CPU.Build.0 = Release|Any CPU
 		{770A076B-A448-499C-BB86-A37994C04523}.Release|x64.ActiveCfg = Release|Any CPU

Version.props

@@ -8,7 +8,7 @@
           - "rtm"
           - "servicing"
     -->
-    <VersionPrefix>5.0.0</VersionPrefix>
+    <VersionPrefix>6.0.0</VersionPrefix>
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.405",
+    "version": "6.0.403",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }

src/EFCore.Jet.Data/AdoxSchema.cs

@@ -424,8 +424,8 @@ public override DataTable GetRelations()
                         referencingTableName,
                         principalTableName,
                         relationType,
-                        onUpdate,
                         onDelete,
+                        onUpdate,
                         isEnforced,
                         isInherited);
                 }

src/EFCore.Jet.Data/DaoSchema.cs

@@ -435,8 +435,8 @@ public override DataTable GetRelations()
                     referencingTableName,
                     principalTableName,
                     relationType,
-                    onUpdate,
                     onDelete,
+                    onUpdate,
                     isEnforced,
                     isInherited);
             }
@@ -682,6 +682,33 @@ protected static Dictionary<string, object> GetProperties(dynamic properties)
             return ordinalPositions;
         }
 
+        public Dictionary<string,(string relationType,bool isEnforced,bool isInherited)> GetRelationTypes()
+        {
+            var result = new Dictionary<string, (string,bool,bool)>();
+            using var relations = _database.Relations;
+            var relationCount = (int)relations.Count;
+
+            for (var i = 0; i < relationCount; i++)
+            {
+                using var relation = relations[i];
+
+                var relationName = (string)relation.Name;
+                var attributes = (RelationAttributeEnum)relation.Attributes;
+
+                var relationType = (attributes & RelationAttributeEnum.dbRelationUnique) == RelationAttributeEnum.dbRelationUnique
+                    ? "ONE"
+                    : "MANY";
+
+                var isEnforced = (attributes & RelationAttributeEnum.dbRelationDontEnforce) != RelationAttributeEnum.dbRelationDontEnforce;
+
+                var isInherited = (attributes & RelationAttributeEnum.dbRelationInherited) != RelationAttributeEnum.dbRelationInherited;
+
+                result.Add(relationName, (relationType,isEnforced,isInherited));
+            }
+
+            return result;
+        }
+
         public override void Dispose()
         {
             _database.Dispose();

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

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files).</Description>
-        <TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
+        <TargetFramework>net6.0-windows</TargetFramework>
         <Platforms>AnyCPU;x86;x64</Platforms>
         <AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
         <RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>

src/EFCore.Jet.Data/JetCommand.cs

@@ -398,7 +398,6 @@ protected virtual IReadOnlyList<JetCommand> SplitCommands()
                 var commandText = CommandText.Trim();
                 if (!string.IsNullOrEmpty(commandText))
                 {
-                    CommandText = commandText;
                     commands.Add(this);
                 }
             }

src/EFCore.Jet.Data/JetFactory.cs

@@ -9,8 +9,8 @@ namespace EntityFrameworkCore.Jet.Data
     /// </summary>
     public class JetFactory : DbProviderFactory
     {
-        public static readonly Version MinimumRequiredOdbcVersion = new Version(5, 0, 0);
-        public static readonly Version MinimumRequiredOleDbVersion = new Version(5, 0, 0);
+        public static readonly Version MinimumRequiredOdbcVersion = new Version(6, 0, 0);
+        public static readonly Version MinimumRequiredOleDbVersion = new Version(6, 0, 0);
 
         public static readonly JetFactory Instance = new JetFactory(null, null);
 

src/EFCore.Jet.Data/PreciseSchema.cs

@@ -49,13 +49,33 @@ public override DataTable GetIndexes()
             => _adoxSchema.Value.GetIndexes(); // either ADOX or DAO is fine
 
         public override DataTable GetIndexColumns()
-            => _daoSchema.Value.GetIndexColumns(); // either ADOX or DAO is fine
+            => _adoxSchema.Value.GetIndexColumns(); // either ADOX or DAO is fine
 
+        //ADOX can get more detail for the onupdate and ondelete rules (set null and set default)
+        //DAO can get the relation type (1 to 1 or 1 to many)
+        //DAO can get isenforced and isherited
         public override DataTable GetRelations()
-            => _daoSchema.Value.GetRelations(); // either ADOX or DAO is fine
+        {
+            var dataTable = _adoxSchema.Value.GetRelations();
+            var reltypes = _daoSchema.Value.GetRelationTypes();
+
+            foreach (DataRow row in dataTable.Rows)
+            {
+                var relationName = (string)row["RELATION_NAME"];
+
+                if (reltypes.TryGetValue(relationName, out var relationType))
+                {
+                    row["RELATION_TYPE"] = relationType.relationType;
+                    row["IS_ENFORCED"] = relationType.isEnforced;
+                    row["IS_INHERITED"] = relationType.isInherited;
+                }
+            }
+            dataTable.AcceptChanges();
+            return dataTable;
+        }
 
         public override DataTable GetRelationColumns()
-            => _daoSchema.Value.GetRelationColumns(); // either ADOX or DAO is fine
+            => _adoxSchema.Value.GetRelationColumns(); // either ADOX or DAO is fine
 
         public override DataTable GetCheckConstraints()
             => _adoxSchema.Value.GetCheckConstraints(); // DAO does not support CHECK CONSTRAINTs, but ADOX does

src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Explicit ODBC support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
-    <TargetFramework>$(WindowsOnlyNetCoreTargetFramework)</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AssemblyName>EntityFrameworkCore.Jet.Odbc</AssemblyName>
     <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
     <PackageTags>$(PackageTags);ODBC;System.Data.Odbc</PackageTags>

src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Explicit OLE DB support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
-    <TargetFramework>$(WindowsOnlyNetCoreTargetFramework)</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <AssemblyName>EntityFrameworkCore.Jet.OleDb</AssemblyName>
     <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
     <PackageTags>$(PackageTags);OLE DB;OLEDB;System.Data.OleDb</PackageTags>

src/EFCore.Jet/Design/Internal/JetDesignTimeServices.cs

@@ -5,7 +5,9 @@
 using EntityFrameworkCore.Jet.Internal;
 using EntityFrameworkCore.Jet.Scaffolding.Internal;
 using EntityFrameworkCore.Jet.Storage.Internal;
+using EntityFrameworkCore.Jet.Update.Internal;
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -28,12 +30,15 @@ public class JetDesignTimeServices : IDesignTimeServices
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollection)
-            => serviceCollection
-                .AddSingleton<LoggingDefinitions, JetLoggingDefinitions>()
-                .AddSingleton<IRelationalTypeMappingSource, JetTypeMappingSource>()
-                .AddSingleton<IDatabaseModelFactory, JetDatabaseModelFactory>()
-                .AddSingleton<IProviderConfigurationCodeGenerator, JetCodeGenerator>()
-                .AddSingleton<IAnnotationCodeGenerator, JetAnnotationCodeGenerator>()
-                .AddSingleton<IJetOptions, JetOptions>();
+        {
+            serviceCollection.AddEntityFrameworkJet();
+#pragma warning disable EF1001 // Internal EF Core API usage.
+            new EntityFrameworkRelationalDesignServicesBuilder(serviceCollection)
+                .TryAdd<IAnnotationCodeGenerator, JetAnnotationCodeGenerator>()
+#pragma warning restore EF1001 // Internal EF Core API usage.
+                .TryAdd<IDatabaseModelFactory, JetDatabaseModelFactory>()
+                .TryAdd<IProviderConfigurationCodeGenerator, JetCodeGenerator>()
+                .TryAddCoreServices();
+        }
     }
 }

src/EFCore.Jet/EFCore.Jet.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
-    <TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
     <AssemblyName>EntityFrameworkCore.Jet</AssemblyName>
     <Platforms>AnyCPU;x86;x64</Platforms>