Merge pull request #138 from Azure/dev

.

Author: huangpf

src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml

@@ -72,7 +72,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.12-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.13-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.xml

@@ -8,7 +8,7 @@
   <package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Compute" version="8.2.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Network" version="2.0.12-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Network" version="2.0.13-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />

src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.xml

@@ -86,7 +86,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.12-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.13-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

src/ResourceManager/Automation/Commands.Automation/Microsoft.Azure.Commands.ResourceManager.Automation.dll-help.xml

@@ -180,8 +180,33 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
         [Parameter(
             HelpMessage = "Extension handler gets auto updated to the latest version if this switch is present.")]
         public SwitchParameter AutoUpdate { get; set; }
-        //Private Variables
 
+        /// <summary>
+        /// Specifies the version of the Windows Management Framework (WMF) to install 
+        /// on the VM.
+        ///
+        /// The DSC Azure Extension depends on DSC features that are only available in 
+        /// the WMF updates. This parameter specifies which version of the update to 
+        /// install on the VM. The possible values are "4.0","latest" and "5.0PP".  
+        /// 
+        /// A value of "4.0" will install KB3000850 
+        /// (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 
+        /// 2012 R2, or WMF 4.0 
+        /// (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other 
+        /// versions of Windows if a newer version isnt already installed.
+        /// 
+        /// A value of "5.0PP" will install the latest release of WMF 5.0PP 
+        /// (http://go.microsoft.com/fwlink/?LinkId=398175).
+        /// 
+        /// A value of "latest" will install the latest WMF, currently WMF 5.0PP
+        /// 
+        /// The default value is "latest"
+        /// </summary>
+        [Parameter(ValueFromPipelineByPropertyName = true)]
+        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP" })]
+        public string WmfVersion { get; set; }
+
+        //Private Variables
         private const string VersionRegexExpr = @"^(([0-9])\.)\d+$";
 
         /// <summary>
@@ -276,7 +301,9 @@ private void CreateConfiguration()
         {
             var publicSettings = new DscExtensionPublicSettings();
             var privateSettings = new DscExtensionPrivateSettings();
-            
+
+            publicSettings.WmfVersion = string.IsNullOrEmpty(WmfVersion) ? "latest" : WmfVersion;
+
             if (!string.IsNullOrEmpty(ArchiveBlobName))
             {
                 ConfigurationUris configurationUris = UploadConfigurationDataToBlob();