Skip to content

Commit 816b726

Browse files
author
dragonfly91
committed
Merge branch 'dev1' into anudeeb-dev1
2 parents e6d08af + 63a9514 commit 816b726

7 files changed

+492
-309
lines changed

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupRetentionPolicyObject.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2626
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupRetentionPolicyObject"), OutputType(typeof(AzureRmRecoveryServicesBackupRetentionPolicyBase))]
2727
public class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoveryServicesBackupCmdletBase
2828
{
29-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
29+
[Parameter(Mandatory = true, Position = 0, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
3030
[ValidateNotNullOrEmpty]
3131
public WorkloadType WorkloadType { get; set; }
3232

33-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.BackupManagementType)]
33+
[Parameter(Mandatory = false, Position = 1, HelpMessage = ParamHelpMsg.Common.BackupManagementType)]
3434
[ValidateNotNullOrEmpty]
3535
public BackupManagementType? BackupManagementType { get; set; }
3636

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesSchedulePolicyObject.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2626
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupSchedulePolicyObject"), OutputType(typeof(AzureRmRecoveryServicesBackupSchedulePolicyBase))]
2727
public class GetAzureRmRecoveryServicesBackupSchedulePolicyObject : RecoveryServicesBackupCmdletBase
2828
{
29-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
29+
[Parameter(Mandatory = true, Position = 0, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
3030
[ValidateNotNullOrEmpty]
3131
public WorkloadType WorkloadType { get; set; }
3232

33-
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.BackupManagementType)]
33+
[Parameter(Mandatory = false, Position = 1, HelpMessage = ParamHelpMsg.Common.BackupManagementType)]
3434
[ValidateNotNullOrEmpty]
3535
public BackupManagementType? BackupManagementType { get; set; }
3636

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@
107107
<Compile Include="CmdletParameterHelpMessages.cs" />
108108
</ItemGroup>
109109
<ItemGroup>
110-
<Content Include="Microsoft.Azure.Commands.RecoveryServices.Backup.dll-help.xml" />
110+
<Content Include="Microsoft.Azure.Commands.RecoveryServices.Backup.dll-help.xml">
111+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
112+
</Content>
111113
</ItemGroup>
112114
<ItemGroup>
113115
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
@@ -151,6 +153,7 @@
151153
<None Include="..\AzureRM.RecoveryServices.Backup.psd1">
152154
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
153155
</None>
156+
<None Include="Microsoft.Azure.Commands.RecoveryServices.Backup.dll-help.psd1" />
154157
<None Include="Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml">
155158
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
156159
</None>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
#
2+
# Module manifest for module 'Microsoft.WindowsAzure.Commands.RecoveryServices.Backup'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 4/26/2016
7+
#
8+
9+
@{
10+
11+
# Version number of this module.
12+
ModuleVersion = '1.0'
13+
14+
# ID used to uniquely identify this module
15+
GUID = 'bbe363aa-27da-4af9-9cd4-b9bad23bd58e'
16+
17+
# Author of this module
18+
Author = 'Microsoft Corporation'
19+
20+
# Company or vendor of this module
21+
CompanyName = 'Microsoft Corporation'
22+
23+
# Copyright statement for this module
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
25+
26+
# Description of the functionality provided by this module
27+
Description = ''
28+
29+
# Minimum version of the Windows PowerShell engine required by this module
30+
PowerShellVersion = '3.0'
31+
32+
# Name of the Windows PowerShell host required by this module
33+
PowerShellHostName = ''
34+
35+
# Minimum version of the Windows PowerShell host required by this module
36+
PowerShellHostVersion = ''
37+
38+
# Minimum version of the .NET Framework required by this module
39+
DotNetFrameworkVersion = '4.0'
40+
41+
# Minimum version of the common language runtime (CLR) required by this module
42+
CLRVersion='4.0'
43+
44+
# Processor architecture (None, X86, Amd64, IA64) required by this module
45+
ProcessorArchitecture = 'None'
46+
47+
# Modules that must be imported into the global environment prior to importing this module
48+
RequiredModules = @()
49+
50+
# Assemblies that must be loaded prior to importing this module
51+
RequiredAssemblies = @()
52+
53+
# Script files (.ps1) that are run in the caller's environment prior to importing this module
54+
ScriptsToProcess = @()
55+
56+
# Type files (.ps1xml) to be loaded when importing this module
57+
TypesToProcess = @()
58+
59+
# Format files (.ps1xml) to be loaded when importing this module
60+
FormatsToProcess = @()
61+
62+
# Modules to import as nested modules of the module specified in ModuleToProcess
63+
NestedModules = @(
64+
'..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.dll'
65+
)
66+
67+
# Functions to export from this module
68+
FunctionsToExport = '*'
69+
70+
# Cmdlets to export from this module
71+
CmdletsToExport = '*'
72+
73+
# Variables to export from this module
74+
VariablesToExport = '*'
75+
76+
# Aliases to export from this module
77+
AliasesToExport = @()
78+
79+
# List of all modules packaged with this module
80+
ModuleList = @()
81+
82+
# List of all files packaged with this module
83+
FileList = @()
84+
85+
# Private data to pass to the module specified in ModuleToProcess
86+
PrivateData = @{
87+
88+
PSData = @{
89+
90+
# Tags applied to this module. These help with module discovery in online galleries.
91+
# Tags = @()
92+
93+
# A URL to the license for this module.
94+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
95+
96+
# A URL to the main website for this project.
97+
ProjectUri = 'https://github.com/Azure/azure-powershell'
98+
99+
# A URL to an icon representing this module.
100+
# IconUri = ''
101+
102+
# ReleaseNotes of this module
103+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
104+
105+
} # End of PSData hashtable
106+
107+
} # End of PrivateData hashtable
108+
109+
}

0 commit comments

Comments
 (0)