Skip to content

Commit 5e7b211

Browse files
author
Samuel Anudeep
committed
Merge branch 'devSwagger' of https://github.com/MabOneSdk/azure-powershell into devSwagger
2 parents 6a58dd9 + 09c548b commit 5e7b211

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,6 +2263,9 @@
22632263
<Component Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" Guid="*">
22642264
<File Id="filDFC93A6AA2A808957B249CC88C7D6EE5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
22652265
</Component>
2266+
<Component Id="cmpDB3F89FCB6F69647096085E3C07D2EA7" Guid="*">
2267+
<File Id="fil981731C42616352E119DFCB2CDFCF8BB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.Azure.dll" />
2268+
</Component>
22662269
<Component Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" Guid="*">
22672270
<File Id="filA708CDDEB8C8A8363E22F4C83953E14E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.dll" />
22682271
</Component>
@@ -6187,6 +6190,7 @@
61876190
<ComponentRef Id="cmp13B3F08D31DD4410B1934B82517CAC9A" />
61886191
<ComponentRef Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" />
61896192
<ComponentRef Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" />
6193+
<ComponentRef Id="cmpDB3F89FCB6F69647096085E3C07D2EA7" />
61906194
<ComponentRef Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" />
61916195
<ComponentRef Id="cmp0FB4C1F5BB0FB399774156C4B56696B8" />
61926196
<ComponentRef Id="cmp7B84FC694FB5281CF08E6F1B41D07E12" />

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,9 @@ public override void ExecuteCmdlet()
152152
break;
153153
}
154154

155-
var backupManagementTypeFilter =
156-
ServiceClientHelpers.GetServiceClientBackupManagementType(serviceClientProviderType);
155+
var backupManagementTypeFilter = string.IsNullOrEmpty(serviceClientProviderType) ?
156+
default(ServiceClientModel.BackupManagementType?) :
157+
serviceClientProviderType.ToEnum<ServiceClientModel.BackupManagementType>();
157158

158159
ODataQuery<ServiceClientModel.ProtectionPolicyQueryObject> queryParams
159160
= new ODataQuery<ServiceClientModel.ProtectionPolicyQueryObject>(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public override void ExecuteCmdlet()
103103

104104
// Track OperationStatus URL for operation completion
105105

106-
string policyName = policyResponse.Body.Name;
106+
string policyName = Policy.Name;
107107

108108
ServiceClientModel.OperationStatus operationStatus =
109109
TrackingHelpers.GetOperationStatus<ServiceClientModel.OperationStatus, ServiceClientModel.ProtectionPolicyResource> (

0 commit comments

Comments
 (0)