From 8ea28a2328c2601d35478768083895448bca8a6e Mon Sep 17 00:00:00 2001 From: jwyza-pi Date: Mon, 6 Jan 2025 08:44:42 -0600 Subject: [PATCH] Fix copy-pasta --- src/Core/RevEng.Core.80/ReverseEngineerRunner.cs | 14 +++++--------- src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Core/RevEng.Core.80/ReverseEngineerRunner.cs b/src/Core/RevEng.Core.80/ReverseEngineerRunner.cs index 2003bf96f..2b7855860 100644 --- a/src/Core/RevEng.Core.80/ReverseEngineerRunner.cs +++ b/src/Core/RevEng.Core.80/ReverseEngineerRunner.cs @@ -274,27 +274,23 @@ private static void ValidateOptions(ReverseEngineerCommandOptions options, List< { if (options.UseDatabaseNames && options.CustomReplacers?.Count > 0) { - warnings.Add( - $"'use-database-names' / 'UseDatabaseNames' has been set to true, but a '{Constants.RenamingFileName}' file was also found. This prevents '{Constants.RenamingFileName}' from functioning."); + warnings.Add($"'use-database-names' / 'UseDatabaseNames' has been set to true, but a '{Constants.RenamingFileName}' file was also found. This prevents '{Constants.RenamingFileName}' from functioning."); } if (options.UseT4 && options.UseT4Split) { - warnings.Add( - "Both UseT4 and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used."); + warnings.Add("Both UseT4 and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used."); options.UseT4 = false; } if (options.UseDbContextSplitting) { - warnings.Add( - "UseDbContextSplitting (preview) is obsolete, please switch to the T4 split DbContext template."); + warnings.Add("UseDbContextSplitting (preview) is obsolete, please switch to the T4 split DbContext template."); } if (options.UseT4Split && options.UseDbContextSplitting) { - warnings.Add( - "Both UseDbContextSplitting (preview) and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used."); + warnings.Add("Both UseDbContextSplitting (preview) and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used."); options.UseDbContextSplitting = false; } @@ -303,7 +299,7 @@ private static void ValidateOptions(ReverseEngineerCommandOptions options, List< warnings.Add("UseInternalAccessModifiersForSprocsAndFunctions is set to true, but UseT4 or UseT4Split are not true. This will result in conflicting access modifiers for the partial DBContext class. This option is intended for when the T4 templates have been used and are setting the DBContext class to internal rather than public. UseInternalAccessModifiersForSprocsAndFunctions will be reset to false to ensure a valid DBContext is generated."); options.UseInternalAccessModifiersForSprocsAndFunctions = false; } - } + } private static SavedModelFiles CreateCleanupPaths(SavedModelFiles procedurePaths, SavedModelFiles functionPaths, SavedModelFiles filePaths) { diff --git a/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs b/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs index fdd73f3e6..6456ad27a 100644 --- a/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs +++ b/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs @@ -185,8 +185,8 @@ public static ReverseEngineerOptions ToOptions(this CliConfig config, string pro ProjectRootNamespace = names.RootNamespace, UseDecimalDataAnnotationForSprocResult = config.CodeGeneration.UseDecimalDataAnnotation, UsePrefixNavigationNaming = config.CodeGeneration.UsePrefixNavigationNaming, - UseDatabaseNamesForRoutines = config.CodeGeneration.UseDatabaseNamesForRoutines, - + UseInternalAccessModifiersForSprocsAndFunctions = config.CodeGeneration.UseInternalAccessModifiersForSprocsAndFunctions, + // HandleBars templates are not supported: UseHandleBars = false, SelectedHandlebarsLanguage = 0, // handlebars support, will not support it