Skip to content

Commit 876e054

Browse files
committed
add support Docker
split SmartSql-version
1 parent d65e551 commit 876e054

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

build/version.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>2</VersionMajor>
44
<VersionMinor>2</VersionMinor>
5-
<VersionPatch>8</VersionPatch>
5+
<VersionPatch>10</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
</PropertyGroup>
88
</Project>

doc/SmartCode.yml

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Output:
1414
Type: File
1515
Path: 'E:\SmartSql-Starter'
1616
Parameters:
17+
SmartSqlVersion: '4.0.33'
18+
SmartSqlSchemaVersion: '4.0.26'
1719
BuildDir: 'E:\SmartSql-Starter\build'
1820
DockerImage: 'smartsql.starter'
1921

src/SmartCode.Generator/RazorTemplates/CSharp/Proj-API.cshtml

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
@model BuildContext
33
@{
44
var project = Model.Project;
5+
var smartsqlVersion = "4.0.33";
6+
if (project.Parameters.Value("SmartSqlVersion", out string version))
7+
{
8+
smartsqlVersion = version;
9+
}
510
}
611
<Project Sdk="Microsoft.NET.Sdk.Web">
712
<PropertyGroup>
813
<TargetFramework>netcoreapp2.2</TargetFramework>
914
</PropertyGroup>
1015

1116
<ItemGroup>
12-
<PackageReference Include="SmartSql.DIExtension" Version="4.0.26" />
17+
<PackageReference Include="SmartSql.DIExtension" Version="@smartsqlVersion" />
1318
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
1419
</ItemGroup>
1520

src/SmartCode.Generator/RazorTemplates/CSharp/Proj-Repository.cshtml

+15-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
var dbProviderAssNames = dbFactory.GetType().Assembly.FullName.Split(',');
99
var dbProviderName = dbProviderAssNames[0];
1010
var dbProviderVersion = dbProviderAssNames[1].Split('=')[1];
11+
var smartSqlVersion = "4.0.33";
12+
if (project.Parameters.Value("SmartSqlVersion", out string version))
13+
{
14+
smartSqlVersion = version;
15+
}
16+
var smartSqlSchemaVersion = "4.0.26";
17+
if (project.Parameters.Value("SmartSqlSchemaVersion", out string schemaVersion))
18+
{
19+
smartSqlSchemaVersion = schemaVersion;
20+
}
1121
}
1222

1323
<Project Sdk="Microsoft.NET.Sdk">
@@ -21,15 +31,15 @@
2131
}
2232
@if (dbSource.DbRepository.DbProvider == DbProvider.PostgreSql)
2333
{
24-
<PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.0.26" />
34+
<PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="@smartSqlVersion" />
2535
}
2636
else
2737
{
28-
<PackageReference Include="SmartSql.TypeHandler" Version="4.0.26" />
38+
<PackageReference Include="SmartSql.TypeHandler" Version="@smartSqlVersion" />
2939
}
30-
<PackageReference Include="SmartSql.Schema" Version="4.0.26" />
31-
<PackageReference Include="SmartSql.ScriptTag" Version="4.0.26" />
32-
<PackageReference Include="SmartSql.DyRepository" Version="4.0.26" />
40+
<PackageReference Include="SmartSql.Schema" Version="@smartSqlSchemaVersion" />
41+
<PackageReference Include="SmartSql.ScriptTag" Version="@smartSqlVersion" />
42+
<PackageReference Include="SmartSql.DyRepository" Version="@smartSqlVersion" />
3343
</ItemGroup>
3444
<ItemGroup>
3545
<ProjectReference Include="..\@(project.Module).Entity\@(project.Module).Entity.csproj" />

0 commit comments

Comments
 (0)