From 15cb20115061fcd015e3c2fdf8b0258dc10d4a97 Mon Sep 17 00:00:00 2001 From: Kevin Callahan Date: Sun, 13 Dec 2015 12:19:30 -0500 Subject: [PATCH] Remove an errant use of static, improve some generated comments, and update the version --- DesiredStateGenerator/Common/CodeGenerator.cs | 5 ++--- DesiredStateGenerator/IIS/IISCodeGenerator.cs | 6 +++--- DesiredStateGenerator/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/DesiredStateGenerator/Common/CodeGenerator.cs b/DesiredStateGenerator/Common/CodeGenerator.cs index cc34e98..6e8d6ee 100644 --- 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 index eaf09a7..44aa755 100644 --- 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 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 index 6945b59..8c64538 100644 --- 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")]