Merge pull request #2703 from PowerShell/wmf5.1version

Add WMF 5.1PP to the existing list of allowed wmf versions

Author: markcowl

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs

@@ -187,23 +187,26 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
         ///
         /// 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.0".  
+        /// install on the VM. The possible values are "4.0","5.0" ,"5.1PP" and "latest".  
         /// 
-        /// 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 "4.0" will install WMF 4.0 Update packages 
+        /// (https://support.microsoft.com/en-us/kb/3119938) on Windows 8.1 or Windows Server 
+        /// 2012 R2, or  
+        /// (https://support.microsoft.com/en-us/kb/3109118) on Windows Server 2008 R2 
+        /// and on other versions of Windows if newer version is not already installed.
         /// 
         /// A value of "5.0" will install the latest release of WMF 5.0 
         /// (https://www.microsoft.com/en-us/download/details.aspx?id=50395).
         /// 
+        /// A value of "5.1PP" will install the WMF 5.1 preview
+        /// (https://www.microsoft.com/en-us/download/details.aspx?id=53347).
+        /// 
         /// A value of "latest" will install the latest WMF, currently WMF 5.0
         /// 
         /// The default value is "latest"
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
+        [ValidateSetAttribute(new[] { "4.0", "5.0", "5.1PP", "latest" })]
         public string WmfVersion { get; set; }
 
         /// <summary>

src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml

@@ -22401,13 +22401,15 @@ PS C:\> Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $RGname -VMNa
 				</maml:description>
 				<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
 			</command:parameter>
-			<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
-				<maml:name>WmfVersion</maml:name>
-				<maml:description>
-					<maml:para>Specifies the WMF version.</maml:para>
-				</maml:description>
-				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-			</command:parameter>
+      <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
+        <maml:name>WmfVersion</maml:name>
+        <maml:description>
+          <maml:para>
+            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 &quot;4.0&quot;,&quot;5.0&quot;,&quot;5.1PP&quot;,&quot;latest&quot;.A value of &quot;4.0&quot; will install WMF 4.0 Update packages (https://support.microsoft.com/en-us/kb/3119938) on Windows 8.1 or Windows Server 2012 R2, or (https://support.microsoft.com/en-us/kb/3109118) on Windows Server 2008 R2 and on other versions of Windows if newer version is not already installed. A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;5.1PP&quot; will install the WMF 5.1 preview (https://www.microsoft.com/en-us/download/details.aspx?id=53347). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;
+          </maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+      </command:parameter>
 			<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
 				<maml:name>DataCollection</maml:name>
 				<maml:description>
@@ -22626,18 +22628,20 @@ PS C:\&gt; Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $RGname -VMNa
 			</dev:type>
 			<dev:defaultValue>none</dev:defaultValue>
 		</command:parameter>
-		<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
-			<maml:name>WmfVersion</maml:name>
-			<maml:description>
-				<maml:para>Specifies the WMF version.</maml:para>
-			</maml:description>
-			<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
-			<dev:type>
-				<maml:name>String</maml:name>
-				<maml:uri/>
-			</dev:type>
-			<dev:defaultValue>none</dev:defaultValue>
-		</command:parameter>
+    <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
+      <maml:name>WmfVersion</maml:name>
+      <maml:description>
+        <maml:para>
+          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 &quot;4.0&quot;,&quot;5.0&quot;,&quot;5.1PP&quot;,&quot;latest&quot;.A value of &quot;4.0&quot; will install WMF 4.0 Update packages (https://support.microsoft.com/en-us/kb/3119938) on Windows 8.1 or Windows Server 2012 R2, or (https://support.microsoft.com/en-us/kb/3109118) on Windows Server 2008 R2 and on other versions of Windows if newer version is not already installed. A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;5.1PP&quot; will install the WMF 5.1 preview (https://www.microsoft.com/en-us/download/details.aspx?id=53347). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;
+        </maml:para>
+      </maml:description>
+      <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+      <dev:type>
+        <maml:name>String</maml:name>
+        <maml:uri/>
+      </dev:type>
+      <dev:defaultValue>latest</dev:defaultValue>
+    </command:parameter>
 		<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
 			<maml:name>DataCollection</maml:name>
 			<maml:description>

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs

@@ -138,23 +138,26 @@ public class SetAzureVMDscExtension : VirtualMachineExtensionCmdletBase
         ///
         /// 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.0".  
+        /// install on the VM. The possible values are "4.0","5.0" ,"5.1PP" and "latest".  
         /// 
-        /// 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 "4.0" will install WMF 4.0 Update packages 
+        /// (https://support.microsoft.com/en-us/kb/3119938) on Windows 8.1 or Windows Server 
+        /// 2012 R2, or  
+        /// (https://support.microsoft.com/en-us/kb/3109118) on Windows Server 2008 R2 
+        /// and on other versions of Windows if newer version is not already installed.
         /// 
         /// A value of "5.0" will install the latest release of WMF 5.0 
         /// (https://www.microsoft.com/en-us/download/details.aspx?id=50395).
         /// 
+        /// A value of "5.1PP" will install the WMF 5.1 preview
+        /// (https://www.microsoft.com/en-us/download/details.aspx?id=53347).
+        /// 
         /// A value of "latest" will install the latest WMF, currently WMF 5.0
         /// 
         /// The default value is "latest"
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
+        [ValidateSetAttribute(new[] { "4.0", "5.0", "5.1PP", "latest" })]
         public string WmfVersion { get; set; }
 
         /// <summary>

src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml

@@ -129837,9 +129837,8 @@ PS C:\> Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
 				<maml:name>WmfVersion</maml:name>
 				<maml:description>
 					<maml:para>
-            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 &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0&quot;.
-            A value of &quot;4.0&quot; 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 &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;</maml:para>
+            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 &quot;4.0&quot;,&quot;5.0&quot;,&quot;5.1PP&quot;,&quot;latest&quot;. A value of &quot;4.0&quot; will install WMF 4.0 Update packages (https://support.microsoft.com/en-us/kb/3119938) on Windows 8.1 or Windows Server 2012 R2, or (https://support.microsoft.com/en-us/kb/3109118) on Windows Server 2008 R2 and on other versions of Windows if newer version is not already installed. A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;5.1PP&quot; will install the WMF 5.1 preview (https://www.microsoft.com/en-us/download/details.aspx?id=53347). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;
+          </maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			</command:parameter>
@@ -130026,9 +130025,8 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
 			<maml:name>WmfVersion</maml:name>
 			<maml:description>
 				<maml:para>
-            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 &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0&quot;.
-            A value of &quot;4.0&quot; 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 &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;</maml:para>
+            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 &quot;4.0&quot;,&quot;5.0&quot;,&quot;5.1PP&quot;,&quot;latest&quot;. A value of &quot;4.0&quot; will install WMF 4.0 Update packages (https://support.microsoft.com/en-us/kb/3119938) on Windows 8.1 or Windows Server 2012 R2, or (https://support.microsoft.com/en-us/kb/3109118) on Windows Server 2008 R2 and on other versions of Windows if newer version is not already installed. A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;5.1PP&quot; will install the WMF 5.1 preview (https://www.microsoft.com/en-us/download/details.aspx?id=53347). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;
+        </maml:para>
 			</maml:description>
 			<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			<dev:type>