Skip to content

Dev #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangpf merged 5 commits into from
Mar 9, 2016
Merged

Dev #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f93bb52
fix wmf versions and the help file
eshaparmar Mar 4, 2016
b977e4e
re-add 5.0PP as a valid wmfversion value but remove it from documenta…
eshaparmar Mar 9, 2016
b0638b2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
eshaparmar Mar 9, 2016
50f768e
Merge pull request #1916 from dscsolutions/fixwmfversion
Mar 9, 2016
d779355
Merge pull request #459 from Azure/dev
huangpf Mar 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,23 +190,23 @@ 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.0PP".
/// 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.0PP" will install the latest release of WMF 5.0PP
/// (http://go.microsoft.com/fwlink/?LinkId=398175).
/// 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.0PP
/// 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" })]
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
public string WmfVersion { get; set; }

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13493,9 +13493,9 @@ Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName
<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.0PP&quot;.
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.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>
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>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
</command:parameter>
Expand Down Expand Up @@ -13721,9 +13721,9 @@ Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName
<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.0PP&quot;.
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.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>
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>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
<dev:type>
Expand Down
10 changes: 5 additions & 5 deletions ...nagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,23 +138,23 @@ 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.0PP".
/// 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.0PP" will install the latest release of WMF 5.0PP
/// (http://go.microsoft.com/fwlink/?LinkId=398175).
/// 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.0PP
/// 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" })]
[ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
public string WmfVersion { get; set; }

/// <summary>
Expand Down
25 changes: 25 additions & 0 deletions ...Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36552,6 +36552,16 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
</maml:description>
<command:parameterValue required="true" variableLength="false">IPersistentVM</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;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>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
<maml:name>DataCollection</maml:name>
<maml:description>
Expand Down Expand Up @@ -36726,6 +36736,21 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
</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;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>
</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="false" position="named">
<maml:name>DataCollection</maml:name>
<maml:description>
Expand Down