Skip to content

Commit 3b37a63

Browse files
author
Maddie Clayton
authored
Merge pull request #6763 from MabOneSdk/users/anudeeb/sdk-update
Updated Management SDK version
2 parents ad65247 + 9483fba commit 3b37a63

File tree

31 files changed

+2621220
-366880
lines changed

31 files changed

+2621220
-366880
lines changed

‎ModuleMappings.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,9 @@
134134
"src/ResourceManager/Profile/": [
135135
"AzureRM.Profile"
136136
],
137-
"src/ResourceManager/RecoveryServices.Backup/": [
138-
"AzureRM.RecoveryServices.Backup"
139-
],
140137
"src/ResourceManager/RecoveryServices/": [
141-
"AzureRM.RecoveryServices"
138+
"AzureRM.RecoveryServices",
139+
"AzureRM.RecoveryServices.Backup"
142140
],
143141
"src/ResourceManager/RedisCache/": [
144142
"AzureRM.RedisCache"
@@ -199,4 +197,4 @@
199197
],
200198
"tools/": [
201199
]
202-
}
200+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<ItemGroup>
3737
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.2.1.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
39+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.3.0.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public static List<RecoveryPointBase> GetPSAzureRecoveryPoints(
6363
}
6464

6565
bool isInstantILRSessionActive =
66-
recPoint.IsInstantILRSessionActive.HasValue ?
67-
(bool)recPoint.IsInstantILRSessionActive : false;
66+
recPoint.IsInstantIlrSessionActive.HasValue ?
67+
(bool)recPoint.IsInstantIlrSessionActive : false;
6868

6969
AzureVmRecoveryPoint rpBase = new AzureVmRecoveryPoint()
7070
{
@@ -163,8 +163,8 @@ public static RecoveryPointBase GetPSAzureRecoveryPoints(
163163
}
164164

165165
bool isInstantILRSessionActive =
166-
recPoint.IsInstantILRSessionActive.HasValue ?
167-
(bool)recPoint.IsInstantILRSessionActive : false;
166+
recPoint.IsInstantIlrSessionActive.HasValue ?
167+
(bool)recPoint.IsInstantIlrSessionActive : false;
168168
AzureVmRecoveryPoint vmResult = new AzureVmRecoveryPoint()
169169
{
170170
RecoveryPointId = rpResponse.Name,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public class ContainerBase : ContainerContext
104104

105105
public ContainerBase(ServiceClientModel.ProtectionContainerResource protectionContainer)
106106
: base(ConversionUtils.GetPsContainerType(
107-
protectionContainer.Properties.ContainerType.ToString()),
108-
protectionContainer.Properties.BackupManagementType.ToString())
107+
protectionContainer.Properties.BackupManagementType),
108+
protectionContainer.Properties.BackupManagementType)
109109
{
110110
Name = IdUtils.GetNameFromUri(protectionContainer.Name);
111111
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<ItemGroup>
3737
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.2.1.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
39+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.3.0.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,16 @@ public static BackupManagementType GetPsBackupManagementType(string backupManage
227227
/// <returns>PowerShell container type</returns>
228228
public static ContainerType GetPsContainerType(string containerType)
229229
{
230-
if (containerType == "Microsoft.ClassicCompute/virtualMachines" ||
231-
containerType == "Microsoft.Compute/virtualMachines")
230+
if (containerType == ServiceClientModel.BackupManagementType.AzureIaasVM)
232231
{
233232
return ContainerType.AzureVM;
234233
}
235-
else if (containerType == ServiceClientModel.MabServerType.Windows.ToString())
234+
else if (containerType == ServiceClientModel.BackupManagementType.MAB)
236235
{
237236
return ContainerType.Windows;
238237
}
239238
else if (containerType ==
240-
ServiceClientModel.MabServerType.AzureSqlContainer.ToString())
239+
ServiceClientModel.BackupManagementType.AzureSql)
241240
{
242241
return ContainerType.AzureSQL;
243242
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ItemGroup>
3838
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3939
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.2.1.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.3.0.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Core" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</Reference>
4141
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.2.1.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
43+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.3.0.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Configuration" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.2.1.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.3.0.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5959
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)