Merge pull request #1 from PowerShell/dev0131

Adding WMF 5.1 to the set cmdlets

Author: eshaparmar

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

@@ -187,7 +187,7 @@ 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","5.0" ,"5.1PP" and "latest".  
+        /// install on the VM. The possible values are "4.0","5.0" ,"5.1" and "latest".  
         /// 
         /// 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 
@@ -198,15 +198,15 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
         /// 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 "5.1" will install the WMF 5.1
+        /// (https://www.microsoft.com/en-us/download/details.aspx?id=54616).
         /// 
-        /// A value of "latest" will install the latest WMF, currently WMF 5.0
+        /// A value of "latest" will install the latest WMF, currently WMF 5.1
         /// 
         /// The default value is "latest"
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        [ValidateSetAttribute(new[] { "4.0", "5.0", "5.1PP", "latest" })]
+        [ValidateSetAttribute(new[] {"4.0", "5.0", "5.1", "5.1PP", "latest"})]
         public string WmfVersion { get; set; }
 
         /// <summary>
@@ -240,6 +240,11 @@ public override void ExecuteCmdlet()
         //Private Methods
         private void ValidateParameters()
         {
+            if ("5.1PP".Equals(WmfVersion))
+            {
+                this.ThrowInvalidArgumentError(Microsoft.Azure.Commands.Compute.Properties.Resources.WMFVersionNotSupported, WmfVersion);
+            }
+
             if (string.IsNullOrEmpty(ArchiveBlobName))
             {
                 if (ConfigurationName != null || ConfigurationArgument != null

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

@@ -15305,12 +15305,12 @@ PS C:\> Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $RGname -VMNa
 <dev:defaultValue>None</dev:defaultValue>
 </command:parameter>
 <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="none"><maml:name>WmfVersion</maml:name>
-<maml:Description><maml:para>Specifies the WMF version.
+<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 "4.0", "5.0", "5.1" and latest. A value of "latest" will install the latest WMF, currently WMF 5.1. The default value is "latest".
 </maml:para>
 </maml:Description>
 <command:parameterValueGroup><command:parameterValue required="false" variableLength="false">4.0</command:parameterValue>
 <command:parameterValue required="false" variableLength="false">5.0</command:parameterValue>
-<command:parameterValue required="false" variableLength="false">5.1PP</command:parameterValue>
+<command:parameterValue required="false" variableLength="false">5.1</command:parameterValue>
 <command:parameterValue required="false" variableLength="false">latest</command:parameterValue>
 </command:parameterValueGroup>
 <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
@@ -15515,24 +15515,24 @@ PS C:\&gt; Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $RGname -VMNa
 </maml:alert>
 </maml:alertSet>
 <command:examples><command:example><maml:title>Example 1: Set a DSC extension</maml:title>
-<dev:code>PS C:\&gt;Set-AzureRmVMDscExtension -ResourceGroupName "ResourceGroup001" -VMName "VM07" -ArchiveBlobName "Sample.ps1.zip" -ArchiveStorageAccountName "Stg" -ConfigurationName "ConfigName" -Version "1.10" -Location "West US"</dev:code>
-<dev:remarks><maml:para>This command sets the DSC extension on the virtual machine named VM07 to download Sample.ps1.zip from the storage account named Stg and the default container. The command invokes the configuration named ConfigName. The Sample.ps1.zip file was previously uploaded by using Publish-AzureRmVMDscConfiguration.
+<dev:code>PS C:\&gt;Set-AzureRmVMDscExtension -ResourceGroupName "ResourceGroup001" -VMName "VM07" -ArchiveBlobName "Sample.ps1.zip" -ArchiveStorageAccountName "Stg" -ConfigurationName "ConfigName" -Version "X.Y" -Location "West US"</dev:code>
+<dev:remarks><maml:para>This command sets the DSC extension based on the version parameter X.Y (Major.Minor), on the virtual machine named VM07 to download Sample.ps1.zip from the storage account named Stg and the default container. The command invokes the configuration named ConfigName. The Sample.ps1.zip file was previously uploaded by using Publish-AzureRmVMDscConfiguration. 
 </maml:para>
 <maml:para></maml:para>
 <maml:para></maml:para>
 </dev:remarks>
 </command:example>
 <command:example><maml:title>Example 2: Set a DSC extension with configuration data</maml:title>
-<dev:code>PS C:\&gt;Set-AzureRmVMDscExtension -ResourceGroupName "ResourceGroup001" -VMName "VM13" -ArchiveBlobName "Sample.ps1.zip" -ArchiveStorageAccountName "Stg" -ConfigurationName "ConfigName" -ConfigurationArgument "@{arg="val"}" -ArchiveContainerName "WindowsPowerShellDSC" -ConfigurationData "SampleData.psd1" -Version "1.10" -Location "West US"</dev:code>
-<dev:remarks><maml:para>This command sets the extension on the virtual machine named VM13 to download Sample.ps1.zip from the storage account named Stg and the container named WindowsPowerShellDSC. The command the configuration named ConfigName and specifies configuration data and arguments. The Sample.ps1.zip file was previously uploaded by using Publish-AzureRmVMDscConfiguration.
+<dev:code>PS C:\&gt;Set-AzureRmVMDscExtension -ResourceGroupName "ResourceGroup001" -VMName "VM13" -ArchiveBlobName "Sample.ps1.zip" -ArchiveStorageAccountName "Stg" -ConfigurationName "ConfigName" -ConfigurationArgument "@{arg="val"}" -ArchiveContainerName "WindowsPowerShellDSC" -ConfigurationData "SampleData.psd1" -Version "X.Y" -Location "West US"</dev:code>
+<dev:remarks><maml:para>This command sets the extension based on the version parameter X.Y (Major.Minor), on the virtual machine named VM13 to download Sample.ps1.zip from the storage account named Stg and the container named WindowsPowerShellDSC. The command the configuration named ConfigName and specifies configuration data and arguments. The Sample.ps1.zip file was previously uploaded by using Publish-AzureRmVMDscConfiguration.
 </maml:para>
 <maml:para></maml:para>
 <maml:para></maml:para>
 </dev:remarks>
 </command:example>
 <command:example><maml:title>Example 3: Set a DSC extension with configuration data that has auto update</maml:title>
-<dev:code>PS C:\&gt;Set-AzureRmVMDscExtension -ResourceGroupName "ResourceGroup001" -VMName "VM22" -ArchiveBlobName "Sample.ps1.zip" -ArchiveStorageAccountName "Stg" -ConfigurationName "ConfigName" -ConfigurationArgument "@{arg="val"}" -ArchiveContainerName WindowsPowerShellDSC -ConfigurationData "SampleData.psd1" -Version "1.10" -Location "West US" -AutoUpdate</dev:code>
-<dev:remarks><maml:para>This command sets the extension on the virtual machine named VM22 to download Sample.ps1.zip from the storage account named Stg and the container named WindowsPowerShellDSC. The command invokes the configuration named ConfigName and specifies configuration data and arguments. This command also enables auto update of extension handler to the latest version. The Sample.ps1.zip was previously uploaded by using Publish-AzureRmVMDscConfiguration.
+<dev:code>PS C:\&gt;Set-AzureRmVMDscExtension -ResourceGroupName "ResourceGroup001" -VMName "VM22" -ArchiveBlobName "Sample.ps1.zip" -ArchiveStorageAccountName "Stg" -ConfigurationName "ConfigName" -ConfigurationArgument "@{arg="val"}" -ArchiveContainerName WindowsPowerShellDSC -ConfigurationData "SampleData.psd1" -Version "X.Y" -Location "West US" -AutoUpdate</dev:code>
+<dev:remarks><maml:para>This command sets the extension based on the version parameter X.Y (Major.Minor), on the virtual machine named VM22 to download Sample.ps1.zip from the storage account named Stg and the container named WindowsPowerShellDSC. The command invokes the configuration named ConfigName and specifies configuration data and arguments. This command also enables auto update of extension handler to the latest version. The Sample.ps1.zip was previously uploaded by using Publish-AzureRmVMDscConfiguration.
 </maml:para>
 <maml:para></maml:para>
 <maml:para></maml:para>

src/ResourceManager/Compute/Commands.Compute/Properties/Resources.Designer.cs

@@ -218,6 +218,9 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip)
 The file needs to be a PowerShell script (.ps1 or .psm1).</value>
     <comment>0 = path to the configuration file</comment>
   </data>
+  <data name="WMFVersionNotSupported" xml:space="preserve">
+    <value>WMF Version {0} is not supported anymore. </value>
+  </data>
   <data name="AzureVMDscNullArchiveNoConfiguragionParameters" xml:space="preserve">
     <value>If the ConfigurationArchive argument is null, then the ConfigurationName, ConfigurationArgument, and ConfigurationDataPath parameters must not be specified </value>
   </data>

src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx

@@ -138,7 +138,7 @@ 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","5.0" ,"5.1PP" and "latest".  
+        /// install on the VM. The possible values are "4.0","5.0" ,"5.1" and "latest".  
         /// 
         /// 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 
@@ -149,15 +149,15 @@ public class SetAzureVMDscExtension : VirtualMachineExtensionCmdletBase
         /// 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 "5.1" will install the WMF 5.1
+        /// (https://www.microsoft.com/en-us/download/details.aspx?id=54616).
         /// 
-        /// A value of "latest" will install the latest WMF, currently WMF 5.0
+        /// A value of "latest" will install the latest WMF, currently WMF 5.1
         /// 
         /// The default value is "latest"
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        [ValidateSetAttribute(new[] { "4.0", "5.0", "5.1PP", "latest" })]
+        [ValidateSetAttribute(new[] { "4.0", "5.0", "5.1", "5.1PP", "latest" })]
         public string WmfVersion { get; set; }
 
         /// <summary>
@@ -225,6 +225,11 @@ protected override void ValidateParameters()
             //
             // Validate parameters
             //
+            if ("5.1PP".Equals(WmfVersion))
+            {
+                this.ThrowInvalidArgumentError(Resources.WMFVersionNotSupported, WmfVersion);
+            }
+
             if (string.IsNullOrEmpty(ConfigurationArchive))
             {
                 if (ConfigurationName != null || ConfigurationArgument != null

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

@@ -43923,7 +43923,8 @@ PS C:\> Set-AzureServiceAntimalwareExtension -ServiceName "ContosoService03"
 <dev:defaultValue>None</dev:defaultValue>
 </command:parameter>
 <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="none"><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 "4.0","5.0","5.1PP","latest". 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"
+<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 "4.0","5.0","5.1","latest". A value of "latest" will install the latest WMF, currently WMF 5.1. The default value is "latest"
 </maml:para>
 </maml:Description>
 <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
@@ -44081,7 +44082,8 @@ PS C:\&gt; Set-AzureServiceAntimalwareExtension -ServiceName "ContosoService03"
 <dev:defaultValue>None</dev:defaultValue>
 </command:parameter>
 <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="none"><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 "4.0","5.0","5.1PP","latest". 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"
+<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 "4.0","5.0","5.1","latest". A value of "latest" will install the latest WMF, currently WMF 5.1. The default value is "latest"
 </maml:para>
 </maml:Description>
 <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
@@ -46850,7 +46852,8 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
 <dev:defaultValue>None</dev:defaultValue>
 </command:parameter>
 <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="none"><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 "4.0","latest" and "5.0".             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.0" will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of "latest" will install the latest WMF, currently WMF 5.0. The default value is "latest"
+<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 "4.0","5.0","5.1","latest". A value of "latest" will install the latest WMF, currently WMF 5.1. The default value is "latest"
 </maml:para>
 </maml:Description>
 <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
@@ -47024,7 +47027,8 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
 <dev:defaultValue>None</dev:defaultValue>
 </command:parameter>
 <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="True (ByPropertyName)" position="named" aliases="none"><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 "4.0","latest" and "5.0".             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.0" will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of "latest" will install the latest WMF, currently WMF 5.0. The default value is "latest"
+<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 "4.0","5.0","5.1","latest". A value of "latest" will install the latest WMF, currently WMF 5.1. The default value is "latest"
 </maml:para>
 </maml:Description>
 <command:parameterValue required="true" variableLength="false">String</command:parameterValue>