diff --git a/src/Core/RevEng.Core.60/ReplacingCandidateNamingService.cs b/src/Core/RevEng.Core.60/ReplacingCandidateNamingService.cs index 8a1dab51a..c45508de4 100644 --- a/src/Core/RevEng.Core.60/ReplacingCandidateNamingService.cs +++ b/src/Core/RevEng.Core.60/ReplacingCandidateNamingService.cs @@ -14,16 +14,24 @@ public class ReplacingCandidateNamingService : CandidateNamingService { private readonly List customNameOptions; private readonly bool preserveCasingUsingRegex; +#if CORE80 private readonly bool usePrefixNaming; - +#endif public ReplacingCandidateNamingService( +#if CORE80 + bool usePrefixNaming, List customNameOptions, - bool preserveCasingUsingRegex = false, - bool usePrefixNaming = false) + bool preserveCasingUsingRegex = false) +#else + List customNameOptions, + bool preserveCasingUsingRegex = false) +#endif { this.customNameOptions = customNameOptions; this.preserveCasingUsingRegex = preserveCasingUsingRegex; +#if CORE80 this.usePrefixNaming = usePrefixNaming; +#endif } public override string GenerateCandidateIdentifier(DatabaseTable originalTable) diff --git a/src/Core/RevEng.Core.60/ServiceProviderBuilder.cs b/src/Core/RevEng.Core.60/ServiceProviderBuilder.cs index 1d02edd7a..00b4990ae 100644 --- a/src/Core/RevEng.Core.60/ServiceProviderBuilder.cs +++ b/src/Core/RevEng.Core.60/ServiceProviderBuilder.cs @@ -62,7 +62,7 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti #if CORE80 if (options.CustomReplacers != null || options.UsePrefixNavigationNaming) { - serviceCollection.AddSingleton(provider => new ReplacingCandidateNamingService(options.CustomReplacers, options.PreserveCasingWithRegex, options.UsePrefixNavigationNaming)); + serviceCollection.AddSingleton(provider => new ReplacingCandidateNamingService(options.UsePrefixNavigationNaming, options.CustomReplacers, options.PreserveCasingWithRegex)); } #else if (options.CustomReplacers != null) diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props index 04ea29d3d..b066b7126 100644 --- a/src/Directory.Build.Props +++ b/src/Directory.Build.Props @@ -1,11 +1,20 @@ + + true + 1573,1591,1712,CA1014 + + true latest-All true - + + + + true + diff --git a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj index e06c26049..b6c282fe8 100644 --- a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj +++ b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj @@ -19,9 +19,11 @@ bin\Release\ + bin\Release\EFCorePowerTools.xml bin\Debug\ + bin\Debug\EFCorePowerTools.xml @@ -93,6 +95,7 @@ PickTablesDialog.xaml + AboutLocale.resx True diff --git a/src/GUI/EFCorePowerTools/GlobalSuppressions.cs b/src/GUI/EFCorePowerTools/GlobalSuppressions.cs new file mode 100644 index 000000000..c305fad27 --- /dev/null +++ b/src/GUI/EFCorePowerTools/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:File should have header", Justification = "Generated by tooling")] diff --git a/src/GUI/PowerToolsExtensionPack/PowerToolsExtensionPack.csproj b/src/GUI/PowerToolsExtensionPack/PowerToolsExtensionPack.csproj index 61156cb84..09a5cf966 100644 --- a/src/GUI/PowerToolsExtensionPack/PowerToolsExtensionPack.csproj +++ b/src/GUI/PowerToolsExtensionPack/PowerToolsExtensionPack.csproj @@ -36,6 +36,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\PowerToolsExtensionPack.xml pdbonly @@ -44,6 +45,7 @@ TRACE prompt 4 + bin\Release\PowerToolsExtensionPack.xml diff --git a/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs b/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs index a662a3373..0beb596a0 100644 --- a/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs +++ b/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs @@ -327,7 +327,9 @@ private static List Add(IEnumerable models, List entities) var newItems = models.Where(o => o.ObjectType == objectType).ToList(); if (newItems.Count == 0) { +#pragma warning disable S1168 return null; +#pragma warning restore S1168 } var result = entities ?? new List(); diff --git a/src/GUI/RevEng.Shared/Providers.cs b/src/GUI/RevEng.Shared/Providers.cs index 10d1d98ee..9ea671a8a 100644 --- a/src/GUI/RevEng.Shared/Providers.cs +++ b/src/GUI/RevEng.Shared/Providers.cs @@ -83,7 +83,7 @@ public static string CreateReadme(ReverseEngineerCommandOptions commandOptions, public static List GetNeededPackages(DatabaseType databaseType, bool useSpatial, bool useNodaTime, bool useDateOnlyTimeOnly, bool useHierarchyId, bool discoverMultipleResultSets, bool hasProcedures, CodeGenerationMode codeGenerationMode) { - // TODO Update versions here when adding provider and other updates + // Update versions here when adding provider and other updates var packages = new List(); if (databaseType == DatabaseType.SQLServer || databaseType == DatabaseType.SQLServerDacpac) diff --git a/src/GUI/Shared/Contracts/ViewModels/IPickTablesViewModel.cs b/src/GUI/Shared/Contracts/ViewModels/IPickTablesViewModel.cs index 2d681ce97..9eff6ad32 100644 --- a/src/GUI/Shared/Contracts/ViewModels/IPickTablesViewModel.cs +++ b/src/GUI/Shared/Contracts/ViewModels/IPickTablesViewModel.cs @@ -18,20 +18,12 @@ public interface IPickTablesViewModel : IViewModel SearchMode SearchMode { get; set; } IObjectTreeViewModel ObjectTree { get; } - /// - /// Adds the to the , wrapping it in a new instance. - /// - /// The tables to add. void AddObjects(IEnumerable objects, IEnumerable customReplacers); - /// - /// Selects the from the property, setting the to true, if both collections contain the table. - /// - /// The tables to select. void SelectObjects(IEnumerable objects); SerializationTableModel[] GetSelectedObjects(); Schema[] GetRenamedObjects(); } -} \ No newline at end of file +} diff --git a/src/GUI/Shared/ItemWizard/ReverseEngineerWizardLauncher.cs b/src/GUI/Shared/ItemWizard/ReverseEngineerWizardLauncher.cs index dda8b9416..9388c0719 100644 --- a/src/GUI/Shared/ItemWizard/ReverseEngineerWizardLauncher.cs +++ b/src/GUI/Shared/ItemWizard/ReverseEngineerWizardLauncher.cs @@ -8,7 +8,7 @@ namespace EFCorePowerTools.ItemWizard { public class ReverseEngineerWizardLauncher : IWizard { - // TODO Update vstemplate version reference if main assembly version changes + // Update vstemplate version reference if main assembly version changes // In \src\GUI\WizardItemTemplate\WizardItemTemplate.vstemplate public void RunStarted( object automationObject, diff --git a/src/GUI/UnitTests/UnitTests.csproj b/src/GUI/UnitTests/UnitTests.csproj index 4258692cd..9074d3dbf 100644 --- a/src/GUI/UnitTests/UnitTests.csproj +++ b/src/GUI/UnitTests/UnitTests.csproj @@ -35,6 +35,7 @@ 7.3 prompt MinimumRecommendedRules.ruleset + bin\Release\UnitTests.xml diff --git a/src/GUI/WizardItemTemplate/WizardItemTemplate.csproj b/src/GUI/WizardItemTemplate/WizardItemTemplate.csproj index 43522df50..f44bd2aa4 100644 --- a/src/GUI/WizardItemTemplate/WizardItemTemplate.csproj +++ b/src/GUI/WizardItemTemplate/WizardItemTemplate.csproj @@ -42,6 +42,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\WizardItemTemplate.xml pdbonly @@ -50,6 +51,7 @@ TRACE prompt 4 + bin\Release\WizardItemTemplate.xml diff --git a/src/GUI/lib/efreveng60.exe.zip b/src/GUI/lib/efreveng60.exe.zip index 47d586bb9..be91cf915 100644 Binary files a/src/GUI/lib/efreveng60.exe.zip and b/src/GUI/lib/efreveng60.exe.zip differ diff --git a/src/GUI/lib/efreveng70.exe.zip b/src/GUI/lib/efreveng70.exe.zip index 9ef481097..430c74534 100644 Binary files a/src/GUI/lib/efreveng70.exe.zip and b/src/GUI/lib/efreveng70.exe.zip differ diff --git a/src/GUI/lib/efreveng80.exe.zip b/src/GUI/lib/efreveng80.exe.zip index 3dfc68254..bb3e2b9f9 100644 Binary files a/src/GUI/lib/efreveng80.exe.zip and b/src/GUI/lib/efreveng80.exe.zip differ diff --git a/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Column.cs b/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Column.cs index 68649a83b..439dde392 100644 --- a/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Column.cs +++ b/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Column.cs @@ -39,9 +39,6 @@ public Column(string name, IDictionary dataTypes, bool isIde /// Initializes a new instance of the class. /// /// The TSqlObject representing the column. - /// The table or view this column belongs to. - /// The primary keys. - /// The foreign keys. public Column(Dac.TSqlObject tSqlObject) { this.Name = tSqlObject.Name.Parts.Last(); diff --git a/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Procedure.cs b/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Procedure.cs index 6afcdbc6a..bca0b3ba8 100644 --- a/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Procedure.cs +++ b/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Procedure.cs @@ -19,7 +19,6 @@ public class Procedure /// /// Initializes a new instance of the class. /// - /// The prefix used on stored procedure names. public Procedure(Dac.TSqlObject tSqlObject) { this.Name = tSqlObject.Name.Parts.Last(); diff --git a/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Table.cs b/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Table.cs index d30e2a0d5..6793ee44b 100644 --- a/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Table.cs +++ b/src/Nupkg/ErikEJ.EntityFrameworkCore.SqlServer.Dacpac/SqlSharpener/Model/Table.cs @@ -26,8 +26,6 @@ public Table(string name, IEnumerable columns) /// Initializes a new instance of the class. /// /// The TSqlObject representing the table. - /// The primary keys. - /// The foreign keys. public Table(Dac.TSqlObject tSqlObject) { ArgumentNullException.ThrowIfNull(tSqlObject);