Update to .Net 5

Dependencies.targets

@@ -1,34 +1,34 @@
 <Project>
   <PropertyGroup>
-    <EFCoreVersion>[3.1.15, 5.0.0)</EFCoreVersion>
-    <MicrosoftExtensionsVersion>3.1.15</MicrosoftExtensionsVersion>
+    <DotnetRuntimeVersion>5.0.6</DotnetRuntimeVersion>
+    <EFCoreVersion>[$(DotnetRuntimeVersion), 6.0.0)</EFCoreVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- Common -->
-    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsVersion)" />
+    <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.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.7.1" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
     <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.0.0" />
 
     <!-- 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="4.7.0" />
+    <PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
 
     <!-- EFCore.Jet -->
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <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.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
-    <PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
+    <PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />-->
     <!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
     <!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
@@ -41,10 +41,11 @@
     <PackageReference Update="System.Data.OleDb" Version="5.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="16.5.0" />
-    <PackageReference Update="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Update="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Update="coverlet.collector" Version="1.2.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Update="MSTest.TestAdapter" Version="2.2.4" />
+    <PackageReference Update="MSTest.TestFramework" Version="2.2.4" />
+    <PackageReference Update="coverlet.collector" Version="3.0.3" />
+    <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 
     <!-- EntityFrameworkCore.Jet.Data.Tests -->
     <!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
@@ -57,16 +58,16 @@
     <!-- 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.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="$(MicrosoftExtensionsVersion)" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="5.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)" />-->
     <!--<PackageReference Update="System.Data.OleDb" Version="$(SystemDataOleDbVersion)" />-->
-    <PackageReference Update="NetTopologySuite" Version="2.0.0" />
+    <PackageReference Update="NetTopologySuite" Version="2.2.0" />
     <PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
-    <PackageReference Update="Castle.Core" Version="4.4.0" />
+    <PackageReference Update="Castle.Core" Version="4.4.1" />
     <!--<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />-->
 
     <!-- EFCore.Jet.IntegrationTests -->
@@ -80,9 +81,9 @@
     <!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
 
     <!-- EFCore.Jet.Tests -->
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
-    <PackageReference Update="Moq" Version="4.13.1" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
+    <PackageReference Update="Moq" Version="4.16.1" />
     <!--<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

@@ -6,9 +6,9 @@
     <Product>EntityFrameworkCore.Jet</Product>
     <Authors>Laurents Meyer, Bubi</Authors>
     <Company>Bubi</Company>
-    <Copyright>Copyright © 2017-2020 Bubi</Copyright>
+    <Copyright>Copyright © 2017-2021 Bubi</Copyright>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <DebugType>portable</DebugType>
     <IsPackable>False</IsPackable>
     <!-- <PackageReleaseNotes>TODO</PackageReleaseNotes> -->
@@ -23,8 +23,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
-    <DefaultNetStandardTargetFramework>netstandard2.0</DefaultNetStandardTargetFramework>
+    <DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
+    <WindowsOnlyNetCoreTargetFramework>net5.0-windows</WindowsOnlyNetCoreTargetFramework>
+    <DefaultNetCoreLegacyTargetFramework>netcoreapp5.0</DefaultNetCoreLegacyTargetFramework>
+    <DefaultNetStandardTargetFramework>netstandard2.1</DefaultNetStandardTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

EFCore.Jet.sln

@@ -4,14 +4,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F68095EE-6CD1-43A2-B498-6CA72CE2A0CB}"
-ProjectSection(SolutionItems) = preProject
-	src\Directory.Build.props = src\Directory.Build.props
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A8DE399-1804-4113-A408-F23B7F5C9CAC}"
 	ProjectSection(SolutionItems) = preProject
-		SkipMessages.txt = SkipMessages.txt
 		test\Directory.Build.props = test\Directory.Build.props
+		SkipMessages.txt = SkipMessages.txt
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Data", "src\EFCore.Jet.Data\EFCore.Jet.Data.csproj", "{88BE8B4F-8DA9-42B9-9A1F-839451BA5F8C}"
@@ -43,14 +43,14 @@ ProjectSection(SolutionItems) = preProject
 	docs\README.md = docs\README.md
 EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JetProviderExceptionTests", "test\JetProviderExceptionTests\JetProviderExceptionTests.csproj", "{5CD8B47D-E32C-480A-8331-55549EC8E12E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JetProviderExceptionTests", "test\JetProviderExceptionTests\JetProviderExceptionTests.csproj", "{5CD8B47D-E32C-480A-8331-55549EC8E12E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{84E4151A-DA0B-43C0-B1DD-F027241FE49F}"
-ProjectSection(SolutionItems) = preProject
-	tools\Resources.tt = tools\Resources.tt
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		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}"
 EndProject
@@ -140,12 +140,12 @@ Global
 		{770A076B-A448-499C-BB86-A37994C04523}.Release|x86.Build.0 = Release|Any CPU
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x64.ActiveCfg = Debug|x64
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x64.Build.0 = Debug|x64
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x86.ActiveCfg = Debug|x86
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x86.Build.0 = Debug|x86
+		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|x64.ActiveCfg = Release|x64
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|x64.Build.0 = Release|x64
 		{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|x86.ActiveCfg = Release|x86

Version.props

@@ -2,18 +2,14 @@
   <PropertyGroup Label="Version settings">
     <!--
       Use the following values for the different release types:
-          - "alpha"     - EF Core release independent, code quality unstable,         major changes
-          - "beta"      - EF Core release independent, code quality stable,           can introduce breaking changes
-          - "silver"    - EF Core release independent, code quality stable,           can introduce breaking changes
-
-          - "preview"   - EF Core release targeted,    code quality stable,           can introduce breaking changes
-          - "rc"        - EF Core release targeted,    code quality production ready, only minor changes are expected
-
-          - "rtm"       - EF Core release independent, code quality production ready, major release
-          - "servicing" - EF Core release independent, code quality production ready, mainly bugfixes
+          - "alpha"
+          - "beta"
+          - "rc"
+          - "rtm"
+          - "servicing"
     -->
-    <VersionPrefix>3.1.1</VersionPrefix>
-    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
+    <VersionPrefix>5.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 
     <!--
@@ -33,7 +29,7 @@
     <UseVersionSuffixOverride Condition="'$(VersionSuffix)' != ''">true</UseVersionSuffixOverride>
   </PropertyGroup>
 
-  <PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true' And ('$(OfficialVersion)' == '' Or $(OfficialVersion.Contains('-')))">
+  <PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true' And '$(OfficialVersion)' == ''">
     <VersionSuffix>$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</VersionSuffix>
     <VersionSuffix Condition="'$(ContinuousIntegrationTimestamp)' != ''">$(VersionSuffix).ci.$(ContinuousIntegrationTimestamp)</VersionSuffix>
     <VersionSuffix Condition="'$(BuildSha)' != ''">$(VersionSuffix)+sha.$(BuildSha)</VersionSuffix>
@@ -43,7 +39,7 @@
     <Error Condition="'$(VersionPrefix)' == ''" Text="The 'VersionPrefix' property needs to be set." />
     <Error Condition="'$(PreReleaseVersionLabel)' == ''" Text="The 'PreReleaseVersionLabel' property needs to be set." />
     <Error Condition="'$(PreReleaseVersionIteration)' == ''" Text="The 'PreReleaseVersionIteration' property needs to be set." />
-    <Error Condition="'$(OfficialVersion)' != '' And '$(OfficialVersion)' != '$(VersionPrefix)' And '$(OfficialVersion)' != '$(VersionPrefix)-$(VersionSuffix)'" Text="The 'OfficialVersion' property needs to be identical to the 'VersionPrefix' property or to a combination of the 'VersionPrefix' and the 'VersionSuffix' properties." />
+    <Error Condition="'$(OfficialVersion)' != '' And '$(OfficialVersion)' != '$(VersionPrefix)'" Text="The 'OfficialVersion' property needs to be identical to the 'VersionPrefix' property." />
     <!--
     <Message Importance="high" Text="VersionPrefix: $(VersionPrefix)" />
     <Message Importance="high" Text="VersionSuffix: $(VersionSuffix)" />

global.json

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

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>
-        <TargetFrameworks>$(DefaultNetStandardTargetFramework);netcoreapp2.1;net461</TargetFrameworks>
+        <TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
         <Platforms>AnyCPU;x86;x64</Platforms>
         <AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
         <RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>

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>$(DefaultNetStandardTargetFramework)</TargetFramework>
+    <TargetFramework>$(WindowsOnlyNetCoreTargetFramework)</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>$(DefaultNetStandardTargetFramework)</TargetFramework>
+    <TargetFramework>$(WindowsOnlyNetCoreTargetFramework)</TargetFramework>
     <AssemblyName>EntityFrameworkCore.Jet.OleDb</AssemblyName>
     <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
     <PackageTags>$(PackageTags);OLE DB;OLEDB;System.Data.OleDb</PackageTags>

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

@@ -35,7 +35,7 @@ public JetAnnotationCodeGenerator([NotNull] AnnotationCodeGeneratorDependencies
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public override bool IsHandledByConvention(IModel model, IAnnotation annotation)
+        protected override bool IsHandledByConvention(IModel model, IAnnotation annotation)
         {
             Check.NotNull(model, nameof(model));
             Check.NotNull(annotation, nameof(annotation));

src/EFCore.Jet/Diagnostics/ConflictingValueGenerationStrategiesEventData.cs

@@ -0,0 +1,54 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using EntityFrameworkCore.Jet.Metadata;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace Microsoft.EntityFrameworkCore.Diagnostics
+{
+    /// <summary>
+    ///     A <see cref="DiagnosticSource" /> event payload class for events that have
+    ///     a property.
+    /// </summary>
+    public class ConflictingValueGenerationStrategiesEventData : EventData
+    {
+        /// <summary>
+        ///     Constructs the event payload.
+        /// </summary>
+        /// <param name="eventDefinition"> The event definition. </param>
+        /// <param name="messageGenerator"> A delegate that generates a log message for this event. </param>
+        /// <param name="jetValueGenerationStrategy"> The JET value generation strategy. </param>
+        /// <param name="otherValueGenerationStrategy"> The other value generation strategy. </param>
+        /// <param name="property"> The property. </param>
+        public ConflictingValueGenerationStrategiesEventData(
+            [NotNull] EventDefinitionBase eventDefinition,
+            [NotNull] Func<EventDefinitionBase, EventData, string> messageGenerator,
+            JetValueGenerationStrategy jetValueGenerationStrategy,
+            [NotNull] string otherValueGenerationStrategy,
+            [NotNull] IProperty property)
+            : base(eventDefinition, messageGenerator)
+        {
+            JetValueGenerationStrategy = jetValueGenerationStrategy;
+            OtherValueGenerationStrategy = otherValueGenerationStrategy;
+            Property = property;
+        }
+
+        /// <summary>
+        ///     The Jet value generation strategy.
+        /// </summary>
+        public virtual JetValueGenerationStrategy JetValueGenerationStrategy { get; }
+
+        /// <summary>
+        ///     The other value generation strategy.
+        /// </summary>
+        public virtual string OtherValueGenerationStrategy { get; }
+
+        /// <summary>
+        ///     The property.
+        /// </summary>
+        public virtual IProperty Property { get; }
+    }
+}