Remove EF Core 6 reveng related files (#2660)

* Remove EF Core 6 reveng related files Remove EF 6 CLI and stop pusing it to Nuget * fix tests * fix vsix build
ErikEJ · Nov 26, 2024 · 5028a0a · 5028a0a
1 parent 13443a2
commit 5028a0a
Show file tree

Hide file tree

Showing 93 changed files with 58 additions and 1,838 deletions.
diff --git a/.github/workflows/cli-release.yml b/.github/workflows/cli-release.yml
@@ -17,9 +17,6 @@ jobs:
     - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0.403'
-
-    - name: Package CLI 6
-      run: dotnet pack src\Core\efcpt.6\efcpt.6.csproj -p:PackageVersion=6.1.${{ github.event.inputs.version }} -p:InformationalVersion=6.1.${{ github.event.inputs.version }}
 
     - name: Package CLI 8
       run: dotnet pack src\Core\efcpt.8\efcpt.8.csproj -p:PackageVersion=8.1.${{ github.event.inputs.version }} -p:InformationalVersion=8.1.${{ github.event.inputs.version }}

diff --git a/.github/workflows/cli-tool.yml b/.github/workflows/cli-tool.yml
@@ -26,9 +26,6 @@ jobs:
     - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0.404'
-
-    - name: Package CLI 6
-      run: dotnet pack src\Core\efcpt.6\efcpt.6.csproj -p:PackageVersion=6.1.${{ env.VERSION }}-nightly -p:InformationalVersion=6.1.${{ env.VERSION }}-nightly
 
     - name: Package CLI 8
       run: dotnet pack src\Core\efcpt.8\efcpt.8.csproj -p:PackageVersion=8.1.${{ env.VERSION }}-nightly -p:InformationalVersion=8.1.${{ env.VERSION }}-nightly

diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml
@@ -47,22 +47,12 @@ jobs:
     - name: Build reveng tools
       shell: cmd
       run: |
-        cd ${{ github.workspace}}\src\Core\efreveng60
-        call ${{ github.workspace}}\src\Core\efreveng60\BuildCmdlineTool.cmd
         cd ${{ github.workspace}}\src\Core\efreveng80
         call ${{ github.workspace}}\src\Core\efreveng80\BuildCmdlineTool.cmd
         cd ${{ github.workspace}}\src\Core\efreveng90
         call ${{ github.workspace}}\src\Core\efreveng90\BuildCmdlineTool.cmd
         cd ${{ github.workspace}}
 
-    - name: Extract and verify efreveng60.exe.zip file count
-      shell: cmd
-      run: |
-        mkdir vsix
-        7z x src/GUI/lib/efreveng60.exe.zip -oefreveng60 -y
-        dir /a:-d /s /b "efreveng60" | find /c ":\" > filecount.txt
-        findstr "159" filecount.txt
-
     - name: Extract and verify efreveng80.exe.zip file count
       shell: cmd
       run: |

diff --git a/src/Core/NUnitTestCore/Dacpac/DacpacTest.cs b/src/Core/NUnitTestCore/Dacpac/DacpacTest.cs
@@ -60,7 +60,7 @@ public void CanEnumerateSelectedTables()
         public void CanEnumerateSelectedQuirkObjects()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var tables = new List<string> { "[dbo].[FilteredIndexTable]", "[dbo].[DefaultComputedValues]" };
             var options = new DatabaseModelFactoryOptions(tables, new List<string>());
 
@@ -82,7 +82,7 @@ public void CanEnumerateSelectedQuirkObjects()
         public void CanEnumerateSelectedComputed()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var tables = new List<string> { "[dbo].[DefaultComputedValues]" };
             var options = new DatabaseModelFactoryOptions(tables, new List<string>());
 
@@ -100,7 +100,7 @@ public void CanEnumerateSelectedComputed()
         public void CanEnumerateTypeAlias()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var tables = new List<string> { "[dbo].[TypeAlias]" };
             var options = new DatabaseModelFactoryOptions(tables, new List<string>());
 
@@ -120,7 +120,7 @@ public void CanEnumerateTypeAlias()
         public void CanHandleDefaultValues()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var tables = new List<string> { "[dbo].[DefaultValues]" };
             var options = new DatabaseModelFactoryOptions(tables, new List<string>());
 
@@ -137,7 +137,7 @@ public void CanHandleDefaultValues()
         public void CanBuildAW2014()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
 
             // Act
@@ -151,7 +151,7 @@ public void CanBuildAW2014()
         public void Issue208ComputedConstraint()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
 
             // Act
@@ -165,7 +165,7 @@ public void Issue208ComputedConstraint()
         public void Issue210ComputedConstraintIsFK()
         {
             // Arrange
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
 
             // Act
@@ -178,7 +178,7 @@ public void Issue210ComputedConstraintIsFK()
         [Test]
         public void Issue1262_ConsiderSchemaArgument()
         {
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>() { "mat" });
 
             // Act
@@ -192,7 +192,7 @@ public void Issue1262_ConsiderSchemaArgument()
         [Test]
         public void Issue1262_BehaviourWithoutSchemaArgument()
         {
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
 
             // Act
@@ -208,7 +208,7 @@ public void Issue1262_BehaviourWithoutSchemaArgument()
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "Test")]
         public void Temporal_Support()
         {
-            var factory = new SqlServerDacpacDatabaseModelFactory(null);
+            var factory = new SqlServerDacpacDatabaseModelFactory();
             var options = new DatabaseModelFactoryOptions(null, new List<string>());
 
             // Act

diff --git a/src/Core/NUnitTestCore/NUnitTestCore.csproj b/src/Core/NUnitTestCore/NUnitTestCore.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -96,9 +96,9 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.8.SqlServer.Dacpac.csproj" />
     <ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.DgmlBuilder\ErikEJ.EntityFrameworkCore.DgmlBuilder.csproj" />
-    <ProjectReference Include="..\..\Nupkg\ErikEJ.EntityFrameworkCore.SqlServer.Dacpac\ErikEJ.EntityFrameworkCore.6.SqlServer.Dacpac.csproj" />
-    <ProjectReference Include="..\RevEng.Core.60\RevEng.Core.60.csproj" />
+    <ProjectReference Include="..\RevEng.Core.80\RevEng.Core.80.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Core/NUnitTestCore/ReplacingCandidateNamingServiceTests.cs b/src/Core/NUnitTestCore/ReplacingCandidateNamingServiceTests.cs
@@ -25,7 +25,7 @@ public void GeneratePascalCaseTableNameWithSchemaName()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -62,7 +62,7 @@ public void GeneratePascalCaseTableNameWithSchemaName_Issue988()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -96,7 +96,7 @@ public void GeneratePascalCaseTableNameWithSchemaNameWithMoreThanTwoSchemas()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -139,7 +139,7 @@ public void GeneratePascalCaseTableNameWithSchemaNameWithMoreThanTwoSchemasForTa
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTables = new List<DatabaseTable>
             {
@@ -209,7 +209,7 @@ public void Issue_354()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTables = new List<DatabaseTable>
             {
@@ -265,7 +265,7 @@ public void GeneratePascalCaseTableNameWithMoreThanTwoSchemasForTableCollection(
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTables = new List<DatabaseTable>
             {
@@ -332,7 +332,7 @@ public void GenerateCustomTableNameFromJson()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -371,7 +371,7 @@ public void GenerateCustomTableNameFromJsonWithTableCollection()
                 },
             };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTables = new List<DatabaseTable>
             {
@@ -446,7 +446,7 @@ public void GenerateColumnNameFromJson()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             // Act
             var actResult = sut.GenerateCandidateIdentifier(exampleColumn);
@@ -495,7 +495,7 @@ public void GenerateColumnNameInStandarNamingConvention()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             // Act
             var actResult = sut.GenerateCandidateIdentifier(exampleColumn);
@@ -577,7 +577,7 @@ public void ChangeColumnNameToCustom()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             // Act
             var actResult = new List<string>();
@@ -611,7 +611,7 @@ public void GenerateCustomTableNameFromJsonUsingRegexRenaming()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -645,7 +645,7 @@ public void GenerateCustomTableNameFromJsonUsingRegexRenamingIssue1440()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -678,7 +678,7 @@ public void GenerateCustomTableNameFromJsonUsingRegexRenamingIssue1503()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption, true);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption, true);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -711,7 +711,7 @@ public void GenerateCustomTableNameFromJsonUsingRegexRenamingIssue1503_WithCasin
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption, false);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption, false);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -759,7 +759,7 @@ public void GenerateCustomColumnNameUsingRegexRenamingIssue1478()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbColumn = new DatabaseColumn
             {
@@ -796,7 +796,7 @@ public void GenerateCustomColumnNameUsingRegexRenamingIssue1478_Preserve()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption, true);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption, true);
 
             var exampleDbColumn = new DatabaseColumn
             {
@@ -834,7 +834,7 @@ public void GenerateCustomColumnNameUsingRegexRenamingIssue1503()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption, true);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption, true);
 
             var exampleDbColumn = new DatabaseColumn
             {
@@ -887,7 +887,7 @@ public void GenerateCustomColumnNameUsingRegexRenamingIssue1486()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbColumn = new DatabaseColumn
             {
@@ -933,7 +933,7 @@ public void GenerateCustomTableNameFromJsonUsingRegexRenamingOverwritten()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             var exampleDbTable = new DatabaseTable
             {
@@ -978,7 +978,7 @@ public void GenerateCustomColumnNameFromJsonUsingRegexRenaming()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             // Act
             var actResult = sut.GenerateCandidateIdentifier(exampleColumn);
@@ -1032,7 +1032,7 @@ public void GenerateCustomColumnNameFromJsonUsingRegexRenamingOverwritten()
                   },
               };
 
-            var sut = new ReplacingCandidateNamingService(exampleOption);
+            var sut = new ReplacingCandidateNamingService(false, exampleOption);
 
             // Act
             var actResult = sut.GenerateCandidateIdentifier(exampleColumn);