Skip to content

Commit 3754b87

Browse files
huangpfhuangpf
committed
Merge pull request #171 from huangpf/dev
Dev
2 parents de850fc + d779355 commit 3754b87

File tree

4 files changed

+39
-14
lines changed

4 files changed

+39
-14
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,23 +190,23 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
190190
///
191191
/// The DSC Azure Extension depends on DSC features that are only available in
192192
/// the WMF updates. This parameter specifies which version of the update to
193-
/// install on the VM. The possible values are "4.0","latest" and "5.0PP".
193+
/// install on the VM. The possible values are "4.0","latest" and "5.0".
194194
///
195195
/// A value of "4.0" will install KB3000850
196196
/// (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server
197197
/// 2012 R2, or WMF 4.0
198198
/// (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other
199199
/// versions of Windows if a newer version isnt already installed.
200200
///
201-
/// A value of "5.0PP" will install the latest release of WMF 5.0PP
202-
/// (http://go.microsoft.com/fwlink/?LinkId=398175).
201+
/// A value of "5.0" will install the latest release of WMF 5.0
202+
/// (https://www.microsoft.com/en-us/download/details.aspx?id=50395).
203203
///
204-
/// A value of "latest" will install the latest WMF, currently WMF 5.0PP
204+
/// A value of "latest" will install the latest WMF, currently WMF 5.0
205205
///
206206
/// The default value is "latest"
207207
/// </summary>
208208
[Parameter(ValueFromPipelineByPropertyName = true)]
209-
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP" })]
209+
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
210210
public string WmfVersion { get; set; }
211211

212212
/// <summary>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13493,9 +13493,9 @@ Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName
1349313493
<maml:name>WmfVersion</maml:name>
1349413494
<maml:description>
1349513495
<maml:para>
13496-
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.0PP&quot;.
13496+
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;.
1349713497
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.
13498-
A value of &quot;5.0PP&quot; will install the latest release of WMF 5.0PP (http://go.microsoft.com/fwlink/?LinkId=398175). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0PP. The default value is &quot;latest&quot;</maml:para>
13498+
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>
1349913499
</maml:description>
1350013500
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
1350113501
</command:parameter>
@@ -13721,9 +13721,9 @@ Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName
1372113721
<maml:name>WmfVersion</maml:name>
1372213722
<maml:description>
1372313723
<maml:para>
13724-
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.0PP&quot;.
13724+
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;.
1372513725
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.
13726-
A value of &quot;5.0PP&quot; will install the latest release of WMF 5.0PP (http://go.microsoft.com/fwlink/?LinkId=398175). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0PP. The default value is &quot;latest&quot;</maml:para>
13726+
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>
1372713727
</maml:description>
1372813728
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
1372913729
<dev:type>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,23 +138,23 @@ public class SetAzureVMDscExtension : VirtualMachineExtensionCmdletBase
138138
///
139139
/// The DSC Azure Extension depends on DSC features that are only available in
140140
/// the WMF updates. This parameter specifies which version of the update to
141-
/// install on the VM. The possible values are "4.0","latest" and "5.0PP".
141+
/// install on the VM. The possible values are "4.0","latest" and "5.0".
142142
///
143143
/// A value of "4.0" will install KB3000850
144144
/// (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server
145145
/// 2012 R2, or WMF 4.0
146146
/// (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other
147147
/// versions of Windows if a newer version isnt already installed.
148148
///
149-
/// A value of "5.0PP" will install the latest release of WMF 5.0PP
150-
/// (http://go.microsoft.com/fwlink/?LinkId=398175).
149+
/// A value of "5.0" will install the latest release of WMF 5.0
150+
/// (https://www.microsoft.com/en-us/download/details.aspx?id=50395).
151151
///
152-
/// A value of "latest" will install the latest WMF, currently WMF 5.0PP
152+
/// A value of "latest" will install the latest WMF, currently WMF 5.0
153153
///
154154
/// The default value is "latest"
155155
/// </summary>
156156
[Parameter(ValueFromPipelineByPropertyName = true)]
157-
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP" })]
157+
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
158158
public string WmfVersion { get; set; }
159159

160160
/// <summary>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36552,6 +36552,16 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
3655236552
</maml:description>
3655336553
<command:parameterValue required="true" variableLength="false">IPersistentVM</command:parameterValue>
3655436554
</command:parameter>
36555+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
36556+
<maml:name>WmfVersion</maml:name>
36557+
<maml:description>
36558+
<maml:para>
36559+
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;.
36560+
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.
36561+
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>
36562+
</maml:description>
36563+
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
36564+
</command:parameter>
3655536565
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
3655636566
<maml:name>DataCollection</maml:name>
3655736567
<maml:description>
@@ -36726,6 +36736,21 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
3672636736
</dev:type>
3672736737
<dev:defaultValue>none</dev:defaultValue>
3672836738
</command:parameter>
36739+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
36740+
<maml:name>WmfVersion</maml:name>
36741+
<maml:description>
36742+
<maml:para>
36743+
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;.
36744+
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.
36745+
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>
36746+
</maml:description>
36747+
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
36748+
<dev:type>
36749+
<maml:name>String</maml:name>
36750+
<maml:uri/>
36751+
</dev:type>
36752+
<dev:defaultValue>latest</dev:defaultValue>
36753+
</command:parameter>
3672936754
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
3673036755
<maml:name>DataCollection</maml:name>
3673136756
<maml:description>

0 commit comments

Comments
 (0)