FreeSql.Generator 增加神通 DbFirst 生成

Extensions/FreeSql.Generator/ConsoleApp.cs

@@ -114,6 +114,9 @@ new Colorful.Formatter("v" + string.Join(".", typeof(ConsoleApp).Assembly.GetNam
      -DB ""{12},Driver={KingbaseES 8.2 ODBC Driver ANSI};Server=127.0.0.1;Port=54321;UID=USER2;PWD=123456789;database=数据库""
                                {12} 人大金仓数据库
 
+     -DB ""{13},HOST=192.168.164.10;PORT=2003;DATABASE=OSRDB;USERNAME=SYSDBA;PASSWORD=szoscar55;MAXPOOLSIZE=2""
+                               {13} 神州通用数据库
+
      -Filter                   Table+View+StoreProcedure
                                默认生成：表+视图+存储过程
                                如果不想生成视图和存储过程 -Filter View+StoreProcedure
@@ -123,7 +126,7 @@ new Colorful.Formatter("v" + string.Join(".", typeof(ConsoleApp).Assembly.GetNam
      -FileName                 文件名，默认：{name}.cs
 
      -Output                   保存路径，默认为当前 shell 所在目录
-                               {13}
+                               {14}
 
 ", Color.SlateGray,
 new Colorful.Formatter("使用 FreeSql 快速生成数据库的实体类", Color.SlateGray),
@@ -139,6 +142,7 @@ new Colorful.Formatter("Oracle", Color.Yellow),
 new Colorful.Formatter("Sqlite", Color.Yellow),
 new Colorful.Formatter("Dameng", Color.Yellow),
 new Colorful.Formatter("OdbcKingbaseES", Color.Yellow),
+new Colorful.Formatter("ShenTong", Color.Yellow),
 new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新所有实体类", Color.ForestGreen)
 );
                 wait.Set();
@@ -180,6 +184,7 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
                             case "sqlite": ArgsDbType = DataType.Sqlite; break;
                             case "dameng": ArgsDbType = DataType.Dameng; break;
                             case "odbckingbasees": ArgsDbType = DataType.OdbcKingbaseES; break;
+                            case "shentong": ArgsDbType = DataType.ShenTong; break;
                             default: throw new ArgumentException($"-DB 参数错误，不支持的类型：\"{dbargs[0]}\"");
                         }
                         ArgsConnectionString = dbargs[1].Trim();

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

@@ -12,7 +12,7 @@
     <Description>使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator</Description>
     <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
     <RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
-    <Version>1.6.0</Version>
+    <Version>1.6.102</Version>
     <PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
   </PropertyGroup>
 
@@ -27,6 +27,11 @@
       <HintPath>..\..\Providers\FreeSql.Provider.Dameng\lib\DmProvider\netstandard2.0\DmProvider.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Data.OscarClient">
+      <HintPath>..\..\Providers\FreeSql.Provider.ShenTong\lib\System.Data.OscarClient.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.Dameng\FreeSql.Provider.Dameng.csproj" />
@@ -34,6 +39,7 @@
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.Odbc\FreeSql.Provider.Odbc.csproj" />
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.Oracle\FreeSql.Provider.Oracle.csproj" />
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.PostgreSQL\FreeSql.Provider.PostgreSQL.csproj" />
+    <ProjectReference Include="..\..\Providers\FreeSql.Provider.ShenTong\FreeSql.Provider.ShenTong.csproj" />
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.SqlServer\FreeSql.Provider.SqlServer.csproj" />
   </ItemGroup>

FreeSql.DbContext/FreeSql.DbContext.csproj

@@ -37,7 +37,7 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp31'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp30'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -125,13 +125,6 @@
             清空状态数据
             </summary>
         </member>
-        <member name="M:FreeSql.DbSet`1.RemoveAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
-            <summary>
-            根据 lambda 条件删除数据
-            </summary>
-            <param name="predicate"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSql.DbSet`1.Add(`0)">
             <summary>
             添加
@@ -486,14 +479,5 @@
             <param name="that"></param>
             <returns></returns>
         </member>
-        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
-            <summary>
-            批量注入 Repository，可以参考代码自行调整
-            </summary>
-            <param name="services"></param>
-            <param name="globalDataFilter"></param>
-            <param name="assemblies"></param>
-            <returns></returns>
-        </member>
     </members>
 </doc>

FreeSql.Tests/FreeSql.Tests/ShenTong/ShenTongDbFirstTest.cs

@@ -17,7 +17,7 @@ namespace FreeSql.Tests.ShenTong
         [Fact]
         public void GetTablesByDatabase()
         {
-
+            var t1 = g.shentong.DbFirst.GetTablesByDatabase();
             var t2 = g.shentong.DbFirst.GetTablesByDatabase(g.shentong.DbFirst.GetDatabases()[0]);
 
         }

Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
   
 	<ItemGroup>
-		<PackageReference Include="MySqlConnector" Version="0.66.0" />
+		<PackageReference Include="MySqlConnector" Version="0.69.4" />
 	</ItemGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112.2" />
+	  <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.1" />
 	</ItemGroup>
 
 	<ItemGroup>