Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite

Author: mythz

src/T4/OrmLite.Core.ttinclude

@@ -2653,12 +2653,12 @@ class Manager {
         CurrentBlock = new Block { Name = name };
     }
 
-    public void StartFooter(bool includeInDefault = true) {
+    public void StartFooter(bool includeInDefault) {
         CurrentBlock = footer;
         footer.IncludeInDefault = includeInDefault;
     }
 
-    public void StartHeader(bool includeInDefault = true) {
+    public void StartHeader(bool includeInDefault) {
         CurrentBlock = header;
         header.IncludeInDefault = includeInDefault;
     }
@@ -2672,7 +2672,7 @@ class Manager {
         currentBlock = null;
     }
 
-    public virtual void Process(bool split, bool sync = true) {
+    public virtual void Process(bool split, bool sync) {
         if (split) {
             EndBlock();
             String headerText = template.ToString(header.Start, header.Length);
@@ -2801,4 +2801,4 @@ class Manager {
 /*
     End of Manager.tt
 */
-#>
+#>

src/T4/OrmLite.Poco.tt

@@ -35,7 +35,7 @@
 if (string.IsNullOrEmpty(Namespace)) Namespace=ConnectionStringName;
 if (string.IsNullOrEmpty(Namespace)) Namespace="OrmLitePoco";
 var manager = Manager.Create(Host, GenerationEnvironment);
-manager.StartHeader();
+manager.StartHeader(true);
 #>
 // <auto-generated />
 // This file was generated by a T4 template.
@@ -150,9 +150,9 @@ else if (!isArray && !isBool) { if (!isGuid) {#>
 	<#}#>
 <#  manager.EndBlock(); #>
 <#  }   #>
-<#manager.StartFooter(); #>
+<#manager.StartFooter(true); #>
 }
 #pragma warning restore 1591
 <#manager.EndBlock(); #>
-<#manager.Process(SplitIntoMultipleFiles); #>
+<#manager.Process(SplitIntoMultipleFiles, true); #>
 <#  }   #>

src/T4/OrmLite.SP.tt

@@ -59,9 +59,9 @@ namespace <#=SPNamespace#>
 	if (!sp.SPOutputColumns.Any()) continue; #>
 		public class <#=sp.CleanName#>_Result
 		{ 
-				<# foreach(var prop in sp.SPOutputColumns) { var alias = false; var propName = prop.Name;  if (propName.Contains(' ') || propName.Contains('$') || propName.Contains('+') || propName.Contains('%')) { propName = propName.Replace(' ','_').Replace("$","_Dollar").Replace("+","_Plus").Replace("%","_Percent"); alias = true; }; if (char.IsDigit(propName[0])) { propName = "_" + propName; alias = true; };
+				<# foreach(var prop in sp.SPOutputColumns) { var _alias = false; var propName = prop.Name;  if (propName.Contains(' ') || propName.Contains('$') || propName.Contains('+') || propName.Contains('%')) { propName = propName.Replace(' ','_').Replace("$","_Dollar").Replace("+","_Plus").Replace("%","_Percent"); _alias = true; }; if (char.IsDigit(propName[0])) { propName = "_" + propName; _alias = true; };
 
-		if (alias) {#>		[Alias("<#=prop.Name#>")]
+		if (_alias) {#>		[Alias("<#=prop.Name#>")]
 		<#}#>
 		public <#=prop.DotNetType#> <#=propName#> { get; set; }			
 		<#}
@@ -70,4 +70,4 @@ namespace <#=SPNamespace#>
 <#}#>
 
 }
-<#}#> 
+<#}#>