Merge pull request #64 from beginor/smartcode_master

dotnet 6.0.0
dotnetcore · Jan 11, 2022 · 2233bd7 · 2233bd7
2 parents 81c7c0c + 256cfb6
commit 2233bd7
Show file tree

Hide file tree

Showing 35 changed files with 234 additions and 459 deletions.
diff --git a/.gitignore b/.gitignore
@@ -221,7 +221,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -317,7 +317,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,7 +326,8 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 /.vscode/tasks.json
 /.vscode/launch.json
+.DS_Store
diff --git a/README-EN.md b/README-EN.md
@@ -261,7 +261,7 @@ Build:
 | Author | Author |
 | DataSource | Data Source |
 | Language | Language: CSharp/Java/.... |
-| TemplateEngine | Template Engine: Currently Built: Razor/Handlebars |
+| TemplateEngine | Template Engine: Currently Built: Razor |
 | Output | Output |
 | Build | Task Build |
 
@@ -358,4 +358,4 @@ Build:
       ,{Column: Deleted,Mapping: deleted}]
       PreCommand: 
       PostCommand: 
-```
+```
diff --git a/README.md b/README.md
@@ -261,7 +261,7 @@ Build:
 | Author | 作者 |
 | DataSource | 数据源 |
 | Language | 语言：CSharp/Java/.... |
-| TemplateEngine | 模板引擎：目前内置：Razor/Handlebars |
+| TemplateEngine | 模板引擎：目前内置：Razor |
 | Output | 输出 |
 | Build | 任务构建s |
 
@@ -368,4 +368,4 @@ Build:
       ,{Column: Deleted,Mapping: deleted}]
       PreCommand: 
       PostCommand: 
-```
+```
diff --git a/doc/SmartCode-TypeScript.yml b/doc/SmartCode-TypeScript.yml
@@ -59,6 +59,7 @@ Build:
     Type: Table
     Module: Data
     TemplateEngine:
+      Name: RazorCore
       Path: Model.cshtml
     Output:
       Path: '{{Items.CurrentTable.Name}}/services'

diff --git a/doc/SmartCode.ETL-EN.md b/doc/SmartCode.ETL-EN.md
@@ -84,11 +84,7 @@ I believe that many students who have already landed the microservices architect
       },
       {
         "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
-      },
-      {
-        "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
+        "ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
       },
       {
         "Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -274,4 +270,4 @@ The following is the data loading performance, the amount of bulk insert data is
 At present, SmartCode.ETL has been put into our production environment (2018-11-01 went online, as of 2018-11-16 16:50 executed 65520 synchronization tasks, no error log was thrown
 )
 
-> PS: Although SmartCode.ETL only took two days to complete the expansion on the weekend, it can already meet at least 90% of our application scenarios. This is enough to see how amazing the SmartCode expansion capabilities are. Of course, other capabilities of SmartCode have to be followed up and explored! ! !
+> PS: Although SmartCode.ETL only took two days to complete the expansion on the weekend, it can already meet at least 90% of our application scenarios. This is enough to see how amazing the SmartCode expansion capabilities are. Of course, other capabilities of SmartCode have to be followed up and explored! ! !
diff --git a/doc/SmartCode.ETL.md b/doc/SmartCode.ETL.md
@@ -84,11 +84,7 @@
       },
       {
         "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
-      },
-      {
-        "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
+        "ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
       },
       {
         "Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -274,4 +270,4 @@ LastMaxModifyTime 即上一次抽取的数据最大ModifyTime值(第一次抽取
 
 目前 SmartCode.ETL 已经落地到我们的生产环境了（11-01上线截至 2018-11-16 16：50 执行了 65520 次同步任务，暂无error日志抛出）
 
-> PS： 虽然 SmartCode.ETL 只花了周末俩天时间完成扩展，但已经可以满足我们至少90%的应用场景。这足以见得 SmartCode 扩展能力是多么令人意外了。当然SmartCode的其他能力还得后续等各位一起发掘！！！
+> PS： 虽然 SmartCode.ETL 只花了周末俩天时间完成扩展，但已经可以满足我们至少90%的应用场景。这足以见得 SmartCode 扩展能力是多么令人意外了。当然SmartCode的其他能力还得后续等各位一起发掘！！！
diff --git a/doc/common-problem.md b/doc/common-problem.md
@@ -67,11 +67,7 @@ SmartCode 插件机制拥有非常灵活的扩展能力，SmartCode 中一切都
       },
       {
         "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
-      },
-      {
-        "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
+        "ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
       },
       {
         "Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -111,9 +107,9 @@ SmartCode 插件机制拥有非常灵活的扩展能力，SmartCode 中一切都
 
 ## 如何自定义模板
 
-目前SmartCode支持俩种模板引擎 **Razor** & **Handlebars** 。
+目前SmartCode支持模板引擎 **Razor**  。
 Razor 模板引擎使用的是官方版本，这一点上.NETer同学可以很轻松的自定义SmartCode模板，需要注意的是Razor模板的Model为BuildContext,具体方法可以参考源代码中的模板。编写完成之后放到RazorTemplates，构建时指定好即可。
 
 ## 代码生成器支持多少种数据库
 
-SmartCode获取数据源结构使用的是[SmartSql](https://github.com/Ahoo-Wang/SmartSql)，所以SmartCode支持所有ADO.NET驱动相关的数据库：MySql/PostgreSql/SqlServer/Oracle/SQLite 等
+SmartCode获取数据源结构使用的是[SmartSql](https://github.com/Ahoo-Wang/SmartSql)，所以SmartCode支持所有ADO.NET驱动相关的数据库：MySql/PostgreSql/SqlServer/Oracle/SQLite 等
diff --git a/src/SmartCode.App/SmartCode.App.csproj b/src/SmartCode.App/SmartCode.App.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Handlebars.Net" Version="1.10.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Handlebars.Net" Version="2.0.9" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SmartCode.ETL\SmartCode.ETL.csproj" />

diff --git a/src/SmartCode.App/SmartCodeApp.cs b/src/SmartCode.App/SmartCodeApp.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -7,6 +8,7 @@
 using System.IO;
 using SmartCode.Configuration.ConfigBuilders;
 using System.Reflection;
+using System.Text;
 using HandlebarsDotNet;
 using SmartCode.ETL;
 using SmartCode.Generator;
@@ -136,6 +138,25 @@ public string Encode(string value)
             {
                 return value;
             }
+
+            public void Encode(StringBuilder text, TextWriter target)
+            {
+                target.Write(text.ToString());
+            }
+
+            public void Encode(string text, TextWriter target)
+            {
+                target.Write(text);
+            }
+
+            public void Encode<T>(T text, TextWriter target) where T : IEnumerator<char>
+            {
+                while (text.MoveNext())
+                {
+                    target.Write(text.Current);
+                }
+            }
+
         }
     }
-}
+}
diff --git a/src/SmartCode.CLI/SmartCode.CLI.csproj b/src/SmartCode.CLI/SmartCode.CLI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>SmartCode</ToolCommandName>
@@ -14,11 +14,11 @@
     </PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartCode.CLI/appsettings.json b/src/SmartCode.CLI/appsettings.json
@@ -51,11 +51,7 @@
       },
       {
         "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
-      },
-      {
-        "Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
-        "ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
+        "ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
       },
       {
         "Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -100,7 +96,7 @@
         "Type": "SmartCode.ETL.IETLTaskRepository,SmartCode.ETL",
         "ImplType": "SmartCode.ETL.SQLite.SQLiteETLTaskRepository,SmartCode.ETL.SQLite",
         "Parameters": {
-          //"ConnectionString": "Data Source=YOUR_DB_DIR\smartcode-etl.db;Version=3;"
+          // "ConnectionString": "Data Source=YOUR_DB_DIR\smartcode-etl.db;Version=3;"
         }
       }
     ]

diff --git a/src/SmartCode.Db/SmartCode.Db.csproj b/src/SmartCode.Db/SmartCode.Db.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SmartSql.Options" Version="4.1.50" />
-    <PackageReference Include="SmartSql.TypeHandler" Version="4.1.50" />
-    <PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.1.50" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.112" />
-    <PackageReference Include="MySql.Data" Version="8.0.19" />
-    <PackageReference Include="Npgsql" Version="4.1.3.1" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.60" />
+    <PackageReference Include="SmartSql.Options" Version="4.1.57" />
+    <PackageReference Include="SmartSql.TypeHandler" Version="4.1.57" />
+    <PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.1.57" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
+    <PackageReference Include="MySql.Data" Version="8.0.27" />
+    <PackageReference Include="Npgsql" Version="6.0.0" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartCode.ETL.LoadToES/LoadToESBuildTask.cs b/src/SmartCode.ETL.LoadToES/LoadToESBuildTask.cs
@@ -80,7 +80,7 @@ public async Task Build(BuildContext context)
                          if (colMapping.TryGetValue(itemKey, out string mapping))
                          {
                              itemKey = mapping;
-                         }                        
+                         }
                      }
                      newItem.Add(itemKey,item.Value);
                  }
@@ -90,16 +90,15 @@ public async Task Build(BuildContext context)
             #endregion
             #region BatchInsert
             var esClient = GetElasticClient(esOptions);
-            var indexExResp = await esClient.IndexExistsAsync(esOptions.Index);
+            var indexExResp = await esClient.Indices.ExistsAsync(esOptions.Index);
             if (!indexExResp.Exists)
             {
-                var createIndexResp = await esClient.CreateIndexAsync(esOptions.Index);
+                var createIndexResp = await esClient.Indices.CreateAsync(esOptions.Index);
             }
-            var esSyncResp = await esClient.BulkAsync((bulkRequest) =>
-            {
-                var bulkReqDesc = bulkRequest
-                  .Index(esOptions.Index)
-                  .Type(esOptions.TypeName);
+            var esSyncResp = await esClient.BulkAsync((bulkRequest) => {
+                    var bulkReqDesc = bulkRequest
+                        .Index(esOptions.Index);
+                  // .Type(esOptions.TypeName);
                 if (context.Build.Parameters.Value(ID_MAPPING, out string es_id))
                 {
                     return bulkReqDesc.IndexMany(dataSource.TransformData, (bulkIdxDesc, item) =>
@@ -150,7 +149,7 @@ private IElasticClient GetElasticClient(ESOptions esOptions)
             Uri node = new Uri(esOptions.Host);
             ConnectionSettings settings = new ConnectionSettings(node);
             settings.DefaultIndex(esOptions.Index);
-            settings.DefaultTypeName(esOptions.TypeName);
+            // settings.DefaultTypeName(esOptions.TypeName);
             #region Auth
             if (!String.IsNullOrEmpty(esOptions.UserName))
             {

diff --git a/src/SmartCode.ETL.LoadToES/SmartCode.ETL.LoadToES.csproj b/src/SmartCode.ETL.LoadToES/SmartCode.ETL.LoadToES.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NEST" Version="6.4.1" />
+    <PackageReference Include="NEST" Version="7.15.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartCode.ETL.PostgreSql/SmartCode.ETL.PostgreSql.csproj b/src/SmartCode.ETL.PostgreSql/SmartCode.ETL.PostgreSql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/SmartCode.ETL.SQLite/SmartCode.ETL.SQLite.csproj b/src/SmartCode.ETL.SQLite/SmartCode.ETL.SQLite.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SQLite" Version="1.0.112" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartCode.ETL/SmartCode.ETL.csproj b/src/SmartCode.ETL/SmartCode.ETL.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SmartSql.Bulk.MySql" Version="4.1.52" />
-    <PackageReference Include="SmartSql.Bulk.PostgreSql" Version="4.1.52" />
-    <PackageReference Include="SmartSql.Bulk.SqlServer" Version="4.1.52" />
+    <PackageReference Include="SmartSql.Bulk.MySql" Version="4.1.57" />
+    <PackageReference Include="SmartSql.Bulk.PostgreSql" Version="4.1.57" />
+    <PackageReference Include="SmartSql.Bulk.SqlServer" Version="4.1.57" />
   </ItemGroup>
 
   <ItemGroup>