Less special casing of dapper package

Update some EF Core 6 dependencies Shrink payload size take 1 (Remove Sqlite spatial support just added)
OttarYrjan · Feb 26, 2023 · 66b7ceb · 66b7ceb
1 parent 424594f
commit 66b7ceb
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 21 deletions.
diff --git a/src/GUI/Directory.Build.Props b/src/GUI/Directory.Build.Props
@@ -9,7 +9,7 @@
   </PropertyGroup>  
 
   <ItemGroup>
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.53.0.62665">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/GUI/RevEng.Core.60/RevEng.Core.60.csproj b/src/GUI/RevEng.Core.60/RevEng.Core.60.csproj
@@ -37,11 +37,11 @@
 		<PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="9.1.1" />
 		<PackageReference Include="Humanizer.Core" Version="2.14.1" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.12" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Version="6.0.12" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="6.0.12" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="6.0.7" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.7" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.14" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.14" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="6.0.14" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="6.0.8" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.8" />
 		<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.90" />
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="6.0.2" />
 		<PackageReference Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="6.0.1" />

diff --git a/src/GUI/RevEng.Core.70/RevEng.Core.70.csproj b/src/GUI/RevEng.Core.70/RevEng.Core.70.csproj
@@ -36,7 +36,7 @@
     <PackageReference Include="ErikEJ.EntityFrameworkCore.SqlServer.DateOnlyTimeOnly" Version="7.0.1" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Version="7.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="7.0.3" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.3" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="7.0.3" />

diff --git a/src/GUI/RevEng.Core/RevEng.Core.csproj b/src/GUI/RevEng.Core/RevEng.Core.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Version="3.1.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="3.1.8" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="3.1.4" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="3.1.4" />

diff --git a/src/GUI/RevEng.Core/ServiceProviderBuilder.cs b/src/GUI/RevEng.Core/ServiceProviderBuilder.cs
@@ -209,7 +209,6 @@ public static ServiceProvider Build(ReverseEngineerCommandOptions options, List<
                         dateOnlyTimeOnly.ConfigureDesignTimeServices(serviceCollection);
                     }
 #endif
-
                     break;
 
                 case DatabaseType.Npgsql:
@@ -256,11 +255,6 @@ public static ServiceProvider Build(ReverseEngineerCommandOptions options, List<
                     var sqliteProvider = new SqliteDesignTimeServices();
                     sqliteProvider.ConfigureDesignTimeServices(serviceCollection);
 
-                    if (options.UseSpatial)
-                    {
-                        var spatial = new SqliteNetTopologySuiteDesignTimeServices();
-                        spatial.ConfigureDesignTimeServices(serviceCollection);
-                    }
 #if CORE60
                     if (options.UseNodaTime)
                     {

diff --git a/src/GUI/Shared/Extensions/ProjectExtensions.cs b/src/GUI/Shared/Extensions/ProjectExtensions.cs
@@ -342,6 +342,21 @@ private static List<NuGetPackage> GetNeededPackages(DatabaseType databaseType, R
                         });
                     }
                 }
+
+                if (options.Tables.Any(t => t.ObjectType == ObjectType.Procedure)
+                    && (options.CodeGenerationMode == CodeGenerationMode.EFCore6
+                        || options.CodeGenerationMode == CodeGenerationMode.EFCore7)
+                    && AdvancedOptions.Instance.DiscoverMultipleResultSets)
+                {
+                    packages.Add(new NuGetPackage
+                    {
+                        PackageId = "Dapper",
+                        Version = "2.0.123",
+                        DatabaseTypes = new List<DatabaseType> { DatabaseType.SQLServer, DatabaseType.SQLServerDacpac },
+                        IsMainProviderPackage = false,
+                        UseMethodName = null,
+                    });
+                }
             }
 
             if (databaseType == DatabaseType.SQLite)

diff --git a/src/GUI/Shared/Handlers/ReverseEngineer/ReverseEngineerHandler.cs b/src/GUI/Shared/Handlers/ReverseEngineer/ReverseEngineerHandler.cs
@@ -324,12 +324,6 @@ private static async Task InstallNuGetPackagesAsync(Project project, bool onlyGe
                     nuGetHelper.InstallPackage(nuGetPackage.PackageId, project, new Version(nuGetPackage.Version));
                 }
             }
-
-            if (options.Tables.Any(t => t.ObjectType == ObjectType.Procedure)
-                && AdvancedOptions.Instance.DiscoverMultipleResultSets)
-            {
-                nuGetHelper.InstallPackage("Dapper", project);
-            }
         }
 
         private async Task<bool> ChooseDataBaseConnectionByUiHintAsync(ReverseEngineerOptions options)

diff --git a/src/GUI/Shared/Helpers/ReverseEngineerHelper.cs b/src/GUI/Shared/Helpers/ReverseEngineerHelper.cs
@@ -215,7 +215,8 @@ public string GetReadMeText(ReverseEngineerOptions options, string content)
 
         public string GetReadMeText(ReverseEngineerOptions options, string content, List<NuGetPackage> packages)
         {
-            var extraPackages = packages.Where(p => !p.IsMainProviderPackage).Select(p => $"Use{p.UseMethodName}()").ToList();
+            var extraPackages = packages.Where(p => !p.IsMainProviderPackage && p.UseMethodName != null)
+                .Select(p => $"Use{p.UseMethodName}()").ToList();
 
             var useText = string.Empty;
 

diff --git a/src/GUI/lib/DacFX161.zip b/src/GUI/lib/DacFX161.zip
diff --git a/src/GUI/lib/DacFX161/DacFxStrongTypedCore.161.dll b/src/GUI/lib/DacFX161/DacFxStrongTypedCore.161.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Schema.Sql.dll b/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Schema.Sql.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Schema.Tasks.Sql.dll b/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Schema.Tasks.Sql.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Sql.DesignServices.dll b/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Sql.DesignServices.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Utilities.dll b/src/GUI/lib/DacFX161/Microsoft.Data.Tools.Utilities.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.SqlServer.Dac.Extensions.dll b/src/GUI/lib/DacFX161/Microsoft.SqlServer.Dac.Extensions.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.SqlServer.Dac.dll b/src/GUI/lib/DacFX161/Microsoft.SqlServer.Dac.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.SqlServer.Server.dll b/src/GUI/lib/DacFX161/Microsoft.SqlServer.Server.dll
diff --git a/src/GUI/lib/DacFX161/Microsoft.SqlServer.TransactSql.ScriptDom.dll b/src/GUI/lib/DacFX161/Microsoft.SqlServer.TransactSql.ScriptDom.dll
diff --git a/src/GUI/lib/Microsoft.ApplicationInsights.dll b/src/GUI/lib/Microsoft.ApplicationInsights.dll
diff --git a/src/GUI/lib/efreveng.exe.zip b/src/GUI/lib/efreveng.exe.zip
diff --git a/src/GUI/lib/efreveng60.exe.zip b/src/GUI/lib/efreveng60.exe.zip
diff --git a/src/GUI/lib/efreveng60arm.exe.zip b/src/GUI/lib/efreveng60arm.exe.zip
diff --git a/src/GUI/lib/efreveng70.exe.zip b/src/GUI/lib/efreveng70.exe.zip
diff --git a/src/GUI/lib/efreveng70arm.exe.zip b/src/GUI/lib/efreveng70arm.exe.zip