CirrusRedOrg · ChrisJollyAU · Aug 17, 2024 · Jul 19, 2024 · Jul 20, 2024 · Jul 20, 2024
diff --git a/Dependencies.targets b/Dependencies.targets
@@ -1,52 +1,50 @@
 <Project>
 	<PropertyGroup>
-		<EFCoreVersion>[8.0.6,8.0.999]</EFCoreVersion>
+		<DotNetVersion>[9.0.0-preview.7.24405.4,9.0.999]</DotNetVersion>
+		<EFCoreVersion>[9.0.0-preview.7.24405.3,9.0.999]</EFCoreVersion>
+		<MSLibVersion>[9.0.0-preview.7.24405.7,9.0.999]</MSLibVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<!-- Common -->
-		<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-		<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MSLibVersion)" />
+		<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MSLibVersion)" />
 		<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
-		<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+		<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(MSLibVersion)" />
 		<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
 		<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
 
 		<!-- EFCore.Jet -->
-		<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-		<PackageReference Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
-		<PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-		<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
-		<PackageReference Update="System.Collections.Immutable" Version="8.0.0" />
+		<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(MSLibVersion)" />
+		<PackageReference Update="Microsoft.Extensions.Configuration" Version="$(MSLibVersion)" />
+		<PackageReference Update="Microsoft.Extensions.Logging" Version="$(MSLibVersion)" />
+		<PackageReference Update="System.Collections.Immutable" Version="$(MSLibVersion)" />
 
 		<!-- Tests -->
-		<PackageReference Update="System.Data.Odbc" Version="8.0.0" />
-		<PackageReference Update="System.Data.OleDb" Version="8.0.0" />
+		<PackageReference Update="System.Data.Odbc" Version="$(MSLibVersion)" />
+		<PackageReference Update="System.Data.OleDb" Version="$(MSLibVersion)" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
-		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
-		<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-		<PackageReference Update="MSTest.TestAdapter" Version="3.4.3" />
-		<PackageReference Update="MSTest.TestFramework" Version="3.4.3" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" /> <!-- Should be same as efcoreversion. preview6 was broken and published separately -->
+		<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(MSLibVersion)" />
+		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.0-release-24373-02" />
+		<PackageReference Update="MSTest.TestAdapter" Version="3.5.2" />
+		<PackageReference Update="MSTest.TestFramework" Version="3.5.2" />
 		<PackageReference Update="coverlet.collector" Version="6.0.2" />
 		<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
 
 		<!-- EFCore.Jet.FunctionalTests -->
-		<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="8.0.0" />
+		<PackageReference Update="xunit.core" Version="2.9.0"/>
+		<PackageReference Update="xunit.assert" Version="2.9.0" />
+		<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2" />
+		<PackageReference Update="xunit.runner.console" Version="2.9.0" />
+		<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MSLibVersion)" />
 		<PackageReference Update="NetTopologySuite" Version="2.5.0" />
 		<PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
-		<PackageReference Update="Castle.Core" Version="5.1.1" />
 
 		<!-- EFCore.Jet.Tests -->
-		<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
-		<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
+		<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="$(MSLibVersion)" />
 		<PackageReference Update="Moq" Version="4.20.70" />
 	</ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,8 @@
     <Company>CirrusRed</Company>
     <Copyright>Copyright © 2017-$([System.DateTime]::Now.Year) CirrusRed</Copyright>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>12.0</LangVersion>
+	  <Nullable>enable</Nullable>
     <DebugType>portable</DebugType>
     <IsPackable>False</IsPackable>
     <!-- <PackageReleaseNotes>TODO</PackageReleaseNotes> -->
@@ -26,7 +27,7 @@
     <EfCoreTargetFramework>net8.0</EfCoreTargetFramework>
     <EfCoreTestTargetFramework>$(EfCoreTargetFramework)</EfCoreTestTargetFramework>
     <JetTargetFramework>$(EfCoreTargetFramework)</JetTargetFramework>
-    <JetTestTargetFramework>$(JetTargetFramework)</JetTestTargetFramework>
+    <JetTestTargetFramework>net9.0</JetTestTargetFramework>
     <JetTestWindowsOnlyTargetFramework>$(JetTestTargetFramework)-windows7.0</JetTestWindowsOnlyTargetFramework>
   </PropertyGroup>
 

diff --git a/NuGet.Config b/NuGet.Config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
 
     <add key="efcorejet-daily" value="https://www.myget.org/F/cirrusred/api/v3/index.json" />
     <add key="efcorejet-daily-debug" value="https://www.myget.org/F/cirrusred-debug/api/v3/index.json" />

diff --git a/Version.props b/Version.props
@@ -15,9 +15,9 @@
             Bump-up to the next iteration immediately after a release, so that subsequent daily builds are named
             correctly.
         -->
-		<VersionPrefix>8.0.0</VersionPrefix>
-		<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
-		<PreReleaseVersionIteration>0</PreReleaseVersionIteration>
+		<VersionPrefix>9.0.0</VersionPrefix>
+		<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
+		<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 
 		<!--
             The following properties will automatically be set by CI builds when appropriate:

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.203",
+    "version": "9.0.100-preview.7.24407.12",
     "allowPrerelease": true,
     "rollForward": "latestFeature"
   }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,7 @@
     <!-- [CS1591] Missing XML comment for publicly visible type or member 'MySqlAnnotationCodeGenerator' -->
     <!-- [CS1587] XML comment is not placed on a valid language element -->
     <!-- [CS1574] XML comment has cref attribute 'Scoped' that could not be resolved -->
-    <NoWarn>$(NoWarn);CS1574;CS1587;CS1591;EF1001</NoWarn>
+    <NoWarn>$(NoWarn);CS1574;CS1587;CS1591;EF1001;NU1903</NoWarn>
     <!--<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\rulesets\EFCore.ruleset</CodeAnalysisRuleSet>-->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

diff --git a/src/EFCore.Jet.Data/JetConnection.cs b/src/EFCore.Jet.Data/JetConnection.cs
@@ -98,8 +98,8 @@ public DbProviderFactory DataAccessProviderFactory
             get => JetFactory?.InnerFactory;
             set
             {
-                if (JetFactory != null && JetFactory != value)
-                    throw new InvalidOperationException($"The {DataAccessProviderFactory} property can only be set once.");
+                if (State != ConnectionState.Closed)
+                    throw new InvalidOperationException($"The {DataAccessProviderFactory} property can only be set when the connection is closed.");
 
                 JetFactory = new JetFactory(this, value);
             }
@@ -329,12 +329,12 @@ public override void Open()
             {
                 // If the connection string is an actual connection string and not just a file path, then we should
                 // be able to deduct the provider from its style.
-                dataAccessProviderType ??= GetDataAccessProviderType(fileNameOrConnectionString);
+                dataAccessProviderType = GetDataAccessProviderType(fileNameOrConnectionString);
                 connectionString = fileNameOrConnectionString;
             }
             else
             {
-                dataAccessProviderType ??= JetConfiguration.DefaultDataAccessProviderType;
+                dataAccessProviderType = JetConfiguration.DefaultDataAccessProviderType;
 
                 if (IsFileName(fileNameOrConnectionString))
                 {
@@ -352,7 +352,7 @@ public override void Open()
                 }
             }
 
-            DataAccessProviderFactory ??= JetFactory.Instance.GetDataAccessProviderFactory(dataAccessProviderType.Value);
+            DataAccessProviderFactory = JetFactory.Instance.GetDataAccessProviderFactory(dataAccessProviderType.Value);
 
             // It is possible, that a connection string was provided, that left out the actual ACE/Jet provider
             // information, but is in a distinctive style (ODBC or OLE DB) anyway.
@@ -634,8 +634,9 @@ public static bool DatabaseExists(string fileNameOrConnectionString)
             return File.Exists(fileName);
         }
 
-        public static DataAccessProviderType GetDataAccessProviderType(string connectionString)
+        public static DataAccessProviderType GetDataAccessProviderType(string? connectionString)
         {
+            if (string.IsNullOrEmpty(connectionString)) return DataAccessProviderType.Unconfgiured;
             var isOleDb = Regex.IsMatch(connectionString, @"^(?:.*;)?\s*Provider\s*=\s*\w+", RegexOptions.IgnoreCase);
             var isOdbc = Regex.IsMatch(connectionString, @"^(?:.*;)?Driver\s*=\s*\{?\w+\}?", RegexOptions.IgnoreCase);
 
@@ -796,10 +797,10 @@ public static KeyValuePair<string, Version>[] GetMostRecentCompatibleProviders(D
             return providers.ToArray();
         }, true);
 
-        public static bool IsConnectionString(string fileNameOrConnectionString)
+        public static bool IsConnectionString(string? fileNameOrConnectionString)
             => JetStoreDatabaseHandling.IsConnectionString(fileNameOrConnectionString);
 
-        public static bool IsFileName(string fileNameOrConnectionString)
+        public static bool IsFileName(string? fileNameOrConnectionString)
             => JetStoreDatabaseHandling.IsFileName(fileNameOrConnectionString);
     }
 }
diff --git a/src/EFCore.Jet.Data/JetDataReader.cs b/src/EFCore.Jet.Data/JetDataReader.cs
@@ -197,17 +197,32 @@ public DateOnly GetDateOnly(int ordinal)
 
         public TimeOnly GetTimeOnly(int ordinal)
         {
-            var value = GetDateTime(ordinal);
-            return TimeOnly.FromDateTime(value);
+            var value = _wrappedDataReader.GetValue(ordinal);
+
+            if (JetConfiguration.UseDefaultValueOnDBNullConversionError &&
+                Convert.IsDBNull(value))
+                return default;
+
+            if (value is DateTime dateTime)
+            {
+                return TimeOnly.FromDateTime(dateTime);
+            }
+            return (TimeOnly)value;
         }
 
         public virtual TimeSpan GetTimeSpan(int ordinal)
         {
-            var dateTime = GetDateTime(ordinal);
-            return JetConfiguration.UseDefaultValueOnDBNullConversionError &&
-                   dateTime == default
-                ? default
-                : dateTime - JetConfiguration.TimeSpanOffset;
+            var value = _wrappedDataReader.GetValue(ordinal);
+
+            if (JetConfiguration.UseDefaultValueOnDBNullConversionError &&
+                Convert.IsDBNull(value))
+                return default;
+
+            if (value is DateTime dateTime)
+            {
+                return TimeSpan.FromTicks(dateTime.Ticks - JetConfiguration.TimeSpanOffset.Ticks);
+            }
+            return (TimeSpan)value;
         }
 
         public virtual DateTimeOffset GetDateTimeOffset(int ordinal)

diff --git a/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetInformationSchema.cs b/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetInformationSchema.cs
@@ -17,7 +17,10 @@ static JetInformationSchema()
         }
 
         public static bool TryGetDataReaderFromInformationSchemaCommand(JetCommand command, out DbDataReader dataReader)
-            => (dataReader = GetDbDataReaderFromSimpleStatement(command)) != null;
+        {
+            dataReader = GetDbDataReaderFromSimpleStatement(command);
+            return dataReader != null;
+        }
 
         private static DbDataReader GetDbDataReaderFromSimpleStatement(JetCommand command)
         {

diff --git a/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetStoreDatabaseHandling.cs b/src/EFCore.Jet.Data/JetStoreSchemaDefinition/JetStoreDatabaseHandling.cs
@@ -195,10 +195,10 @@ public static string ExtractFileNameFromConnectionString(string connectionString
             return connectionString;
         }
 
-        public static bool IsConnectionString(string connectionString)
-            => _regExIsConnectionString.IsMatch(connectionString);
+        public static bool IsConnectionString(string? connectionString)
+            => !string.IsNullOrWhiteSpace(connectionString) && _regExIsConnectionString.IsMatch(connectionString);
 
-        public static bool IsFileName(string fileName)
+        public static bool IsFileName(string? fileName)
             => !string.IsNullOrWhiteSpace(fileName) &&
                !IsConnectionString(fileName) &&
                !fileName.ToCharArray()

diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj
@@ -7,6 +7,7 @@
 		<AssemblyName>EntityFrameworkCore.Jet</AssemblyName>
 		<Platforms>AnyCPU;x86;x64</Platforms>
 		<Nullable>enable</Nullable>
+		<NoWarn>$(NoWarn);EF9100</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>