Skip to content

Commit 2233bd7

Browse files
Ahoo-WangAhoo-Wang
authored
Merge pull request #64 from beginor/smartcode_master
dotnet 6.0.0
2 parents 81c7c0c + 256cfb6 commit 2233bd7

35 files changed

Lines changed: 234 additions & 459 deletions

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ ClientBin/
221221
*.publishsettings
222222
orleans.codegen.cs
223223

224-
# Including strong name files can present a security risk
224+
# Including strong name files can present a security risk
225225
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
226226
#*.snk
227227

@@ -317,7 +317,7 @@ __pycache__/
317317
# OpenCover UI analysis results
318318
OpenCover/
319319

320-
# Azure Stream Analytics local run output
320+
# Azure Stream Analytics local run output
321321
ASALocalRun/
322322

323323
# MSBuild Binary and Structured Log
@@ -326,7 +326,8 @@ ASALocalRun/
326326
# NVidia Nsight GPU debugger configuration file
327327
*.nvuser
328328

329-
# MFractors (Xamarin productivity tool) working folder
329+
# MFractors (Xamarin productivity tool) working folder
330330
.mfractor/
331331
/.vscode/tasks.json
332332
/.vscode/launch.json
333+
.DS_Store

‎README-EN.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Build:
261261
| Author | Author |
262262
| DataSource | Data Source |
263263
| Language | Language: CSharp/Java/.... |
264-
| TemplateEngine | Template Engine: Currently Built: Razor/Handlebars |
264+
| TemplateEngine | Template Engine: Currently Built: Razor |
265265
| Output | Output |
266266
| Build | Task Build |
267267

@@ -358,4 +358,4 @@ Build:
358358
,{Column: Deleted,Mapping: deleted}]
359359
PreCommand:
360360
PostCommand:
361-
```
361+
```

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Build:
261261
| Author | 作者 |
262262
| DataSource | 数据源 |
263263
| Language | 语言：CSharp/Java/.... |
264-
| TemplateEngine | 模板引擎：目前内置：Razor/Handlebars |
264+
| TemplateEngine | 模板引擎：目前内置：Razor |
265265
| Output | 输出 |
266266
| Build | 任务构建s |
267267

@@ -368,4 +368,4 @@ Build:
368368
,{Column: Deleted,Mapping: deleted}]
369369
PreCommand:
370370
PostCommand:
371-
```
371+
```

‎doc/SmartCode-TypeScript.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Build:
5959
Type: Table
6060
Module: Data
6161
TemplateEngine:
62+
Name: RazorCore
6263
Path: Model.cshtml
6364
Output:
6465
Path: '{{Items.CurrentTable.Name}}/services'

‎doc/SmartCode.ETL-EN.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ I believe that many students who have already landed the microservices architect
8484
},
8585
{
8686
"Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
87-
"ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
88-
},
89-
{
90-
"Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
91-
"ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
87+
"ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
9288
},
9389
{
9490
"Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -274,4 +270,4 @@ The following is the data loading performance, the amount of bulk insert data is
274270
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
275271
)
276272

277-
> 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! ! !
273+
> 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! ! !

‎doc/SmartCode.ETL.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@
8484
},
8585
{
8686
"Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
87-
"ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
88-
},
89-
{
90-
"Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
91-
"ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
87+
"ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
9288
},
9389
{
9490
"Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -274,4 +270,4 @@ LastMaxModifyTime 即上一次抽取的数据最大ModifyTime值(第一次抽取
274270

275271
目前 SmartCode.ETL 已经落地到我们的生产环境了（11-01上线截至 2018-11-16 16：50 执行了 65520 次同步任务，暂无error日志抛出）
276272

277-
> PS： 虽然 SmartCode.ETL 只花了周末俩天时间完成扩展，但已经可以满足我们至少90%的应用场景。这足以见得 SmartCode 扩展能力是多么令人意外了。当然SmartCode的其他能力还得后续等各位一起发掘！！！
273+
> PS： 虽然 SmartCode.ETL 只花了周末俩天时间完成扩展，但已经可以满足我们至少90%的应用场景。这足以见得 SmartCode 扩展能力是多么令人意外了。当然SmartCode的其他能力还得后续等各位一起发掘！！！

‎doc/common-problem.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ SmartCode 插件机制拥有非常灵活的扩展能力，SmartCode 中一切都
6767
},
6868
{
6969
"Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
70-
"ImplType": "SmartCode.TemplateEngine.Impl.HandlebarsTemplateEngine,SmartCode.TemplateEngine"
71-
},
72-
{
73-
"Type": "SmartCode.TemplateEngine.ITemplateEngine,SmartCode.TemplateEngine",
74-
"ImplType": "SmartCode.TemplateEngine.Impl.OfficialRazorTemplateEngine,SmartCode.TemplateEngine"
70+
"ImplType": "SmartCode.TemplateEngine.Impl.RazorCoreTemplateEngine,SmartCode.TemplateEngine"
7571
},
7672
{
7773
"Type": "SmartCode.Generator.IDbTypeConverter,SmartCode.Generator",
@@ -111,9 +107,9 @@ SmartCode 插件机制拥有非常灵活的扩展能力，SmartCode 中一切都
111107

112108
## 如何自定义模板
113109

114-
目前SmartCode支持俩种模板引擎 **Razor** & **Handlebars** 。
110+
目前SmartCode支持模板引擎 **Razor** 。
115111
Razor 模板引擎使用的是官方版本，这一点上.NETer同学可以很轻松的自定义SmartCode模板，需要注意的是Razor模板的Model为BuildContext,具体方法可以参考源代码中的模板。编写完成之后放到RazorTemplates，构建时指定好即可。
116112

117113
## 代码生成器支持多少种数据库
118114

119-
SmartCode获取数据源结构使用的是[SmartSql](https://github.com/Ahoo-Wang/SmartSql)，所以SmartCode支持所有ADO.NET驱动相关的数据库：MySql/PostgreSql/SqlServer/Oracle/SQLite 等
115+
SmartCode获取数据源结构使用的是[SmartSql](https://github.com/Ahoo-Wang/SmartSql)，所以SmartCode支持所有ADO.NET驱动相关的数据库：MySql/PostgreSql/SqlServer/Oracle/SQLite 等

‎src/SmartCode.App/SmartCode.App.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Handlebars.Net" Version="1.10.1" />
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
7+
<PackageReference Include="Handlebars.Net" Version="2.0.9" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\SmartCode.ETL\SmartCode.ETL.csproj" />

‎src/SmartCode.App/SmartCodeApp.cs‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Collections.Generic;
23
using System.Diagnostics;
34
using Microsoft.Extensions.DependencyInjection;
45
using Microsoft.Extensions.Logging;
@@ -7,6 +8,7 @@
78
using System.IO;
89
using SmartCode.Configuration.ConfigBuilders;
910
using System.Reflection;
11+
using System.Text;
1012
using HandlebarsDotNet;
1113
using SmartCode.ETL;
1214
using SmartCode.Generator;
@@ -136,6 +138,25 @@ public string Encode(string value)
136138
{
137139
return value;
138140
}
141+
142+
public void Encode(StringBuilder text, TextWriter target)
143+
{
144+
target.Write(text.ToString());
145+
}
146+
147+
public void Encode(string text, TextWriter target)
148+
{
149+
target.Write(text);
150+
}
151+
152+
public void Encode<T>(T text, TextWriter target) where T : IEnumerator<char>
153+
{
154+
while (text.MoveNext())
155+
{
156+
target.Write(text.Current);
157+
}
158+
}
159+
139160
}
140161
}
141-
}
162+
}

‎src/SmartCode.CLI/SmartCode.CLI.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<PackAsTool>true</PackAsTool>
88
<ToolCommandName>SmartCode</ToolCommandName>
@@ -14,11 +14,11 @@
1414
</PackageReleaseNotes>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.6.0" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
17+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)