Use latest ATC .editorconfig (#2839)

* Use latest ATC .editorconfig

* Fix build

src/Core/NUnitTestCore/CliObjectListTest.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -69,7 +68,7 @@ public void CanAddStartsWithFilter()
         }
 
         [Test]
-        public void CanAddStartsWithFilter_2()
+        public void CanAddStartsWithFilter2()
         {
             var config = GetConfig();
 

src/Core/NUnitTestCore/Dacpac/DacpacConsolidatorTest.cs

@@ -8,7 +8,7 @@ public class DacpacConsolidatorTest
     {
         [Test]
         [Ignore("Local only!")]
-        public void CanConsolidate_Issue_274()
+        public void CanConsolidateIssue274()
         {
             // Act
             var result = DacpacConsolidator.Consolidate(@"C:\Users\Erik\Downloads\CompositeDatabase\CompositeDatabase\CompositeDatabase\bin\Debug\CompositeDatabase.dacpac");
@@ -18,7 +18,7 @@ public void CanConsolidate_Issue_274()
         }
 
         [Test]
-        public void CanConsolidate_Without_References_Issue_274()
+        public void CanConsolidateWithoutReferencesIssue274()
         {
             // Arrange
             var dacPath = TestPath("Chinook.dacpac");

src/Core/NUnitTestCore/Dacpac/DacpacTest.cs

@@ -260,7 +260,7 @@ public void Issue210ComputedConstraintIsFK()
         }
 
         [Test]
-        public void Issue1262_ConsiderSchemaArgument()
+        public void Issue1262ConsiderSchemaArgument()
         {
             var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>() { "mat" });
@@ -274,7 +274,7 @@ public void Issue1262_ConsiderSchemaArgument()
         }
 
         [Test]
-        public void Issue1262_BehaviourWithoutSchemaArgument()
+        public void Issue1262BehaviourWithoutSchemaArgument()
         {
             var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
@@ -290,7 +290,7 @@ public void Issue1262_BehaviourWithoutSchemaArgument()
 
         [Test]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "Test")]
-        public void Temporal_Support()
+        public void TemporalSupport()
         {
             var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
@@ -304,7 +304,7 @@ public void Temporal_Support()
         }
 
         [Test]
-        public void Issue_2322_Tvp_Sproc_Parameters()
+        public void Issue2322TvpSprocParameters()
         {
             var factory = new SqlServerDacpacStoredProcedureModelFactory(
                 new SqlServerDacpacDatabaseModelFactoryOptions{ MergeDacpacs = false });

src/Core/NUnitTestCore/ReplacingCandidateNamingServiceTests.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
 using NUnit.Framework;
@@ -41,7 +41,7 @@ public void GeneratePascalCaseTableNameWithSchemaName()
         }
 
         [Test]
-        public void GeneratePascalCaseTableNameWithSchemaName_Issue988()
+        public void GeneratePascalCaseTableNameWithSchemaNameIssue988()
         {
             // Arrange
             var expected = "PetGuineaPig";
@@ -180,7 +180,7 @@ public void GeneratePascalCaseTableNameWithSchemaNameWithMoreThanTwoSchemasForTa
         }
 
         [Test]
-        public void Issue_354()
+        public void Issue354()
         {
             // Arrange
             var exampleOption = new List<Schema>
@@ -696,7 +696,7 @@ public void GenerateCustomTableNameFromJsonUsingRegexRenamingIssue1503()
         /// Testing the table renaming method using Regex.
         /// </summary>
         [Test]
-        public void GenerateCustomTableNameFromJsonUsingRegexRenamingIssue1503_WithCasing()
+        public void GenerateCustomTableNameFromJsonUsingRegexRenamingIssue1503WithCasing()
         {
             // Arrange
             var expected = "Ggd";
@@ -779,7 +779,7 @@ public void GenerateCustomColumnNameUsingRegexRenamingIssue1478()
         }
 
         [Test]
-        public void GenerateCustomColumnNameUsingRegexRenamingIssue1478_Preserve()
+        public void GenerateCustomColumnNameUsingRegexRenamingIssue1478Preserve()
         {
             // Arrange
             var expected = "APPLE_NAME";

src/Core/RevEng.Core.80/ColumnRemovingScaffoldingModelFactory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -64,13 +64,7 @@ protected override EntityTypeBuilder VisitTable(ModelBuilder modelBuilder, Datab
                 var indexesToBeRemoved = new List<DatabaseIndex>();
                 foreach (var index in table.Indexes)
                 {
-                    foreach (var column in index.Columns)
-                    {
-                        if (excludedColumns.Contains(column))
-                        {
-                            indexesToBeRemoved.Add(index);
-                        }
-                    }
+                    indexesToBeRemoved.AddRange(index.Columns.Where(column => excludedColumns.Contains(column)).Select(column => index));
                 }
 
                 foreach (var index in indexesToBeRemoved)
@@ -81,13 +75,7 @@ protected override EntityTypeBuilder VisitTable(ModelBuilder modelBuilder, Datab
                 var constraintsToBeRemoved = new List<DatabaseUniqueConstraint>();
                 foreach (var constraint in table.UniqueConstraints)
                 {
-                    foreach (var column in constraint.Columns)
-                    {
-                        if (excludedColumns.Contains(column))
-                        {
-                            constraintsToBeRemoved.Add(constraint);
-                        }
-                    }
+                    constraintsToBeRemoved.AddRange(constraint.Columns.Where(column => excludedColumns.Contains(column)).Select(column => constraint));
                 }
 
                 foreach (var constraint in constraintsToBeRemoved)
@@ -98,13 +86,7 @@ protected override EntityTypeBuilder VisitTable(ModelBuilder modelBuilder, Datab
                 var fksToBeRemoved = new List<DatabaseForeignKey>();
                 foreach (var fk in table.ForeignKeys)
                 {
-                    foreach (var column in fk.Columns)
-                    {
-                        if (excludedColumns.Contains(column))
-                        {
-                            fksToBeRemoved.Add(fk);
-                        }
-                    }
+                    fksToBeRemoved.AddRange(fk.Columns.Where(column => excludedColumns.Contains(column)).Select(column => fk));
                 }
 
                 foreach (var fk in fksToBeRemoved)
@@ -143,4 +125,4 @@ protected override ModelBuilder VisitForeignKeys(ModelBuilder modelBuilder, ILis
             return base.VisitForeignKeys(modelBuilder, foreignKeys);
         }
     }
-}
+}

src/Core/RevEng.Core.80/ConnectionStringResolver.cs

@@ -109,4 +109,4 @@ public string Redact()
         }
 #pragma warning restore CA1031
     }
-}
+}

src/Core/RevEng.Core.80/CustomTemplateFileService.cs

@@ -1,5 +1,5 @@
-using EntityFrameworkCore.Scaffolding.Handlebars;
-using System.IO;
+using System.IO;
+using EntityFrameworkCore.Scaffolding.Handlebars;
 
 namespace RevEng.Core
 {
@@ -22,4 +22,4 @@ public override string RetrieveTemplateFileContents(
             return contents;
         }
     }
-}
+}

src/Core/RevEng.Core.80/DabBuilder.cs

@@ -304,4 +304,4 @@ private RoutineModel GetStoredProcedures()
             return procedureModelFactory.Create(options.Dacpac ?? options.ConnectionString, modelFactoryOptions);
         }
     }
-}
+}

src/Core/RevEng.Core.80/DacpacReport/DacpacExtractor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Dac;
@@ -36,4 +36,4 @@ public FileInfo ExtractDacpac()
             return new FileInfo(extractedPackagePath);
         }
     }
-}
+}

src/Core/RevEng.Core.80/DacpacReport/DacpacReportBuilder.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using SqlServer.Rules.Report;
 
@@ -33,4 +33,4 @@ public string BuildReport()
             return Path.Join(Path.GetDirectoryName(dacpac.FullName), fileName);
         }
     }
-}
+}

src/Core/RevEng.Core.80/DataverseModelFactoryExtension.cs

@@ -192,4 +192,4 @@ public void GetDataverseMetadata(List<DatabaseTable> tables)
             }
         }
     }
-}
+}

src/Core/RevEng.Core.80/DbContextSplitter.cs

@@ -1,10 +1,10 @@
-using RevEng.Common;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using RevEng.Common;
 
 [assembly: CLSCompliant(false)]
 
@@ -82,10 +82,10 @@ public static List<string> Split(string dbContextPath, string configNamespace, b
             var configurationLines = new List<string>();
             var index = 0;
 
-            foreach (var blockMatch in statementsBlockMatches)
+            foreach (var groups in statementsBlockMatches.Select(m => m.Groups))
             {
-                var entityName = blockMatch.Groups["EntityName"].Value;
-                var entityParameterName = blockMatch.Groups["EntityParameterName"].Value;
+                var entityName = groups["EntityName"].Value;
+                var entityParameterName = groups["EntityParameterName"].Value;
                 var statements = configBlocks[index];
 
                 var sb = new StringBuilder();
@@ -253,4 +253,4 @@ private static List<string> GetConfigurationBlocks(string[] sourceLines)
             return finalSections;
         }
     }
-}
+}

src/Core/RevEng.Core.80/Diagram/DatabaseModelToDgml.cs

@@ -98,4 +98,4 @@ public void CreateDgml()
             }
         }
     }
-}
+}

src/Core/RevEng.Core.80/Diagram/DatabaseModelToMermaid.cs

@@ -130,4 +130,4 @@ private static string Sanitize(string name)
             return name;
         }
     }
-}
+}

src/Core/RevEng.Core.80/Diagram/DgmlHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Security;
 using System.Xml;
 
@@ -201,4 +201,4 @@ internal void Close()
 #pragma warning restore SA1503 // Braces should not be omitted
 
     }
-}
+}

src/Core/RevEng.Core.80/Diagram/DiagramBuilder.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.EntityFrameworkCore.Scaffolding;
@@ -55,4 +55,4 @@ private DatabaseModel GetModelInternal()
             return dbModel;
         }
     }
-}
+}

src/Core/RevEng.Core.80/Diagram/ErDiagramBuilder.cs

@@ -25,7 +25,6 @@ public ErDiagramBuilder(DataApiBuilderOptions dataApiBuilderCommandOptions)
                 DatabaseType = dataApiBuilderOptions.DatabaseType,
                 ConnectionString = dataApiBuilderOptions.ConnectionString,
                 Dacpac = dataApiBuilderOptions.Dacpac,
-                MergeDacpacs = dataApiBuilderOptions.MergeDacpacs,
             };
 
             serviceProvider = new ServiceCollection().AddEfpt(options, [], [], []).BuildServiceProvider();
@@ -56,4 +55,4 @@ private DatabaseModel GetModelInternal()
             return dbModel;
         }
     }
-}
+}

src/Core/RevEng.Core.80/GlobalSuppressions.cs

@@ -6,4 +6,4 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("Design", "CA1002:Do not expose generic lists", Justification = "Reviewed.")]
-[assembly: SuppressMessage("Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "reviewed")]
+[assembly: SuppressMessage("Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "reviewed")]

src/Core/RevEng.Core.80/HumanizerPluralizer.cs

@@ -11,4 +11,4 @@ public string Pluralize(string identifier)
         public string Singularize(string identifier)
             => identifier?.Singularize(inputIsKnownToBePlural: false);
     }
-}
+}

src/Core/RevEng.Core.80/IReverseEngineerScaffolder.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using RevEng.Common;
 
@@ -7,7 +7,9 @@ namespace RevEng.Core
     public interface IReverseEngineerScaffolder
     {
         SavedModelFiles GenerateDbContext(ReverseEngineerCommandOptions options, List<string> schemas, string outputContextDir, string modelNamespace, string contextNamespace, string projectPath, string outputPath, string rootNameSpace);
+
         SavedModelFiles GenerateFunctions(ReverseEngineerCommandOptions options, List<string> schemas, ref List<string> errors, string outputContextDir, string modelNamespace, string contextNamespace, bool supportsFunctions);
+
         SavedModelFiles GenerateStoredProcedures(ReverseEngineerCommandOptions options, List<string> schemas, ref List<string> errors, string outputContextDir, string modelNamespace, string contextNamespace, bool supportsProcedures);
     }
-}
+}

src/Core/RevEng.Core.80/LegacyPluralizer.cs

@@ -15,4 +15,4 @@ public string Singularize(string identifier)
             return new Pluralizer().Singularize(identifier) ?? identifier;
         }
     }
-}
+}

src/Core/RevEng.Core.80/ReplacingCandidateNamingService.cs

@@ -1,12 +1,12 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Scaffolding.Internal;
-using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
-using RevEng.Common;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
+using RevEng.Common;
 
 namespace RevEng.Core
 {
@@ -15,6 +15,7 @@ public class ReplacingCandidateNamingService : CandidateNamingService
         private readonly List<Schema> customNameOptions;
         private readonly bool preserveCasingUsingRegex;
         private readonly bool usePrefixNaming;
+
         public ReplacingCandidateNamingService(
             bool usePrefixNaming,
             List<Schema> customNameOptions,
@@ -263,4 +264,4 @@ private static string RegexNameReplace(string pattern, string originalName, stri
         private Schema GetSchema(string originalSchema)
             => customNameOptions?.Find(x => x.SchemaName == originalSchema);
     }
-}
+}