Add Sqlite NodaTime support

Update some dependencies Fix Analyzer warning
ErikEJ · Dec 1, 2023 · 22007f8 · 22007f8
1 parent ac65557
commit 22007f8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/src/GUI/Directory.Build.Props b/src/GUI/Directory.Build.Props
@@ -8,7 +8,7 @@
   </PropertyGroup>  
 
   <ItemGroup>
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.14.0.81108">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/GUI/NUnitTestCore/NUnitTestCore.csproj b/src/GUI/NUnitTestCore/NUnitTestCore.csproj
@@ -89,7 +89,7 @@
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ErikEJ.EntityFrameworkCore.DgmlBuilder\ErikEJ.EntityFrameworkCore.DgmlBuilder.csproj" />

diff --git a/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs b/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs
@@ -232,13 +232,12 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                     var sqliteProvider = new SqliteDesignTimeServices();
                     sqliteProvider.ConfigureDesignTimeServices(serviceCollection);
 
-#if !CORE80
                     if (options.UseNodaTime)
                     {
                         var nodaTime = new SqliteNodaTimeDesignTimeServices();
                         nodaTime.ConfigureDesignTimeServices(serviceCollection);
                     }
-#endif
+
                     break;
 
                 default:

diff --git a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj
@@ -32,7 +32,7 @@
 	<ItemGroup>
 		<PackageReference Include="Bricelam.EntityFrameworkCore.Pluralizer" Version="1.0.0" />
     <PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" Version="8.0.0-beta1" />
-    <!--<PackageReference Include="EntityFrameworkCore.Sqlite.NodaTime" Version="7.0.0" />-->    
+    <PackageReference Include="EntityFrameworkCore.Sqlite.NodaTime" Version="8.0.0" />
     <!--<PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="9.2.0-alpha1" />-->    
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />

diff --git a/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs b/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs
@@ -330,14 +330,14 @@ public void GetSelectedObjects_WithObjects_PartialSelection()
             }
 
             // Act
-            var result = vm.GetSelectedObjects().ToArray();
+            var result = vm.GetSelectedObjects().ToList();
 
             // Assert
             Assert.IsNotNull(result);
-            Assert.AreEqual(6, result.Length);
+            Assert.AreEqual(6, result.Count);
             foreach (var item in vm.Types.SelectMany(c => c.Schemas).OrderBy(c => c.Name))
             {
-                Assert.IsTrue(result.Any(c => c.Name == item.Objects[0].ModelDisplayName));
+                Assert.IsTrue(result.Exists(c => c.Name == item.Objects[0].ModelDisplayName));
             }
         }
 

diff --git a/src/GUI/efcpt.6/efcpt.6.csproj b/src/GUI/efcpt.6/efcpt.6.csproj
@@ -54,9 +54,9 @@
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="NuGet.Protocol" Version="6.7.0" />
-    <PackageReference Include="Spectre.Console" Version="0.47.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
+    <PackageReference Include="NuGet.Protocol" Version="6.8.0" />
+    <PackageReference Include="Spectre.Console" Version="0.48.0" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.87" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/GUI/efcpt.7/efcpt.7.csproj b/src/GUI/efcpt.7/efcpt.7.csproj
@@ -40,9 +40,9 @@
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="NuGet.Protocol" Version="6.7.0" />
-    <PackageReference Include="Spectre.Console" Version="0.47.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
+    <PackageReference Include="NuGet.Protocol" Version="6.8.0" />
+    <PackageReference Include="Spectre.Console" Version="0.48.0" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.87" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/GUI/efcpt.8/efcpt.8.csproj b/src/GUI/efcpt.8/efcpt.8.csproj
@@ -53,10 +53,10 @@
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="NuGet.Protocol" Version="6.7.0" />
-    <PackageReference Include="Spectre.Console" Version="0.47.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="NuGet.Protocol" Version="6.8.0" />
+    <PackageReference Include="Spectre.Console" Version="0.48.0" />
+    <PackageReference Include="System.IO.Abstractions" Version="19.2.87" />
   </ItemGroup>
 
   <ItemGroup>