Remove an errant use of static, improve some generated comments, and …

…update the version
kevinsea · Dec 13, 2015 · 15cb201 · 15cb201
1 parent a229a45
commit 15cb201
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/DesiredStateGenerator/Common/CodeGenerator.cs b/DesiredStateGenerator/Common/CodeGenerator.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using DesiredState.IIS;
 using DesiredState.Windows;
-using Microsoft.Web.Administration;
 
 namespace DesiredState.Common
 {
@@ -56,10 +55,10 @@ public string GenerateConfig(Options options)
 
 			sb.AppendLine(  "cls\n");
 
-			sb.AppendLine(  "Compile this DSC down to an .MOF:  An .mof file will be placed in the specified directory.");
+			sb.AppendLine(  "# Compile this DSC down to an .MOF:  An .mof file will be placed in the specified directory:");
 			sb.AppendLine(  "IIS_DSC -OutputPath \"c:\\my_iis_dsc_dir\"\n");
 
-			sb.AppendLine(  "# Apply the DSC.  ALL .mof's in a folder will be executed!");
+			sb.AppendLine(  "# Apply the DSC.  ALL .mof's in a folder will be executed!:");
 			sb.AppendLine(  "Start-DscConfiguration -Path \"c:\\my_iis_dsc_dir\" -Wait -Debug -ErrorAction Stop -Force -Verbose  # this will apply the DSC");
 
 			return sb.ToString();

diff --git a/DesiredStateGenerator/IIS/IISCodeGenerator.cs b/DesiredStateGenerator/IIS/IISCodeGenerator.cs
@@ -22,8 +22,8 @@ public string GenerateCode(IisPoolAndSitesOptions options)
 			string baseIndent = CodeGenHelpers.GetIndentString(2);
 			string code;
 
-			sb.AppendLine(baseIndent + "# Note this code does not detect server level IIS overrides.");
-			sb.AppendLine(baseIndent + "# See the wiki for information about detecting server level changes.\n");
+			sb.AppendLine(baseIndent + "# Note this code does not detect server level IIS overrides (it assumes the IIS level settings");
+			sb.AppendLine(baseIndent + "# have not been overriden).  See the wiki for information about detecting server level changes.\n");
 
 			if (options.IisPoolAndSitesGenerationMode == IisPoolAndSitesGenerationMode.ConfigFileOrder)
 			{
@@ -90,7 +90,7 @@ private string GenerateSites(List<SiteDesiredState> siteList)
 			return sb.ToString();
 		}
 
-		private static string GetSiteHeader(SiteDesiredState site)
+		private string GetSiteHeader(SiteDesiredState site)
 		{
 			StringBuilder sb = new StringBuilder();
 

diff --git a/DesiredStateGenerator/Properties/AssemblyInfo.cs b/DesiredStateGenerator/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]