All package update & .Net8 Upgrade

ZenitechSoftware · Feb 28, 2024 · 840948a · 840948a
1 parent 1db51a0
commit 840948a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/src/AutSoft.Core/ServiceCollectionExtensions.cs b/src/AutSoft.Core/ServiceCollectionExtensions.cs
@@ -15,6 +15,6 @@ public static class ServiceCollectionExtensions
     /// <returns>Expanded service collection</returns>
     public static IServiceCollection AddAutSoftCommon(this IServiceCollection services)
     {
-        return services.AddSingleton<ITimeProvider, TimeProvider>();
+        return services.AddSingleton<ITimeProvider, Time.TimeProvider>();
     }
 }
diff --git a/src/AutSoft.DbScaffolding.Identity/AutSoft.DbScaffolding.Identity.csproj b/src/AutSoft.DbScaffolding.Identity/AutSoft.DbScaffolding.Identity.csproj
@@ -5,10 +5,7 @@
   <ItemGroup>
     <PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AutSoft.DbScaffolding\AutSoft.DbScaffolding.csproj" />

diff --git a/src/AutSoft.DbScaffolding.Identity/Generators/IdentityCSharpDbContextGenerator.cs b/src/AutSoft.DbScaffolding.Identity/Generators/IdentityCSharpDbContextGenerator.cs
@@ -5,6 +5,7 @@
 
 using EntityFrameworkCore.Scaffolding.Handlebars;
 
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;

diff --git a/src/AutSoft.DbScaffolding/AutSoft.DbScaffolding.csproj b/src/AutSoft.DbScaffolding/AutSoft.DbScaffolding.csproj
@@ -4,10 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/AutSoft.DbScaffolding/Generators/CSharpModelGenerator.cs b/src/AutSoft.DbScaffolding/Generators/CSharpModelGenerator.cs
@@ -1,14 +1,11 @@
 using AutSoft.DbScaffolding.Configuration;
-
-using EntityFrameworkCore.Scaffolding.Handlebars;
-
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Scaffolding;
-using Microsoft.EntityFrameworkCore.Scaffolding.Internal;
 using Microsoft.Extensions.Options;
-
+using EntityFrameworkCore.Scaffolding.Handlebars;
 using System.Linq;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using EntityFrameworkCore.Scaffolding.Handlebars.Internal;
 
 namespace AutSoft.DbScaffolding.Generators;
 

diff --git a/src/AutSoft.DbScaffolding/ServiceCollectionExtensions.cs b/src/AutSoft.DbScaffolding/ServiceCollectionExtensions.cs
@@ -3,12 +3,12 @@
 using AutSoft.DbScaffolding.Services;
 
 using EntityFrameworkCore.Scaffolding.Handlebars;
+using EntityFrameworkCore.Scaffolding.Handlebars.Internal;
 
 using HandlebarsDotNet;
 
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Scaffolding;
-using Microsoft.EntityFrameworkCore.Scaffolding.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
 using System;