Skip to content

Commit fd1dbb4

Browse files
mkheranimkherani
committed
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1
2 parents e8359f0 + e888123 commit fd1dbb4

File tree

13 files changed

+4272
-1544
lines changed

13 files changed

+4272
-1544
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public class AzureRmRecoveryServicesBackupItemBase : AzureRmRecoveryServicesBack
143143
/// <summary>
144144
/// Last Recovery Point for the item
145145
/// </summary>
146-
public DateTime? LastRecoveryPoint { get; set; }
146+
public DateTime? LatestRecoveryPoint { get; set; }
147147

148148
public AzureRmRecoveryServicesBackupItemBase(ProtectedItemResource protectedItemResource,
149149
AzureRmRecoveryServicesBackupContainerBase container)
@@ -152,7 +152,7 @@ public AzureRmRecoveryServicesBackupItemBase(ProtectedItemResource protectedItem
152152
ProtectedItem protectedItem = (ProtectedItem)protectedItemResource.Properties;
153153
Name = protectedItemResource.Name;
154154
Id = protectedItemResource.Id;
155-
LastRecoveryPoint = protectedItem.LastRecoveryPoint;
155+
LatestRecoveryPoint = protectedItem.LastRecoveryPoint;
156156
}
157157
}
158158

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
<SpecificVersion>False</SpecificVersion>
4141
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
43+
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup">
4544
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4645
</Reference>
4746
<Reference Include="Microsoft.Azure.ResourceManager">

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<SpecificVersion>False</SpecificVersion>
4444
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
4848
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4949
</Reference>
@@ -106,7 +106,11 @@
106106
<Compile Include="RecoveryServicesBackupCmdletBase.cs" />
107107
<Compile Include="CmdletParameterHelpMessages.cs" />
108108
</ItemGroup>
109-
<ItemGroup />
109+
<ItemGroup>
110+
<Content Include="Microsoft.Azure.Commands.RecoveryServices.Backup.dll-help.xml">
111+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
112+
</Content>
113+
</ItemGroup>
110114
<ItemGroup>
111115
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
112116
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
@@ -149,6 +153,7 @@
149153
<None Include="..\AzureRM.RecoveryServices.Backup.psd1">
150154
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
151155
</None>
156+
<None Include="Microsoft.Azure.Commands.RecoveryServices.Backup.dll-help.psd1" />
152157
<None Include="Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml">
153158
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
154159
</None>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.dll-help.psd1

Lines changed: 109 additions & 0 deletions
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)