From 45b92522d78b78743970d629c72fb13e2d4a8d7d Mon Sep 17 00:00:00 2001
From: mhendric <mhendric@microsoft.com>
Date: Fri, 17 Apr 2015 14:41:22 -0700
Subject: [PATCH] xWebAdministration_mhendric

---
 DSCResources/MSFT_xIisModule/MSFT_xIisModule.psm1             | 1 +
 DSCResources/MSFT_xIisModule/MSFT_xIisModule.schema.mof       | 1 +
 DSCResources/MSFT_xIisModule/xIisModuleDesigner.ps1           | 1 +
 DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.psm1           | 1 +
 DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.schema.mof     | 1 +
 DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1   | 1 +
 .../MSFT_xWebApplication/MSFT_xWebApplication.schema.mof      | 1 +
 .../MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.psm1      | 1 +
 .../MSFT_xWebConfigKeyValue.schema.mof                        | 2 +-
 .../MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.psm1  | 1 +
 .../MSFT_xWebVirtualDirectory.schema.mof                      | 1 +
 DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1                 | 1 +
 DSCResources/MSFT_xWebsite/MSFT_xWebsite.schema.mof           | 1 +
 Examples/Sample_xWebsite_ConfigurationData.psd1               | 1 +
 Examples/Sample_xWebsite_NewWebsite.ps1                       | 1 +
 Examples/Sample_xWebsite_NewWebsiteFromConfigurationData.ps1  | 1 +
 Examples/Sample_xWebsite_RemoveDefault.ps1                    | 1 +
 TechNetDocumentation_xWebAdministration.html                  | 4 ++++
 xWebAdministration.psd1                                       | 1 +
 19 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/DSCResources/MSFT_xIisModule/MSFT_xIisModule.psm1 b/DSCResources/MSFT_xIisModule/MSFT_xIisModule.psm1
index 4be56c78c..8a9b5be41 100644
--- a/DSCResources/MSFT_xIisModule/MSFT_xIisModule.psm1
+++ b/DSCResources/MSFT_xIisModule/MSFT_xIisModule.psm1
@@ -415,3 +415,4 @@ Export-ModuleMember -Function *-TargetResource
 
 
 
+
diff --git a/DSCResources/MSFT_xIisModule/MSFT_xIisModule.schema.mof b/DSCResources/MSFT_xIisModule/MSFT_xIisModule.schema.mof
index 3f09092ed..135e12d76 100644
--- a/DSCResources/MSFT_xIisModule/MSFT_xIisModule.schema.mof
+++ b/DSCResources/MSFT_xIisModule/MSFT_xIisModule.schema.mof
@@ -14,3 +14,4 @@ class MSFT_xIisModule : OMI_BaseResource
 
 
 
+
diff --git a/DSCResources/MSFT_xIisModule/xIisModuleDesigner.ps1 b/DSCResources/MSFT_xIisModule/xIisModuleDesigner.ps1
index eef8d3450..01ec8edf9 100644
--- a/DSCResources/MSFT_xIisModule/xIisModuleDesigner.ps1
+++ b/DSCResources/MSFT_xIisModule/xIisModuleDesigner.ps1
@@ -48,3 +48,4 @@ else
 }
 
 
+
diff --git a/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.psm1 b/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.psm1
index 81e5066f2..f47f895c8 100644
--- a/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.psm1
+++ b/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.psm1
@@ -131,3 +131,4 @@ function ExecuteRequiredState([string] $Name, [string] $State)
 
 Export-ModuleMember -Function *-TargetResource
 
+
diff --git a/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.schema.mof b/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.schema.mof
index 3f8edd6ed..b5bf7e46c 100644
--- a/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.schema.mof
+++ b/DSCResources/MSFT_xWebAppPool/MSFT_xWebAppPool.schema.mof
@@ -9,3 +9,4 @@ class MSFT_xWebAppPool : OMI_BaseResource
 
 
 
+
diff --git a/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1 b/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1
index aed8f6b28..7235e5988 100644
--- a/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1
+++ b/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1
@@ -178,3 +178,4 @@ Export-ModuleMember -Function *-TargetResource
 
 
 
+
diff --git a/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.schema.mof b/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.schema.mof
index eb116054c..bd492e9ea 100644
--- a/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.schema.mof
+++ b/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.schema.mof
@@ -11,3 +11,4 @@ class MSFT_xWebApplication : OMI_BaseResource
 
 
 
+
diff --git a/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.psm1 b/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.psm1
index f65aeb283..7d4d794a3 100644
--- a/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.psm1
+++ b/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.psm1
@@ -265,3 +265,4 @@ Export-ModuleMember -Function *-TargetResource
 
 
 
+
diff --git a/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.schema.mof b/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.schema.mof
index 98a7ce818..e134e5fad 100644
--- a/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.schema.mof
+++ b/DSCResources/MSFT_xWebConfigKeyValue/MSFT_xWebConfigKeyValue.schema.mof
@@ -5,7 +5,7 @@ class MSFT_xWebConfigKeyValue : OMI_BaseResource
     [Key, Description("Path to website location(IIS or WebAdministration format)")] String WebsitePath;
     [Key, Description("Config Section to be update"), ValueMap{"AppSettings"}, Values{"AppSettings"}] String ConfigSection;
     [Write, ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
-    [Required, Description("Key for AppSettings")] String Key;
+    [Key, Description("Key for AppSettings")] String Key;
     [Write, Description("Value for AppSettings")] String Value;
     [Write, Description("If the given key value pair is for attribute, default is element")] Boolean IsAttribute;
 };
diff --git a/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.psm1 b/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.psm1
index b8f472119..9a9d44f4b 100644
--- a/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.psm1
+++ b/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.psm1
@@ -230,3 +230,4 @@ Export-ModuleMember -Function *-TargetResource
 
 
 
+
diff --git a/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.schema.mof b/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.schema.mof
index efb17c6a2..d52760b9c 100644
--- a/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.schema.mof
+++ b/DSCResources/MSFT_xWebVirtualDirectory/MSFT_xWebVirtualDirectory.schema.mof
@@ -11,3 +11,4 @@ class MSFT_xWebVirtualDirectory : OMI_BaseResource
 
 
 
+
diff --git a/DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1 b/DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1
index 59dabbdee..1a372dfab 100644
--- a/DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1
+++ b/DSCResources/MSFT_xWebsite/MSFT_xWebsite.psm1
@@ -853,3 +853,4 @@ function UpdateDefaultPages
 }
 
 #endregion
+
diff --git a/DSCResources/MSFT_xWebsite/MSFT_xWebsite.schema.mof b/DSCResources/MSFT_xWebsite/MSFT_xWebsite.schema.mof
index 80cc09d59..02e80023b 100644
--- a/DSCResources/MSFT_xWebsite/MSFT_xWebsite.schema.mof
+++ b/DSCResources/MSFT_xWebsite/MSFT_xWebsite.schema.mof
@@ -23,3 +23,4 @@ class MSFT_xWebsite : OMI_BaseResource
   [write, Description("The default pages for the website")] String DefaultPage[];
 }; 
 
+
diff --git a/Examples/Sample_xWebsite_ConfigurationData.psd1 b/Examples/Sample_xWebsite_ConfigurationData.psd1
index 8d90c6880..65cb41197 100644
--- a/Examples/Sample_xWebsite_ConfigurationData.psd1
+++ b/Examples/Sample_xWebsite_ConfigurationData.psd1
@@ -23,3 +23,4 @@
         }
     );
 } 
+
diff --git a/Examples/Sample_xWebsite_NewWebsite.ps1 b/Examples/Sample_xWebsite_NewWebsite.ps1
index a467f445e..73edfa1a0 100644
--- a/Examples/Sample_xWebsite_NewWebsite.ps1
+++ b/Examples/Sample_xWebsite_NewWebsite.ps1
@@ -72,3 +72,4 @@ configuration Sample_xWebsite_NewWebsite
         }
     }
 }
+
diff --git a/Examples/Sample_xWebsite_NewWebsiteFromConfigurationData.ps1 b/Examples/Sample_xWebsite_NewWebsiteFromConfigurationData.ps1
index d04712485..db45ee14f 100644
--- a/Examples/Sample_xWebsite_NewWebsiteFromConfigurationData.ps1
+++ b/Examples/Sample_xWebsite_NewWebsiteFromConfigurationData.ps1
@@ -52,3 +52,4 @@ Configuration Sample_xWebsite_FromConfigurationData
         }
     }
 }
+
diff --git a/Examples/Sample_xWebsite_RemoveDefault.ps1 b/Examples/Sample_xWebsite_RemoveDefault.ps1
index eced4b661..dc5aba6a3 100644
--- a/Examples/Sample_xWebsite_RemoveDefault.ps1
+++ b/Examples/Sample_xWebsite_RemoveDefault.ps1
@@ -29,3 +29,4 @@ configuration Sample_xWebsite_StopDefault
         }
     }
 }
+
diff --git a/TechNetDocumentation_xWebAdministration.html b/TechNetDocumentation_xWebAdministration.html
index e00378764..ee92a46ea 100644
--- a/TechNetDocumentation_xWebAdministration.html
+++ b/TechNetDocumentation_xWebAdministration.html
@@ -1413,6 +1413,10 @@ <h1 class="endscriptcode" style="margin:12pt 0in 0pt"><span style="color:#2e74b5
                     <li>Fixed the confusion with mismatched versions and xWebDeploy resources</li>
                     <li>Removed BakeryWebsite.zip for legal reasons. Please read Examples\README.md for the workaround.</li>
                 </ul>
+                <p><span style="font-size:small">1.3.2.5</span></p>
+                <ul>
+                    <li>Changed Key property in MSFT_xWebConfigKeyValue to be a Key, instead of Required. This allows multiple keys to be configured within the same web.config file.</li>
+                </ul>
 
                 <span style="font-size:small">&nbsp;</span>
 
diff --git a/xWebAdministration.psd1 b/xWebAdministration.psd1
index d93d07bbf..1d5939b67 100644
--- a/xWebAdministration.psd1
+++ b/xWebAdministration.psd1
@@ -46,3 +46,4 @@ CmdletsToExport = '*'
 }
 
 
+