add EF Core 8 handlebars support

ErikEJ · Nov 23, 2023 · b541fac · b541fac
1 parent cc52f9f
commit b541fac
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs b/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using EntityFrameworkCore.Scaffolding.Handlebars;
 using ErikEJ.EntityFrameworkCore.SqlServer.Scaffolding;
 using Humanizer.Inflections;
 using Microsoft.EntityFrameworkCore.Design;
@@ -19,7 +20,6 @@
 using SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Design;
 
 #if !CORE80
-using EntityFrameworkCore.Scaffolding.Handlebars;
 using FirebirdSql.EntityFrameworkCore.Firebird.Design.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Design;
 using Oracle.EntityFrameworkCore.Design.Internal;
@@ -64,7 +64,6 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                 serviceCollection.AddSingleton<ICandidateNamingService>(provider => new ReplacingCandidateNamingService(options.CustomReplacers, options.PreserveCasingWithRegex));
             }
 
-#if !CORE80
             if (options.UseHandleBars)
             {
                 serviceCollection.AddHandlebarsScaffolding(hbOptions =>
@@ -75,7 +74,7 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                 serviceCollection.AddSingleton<ITemplateFileService>(provider
                     => new CustomTemplateFileService(options.OptionsPath));
             }
-#endif
+
             if (options.UseInflector || options.UseLegacyPluralizer)
             {
                 if (options.UseLegacyPluralizer)

diff --git a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj
@@ -21,7 +21,6 @@
 
 	<ItemGroup>
 	  <Compile Remove="..\RevEng.Core.60\CrmDatabaseModelFactory.cs" />
-	  <Compile Remove="..\RevEng.Core.60\CustomTemplateFileService.cs" />
 	  <Compile Remove="..\RevEng.Core.60\PatchedSqlServerDatabaseModelFactory.cs" />
 	</ItemGroup>
 
@@ -32,7 +31,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Bricelam.EntityFrameworkCore.Pluralizer" Version="1.0.0" />
-    <!--<PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" Version="7.0.0" />-->
+    <PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" Version="8.0.0-beta1" />
     <!--<PackageReference Include="EntityFrameworkCore.Sqlite.NodaTime" Version="7.0.0" />-->    
     <!--<PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="9.2.0-alpha1" />-->    
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />

diff --git a/src/GUI/efpt80.core/efpt80.core.csproj b/src/GUI/efpt80.core/efpt80.core.csproj
@@ -24,7 +24,7 @@
 
    <ItemGroup>
      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
-     <PackageReference Include="EfCore.SchemaCompare" Version="8.0.0-rc2-0002" />
+     <PackageReference Include="EfCore.SchemaCompare" Version="8.0.0" />
    </ItemGroup>
 
 </Project>
diff --git a/src/GUI/lib/efpt80.exe.zip b/src/GUI/lib/efpt80.exe.zip
diff --git a/src/GUI/lib/efreveng80.exe.zip b/src/GUI/lib/efreveng80.exe.zip