add support Docker

split SmartSql-version
dotnetcore · Apr 23, 2019 · 876e054 · 876e054
1 parent d65e551
commit 876e054
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>2</VersionMajor>
 		<VersionMinor>2</VersionMinor>
-		<VersionPatch>8</VersionPatch>
+		<VersionPatch>10</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>
diff --git a/doc/SmartCode.yml b/doc/SmartCode.yml
@@ -14,6 +14,8 @@ Output:
   Type: File
   Path: 'E:\SmartSql-Starter'
 Parameters:
+  SmartSqlVersion: '4.0.33'
+  SmartSqlSchemaVersion: '4.0.26'
   BuildDir: 'E:\SmartSql-Starter\build'
   DockerImage: 'smartsql.starter'
 

diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/Proj-API.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/Proj-API.cshtml
@@ -2,14 +2,19 @@
 @model BuildContext
 @{
     var project = Model.Project;
+    var smartsqlVersion = "4.0.33";
+    if (project.Parameters.Value("SmartSqlVersion", out string version))
+    {
+        smartsqlVersion = version;
+    }
 }
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
         <TargetFramework>netcoreapp2.2</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="SmartSql.DIExtension" Version="4.0.26" />
+        <PackageReference Include="SmartSql.DIExtension" Version="@smartsqlVersion" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     </ItemGroup>
 

diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/Proj-Repository.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/Proj-Repository.cshtml
@@ -8,6 +8,16 @@
     var dbProviderAssNames = dbFactory.GetType().Assembly.FullName.Split(',');
     var dbProviderName = dbProviderAssNames[0];
     var dbProviderVersion = dbProviderAssNames[1].Split('=')[1];
+    var smartSqlVersion = "4.0.33";
+    if (project.Parameters.Value("SmartSqlVersion", out string version))
+    {
+        smartSqlVersion = version;
+    }
+    var smartSqlSchemaVersion = "4.0.26";
+    if (project.Parameters.Value("SmartSqlSchemaVersion", out string schemaVersion))
+    {
+        smartSqlSchemaVersion = schemaVersion;
+    }
 }
 
 <Project Sdk="Microsoft.NET.Sdk">
@@ -21,15 +31,15 @@
         }
         @if (dbSource.DbRepository.DbProvider == DbProvider.PostgreSql)
         {
-            <PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="4.0.26" />
+            <PackageReference Include="SmartSql.TypeHandler.PostgreSql" Version="@smartSqlVersion" />
         }
         else
         {
-            <PackageReference Include="SmartSql.TypeHandler" Version="4.0.26" />
+            <PackageReference Include="SmartSql.TypeHandler" Version="@smartSqlVersion" />
         }
-        <PackageReference Include="SmartSql.Schema" Version="4.0.26" />
-        <PackageReference Include="SmartSql.ScriptTag" Version="4.0.26" />
-        <PackageReference Include="SmartSql.DyRepository" Version="4.0.26" />
+        <PackageReference Include="SmartSql.Schema" Version="@smartSqlSchemaVersion" />
+        <PackageReference Include="SmartSql.ScriptTag" Version="@smartSqlVersion" />
+        <PackageReference Include="SmartSql.DyRepository" Version="@smartSqlVersion" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\@(project.Module).Entity\@(project.Module).Entity.csproj" />