Skip to content

Commit 1760f45

Browse files
dolauliwyunchi-ms
andauthored
Merge VVD update to master (#13718)
* Merge VVD update to master * Update ChangeLog.md Co-authored-by: Yunchi Wang <[email protected]>
1 parent 4eb4bd6 commit 1760f45

File tree

472 files changed

+5149
-4859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+5149
-4859
lines changed

src/DesktopVirtualization/Az.DesktopVirtualization.format.ps1xml

Lines changed: 122 additions & 110 deletions
Large diffs are not rendered by default.

src/DesktopVirtualization/Az.DesktopVirtualization.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = './Az.DesktopVirtualization.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '2.0.1'
15+
ModuleVersion = '2.1.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'

src/DesktopVirtualization/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Added StartVMOnConnect property to hostpool.
2122

2223
## Version 2.0.1
2324
* Added new MSIX Package cmdlets and updated Applications cmdlets.

src/DesktopVirtualization/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("5FAC4032-09B2-4E1D-A7CB-078DEA39CAF1")]
27-
[assembly: AssemblyVersion("2.0.1")]
28-
[assembly: AssemblyFileVersion("2.0.1")]
27+
[assembly: AssemblyVersion("2.1.0")]
28+
[assembly: AssemblyFileVersion("2.1.0")]

src/DesktopVirtualization/custom/Get-AzWvdRegistrationInfo.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Get the Windows virtual desktop registration info.
2020
Get the Windows virtual desktop registration info.
2121
#>
2222
function Get-AzWvdRegistrationInfo {
23-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.RegistrationInfo')]
23+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.RegistrationInfo')]
2424
[CmdletBinding(PositionalBinding=$false)]
2525
param(
2626
[Parameter()]
@@ -89,7 +89,7 @@ function Get-AzWvdRegistrationInfo {
8989

9090
process {
9191
$hostpool = Az.DesktopVirtualization\Get-AzWvdHostPool @PSBoundParameters
92-
New-Object -TypeName 'Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.RegistrationInfo' `
92+
New-Object -TypeName 'Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.RegistrationInfo' `
9393
-Property @{ `
9494
ExpirationTime = $hostpool.RegistrationInfoExpirationTime; `
9595
RegistrationTokenOperation = $hostpool.RegistrationInfoRegistrationTokenOperation; `

src/DesktopVirtualization/custom/New-AzWvdMsixpackage_PackageAlias.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function New-AzWvdMsixPackage_PackageAlias {
22

3-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IMsixPackage')]
3+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IMsixPackage')]
44
[CmdletBinding( PositionalBinding = $false, ConfirmImpact = 'Medium')]
55
param(
66
[Parameter()]

src/DesktopVirtualization/custom/New-AzWvdRegistrationInfo.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Create Windows virtual desktop registration info.
2020
Create Windows virtual desktop registration info.
2121
#>
2222
function New-AzWvdRegistrationInfo {
23-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IRegistrationInfo')]
23+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IRegistrationInfo')]
2424
[CmdletBinding(PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
2525
param(
2626
[Parameter()]
@@ -111,7 +111,7 @@ function New-AzWvdRegistrationInfo {
111111
-Ring $hostpool.Ring `
112112
-ValidationEnvironment:$hostpool.ValidationEnvironment `
113113
-PreferredAppGroupType $hostpool.PreferredAppGroupType
114-
New-Object -TypeName 'Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.RegistrationInfo' `
114+
New-Object -TypeName 'Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.RegistrationInfo' `
115115
-Property @{ `
116116
ExpirationTime = $hostpool.RegistrationInfoExpirationTime; `
117117
RegistrationTokenOperation = $hostpool.RegistrationInfoRegistrationTokenOperation; `

src/DesktopVirtualization/exports/Expand-AzWvdMsixImage.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ Name Type
2929
HostPoolName/extractmsiximage Microsoft.DesktopVirtualization/hostpools/extractmsiximage
3030
3131
.Inputs
32-
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IMsixImageUri
32+
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IMsixImageUri
3333
.Inputs
3434
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.IDesktopVirtualizationIdentity
3535
.Outputs
36-
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IExpandMsixImage
36+
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IExpandMsixImage
3737
.Notes
3838
COMPLEX PARAMETER PROPERTIES
3939
@@ -58,7 +58,7 @@ MSIXIMAGEURI <IMsixImageUri>: Represents URI referring to MSIX Image
5858
https://docs.microsoft.com/en-us/powershell/module/az.desktopvirtualization/expand-azwvdmsiximage
5959
#>
6060
function Expand-AzWvdMsixImage {
61-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IExpandMsixImage])]
61+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IExpandMsixImage])]
6262
[CmdletBinding(DefaultParameterSetName='ExpandExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
6363
param(
6464
[Parameter(ParameterSetName='Expand', Mandatory)]
@@ -95,7 +95,7 @@ param(
9595
[Parameter(ParameterSetName='Expand', Mandatory, ValueFromPipeline)]
9696
[Parameter(ParameterSetName='ExpandViaIdentity', Mandatory, ValueFromPipeline)]
9797
[Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Category('Body')]
98-
[Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IMsixImageUri]
98+
[Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IMsixImageUri]
9999
# Represents URI referring to MSIX Image
100100
# To construct, see NOTES section for MSIXIMAGEURI properties and create a hash table.
101101
${MsixImageUri},

src/DesktopVirtualization/exports/Get-AzWvdApplication.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ApplicationGroupName/ApplicationName2 Microsoft.DesktopVirtualization/applicatio
3535
.Inputs
3636
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.IDesktopVirtualizationIdentity
3737
.Outputs
38-
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IApplication
38+
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IApplication
3939
.Notes
4040
COMPLEX PARAMETER PROPERTIES
4141
@@ -57,7 +57,7 @@ INPUTOBJECT <IDesktopVirtualizationIdentity>: Identity Parameter
5757
https://docs.microsoft.com/en-us/powershell/module/az.desktopvirtualization/get-azwvdapplication
5858
#>
5959
function Get-AzWvdApplication {
60-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IApplication])]
60+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IApplication])]
6161
[CmdletBinding(DefaultParameterSetName='List', PositionalBinding=$false)]
6262
param(
6363
[Parameter(ParameterSetName='Get', Mandatory)]

src/DesktopVirtualization/exports/Get-AzWvdApplicationGroup.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ eastus ApplicationGroupName2 Microsoft.DesktopVirtualization/applicationgrou
3535
.Inputs
3636
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.IDesktopVirtualizationIdentity
3737
.Outputs
38-
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IApplicationGroup
38+
Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IApplicationGroup
3939
.Notes
4040
COMPLEX PARAMETER PROPERTIES
4141
@@ -57,7 +57,7 @@ INPUTOBJECT <IDesktopVirtualizationIdentity>: Identity Parameter
5757
https://docs.microsoft.com/en-us/powershell/module/az.desktopvirtualization/get-azwvdapplicationgroup
5858
#>
5959
function Get-AzWvdApplicationGroup {
60-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201019Preview.IApplicationGroup])]
60+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.DesktopVirtualization.Models.Api20201102Preview.IApplicationGroup])]
6161
[CmdletBinding(DefaultParameterSetName='List1', PositionalBinding=$false)]
6262
param(
6363
[Parameter(ParameterSetName='Get', Mandatory)]

0 commit comments

Comments
 (0)