resolved review comments

Azure · Feb 1, 2023 · 9c0f4e6 · 9c0f4e6
1 parent ec0d188
commit 9c0f4e6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/...ices/RecoveryServices.Backup.CrossRegionRestore.Management.Sdk/Properties/AssemblyInfo.cs b/...ices/RecoveryServices.Backup.CrossRegionRestore.Management.Sdk/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("2330c44a-18bf-46d8-976d-64e1fda5fc16")]
 
-[assembly: AssemblyVersion("6.1.3")]
-[assembly: AssemblyFileVersion("6.1.3")]
+[assembly: AssemblyVersion("6.1.2")]
+[assembly: AssemblyFileVersion("6.1.2")]
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs b/src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs
@@ -794,6 +794,7 @@ public static RecoveryPointBase GetPSAzureVMRecoveryPointForSecondaryRegion(
                 }
             }
 
+            // to uncomment while adding expiry time for CRR RPs
             /*if (recoveryPoint.RecoveryPointProperties != null)
             {
                 rpBase.RecoveryPointExpiryTime = (recoveryPoint.RecoveryPointProperties.ExpiryTime != null) ? DateTime.Parse(recoveryPoint.RecoveryPointProperties.ExpiryTime): (DateTime?)null;

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Management.Sdk/Properties/AssemblyInfo.cs b/src/RecoveryServices/RecoveryServices.Backup.Management.Sdk/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d87b76bd-aa06-49ba-bfd7-f0f4984f65c3")]
 
-[assembly: AssemblyVersion("6.1.3")]
-[assembly: AssemblyFileVersion("6.1.3")]
+[assembly: AssemblyVersion("6.1.2")]
+[assembly: AssemblyFileVersion("6.1.2")]
diff --git a/...es/RecoveryServices.Backup/Cmdlets/Item/DisableAzureRmRecoveryServicesBackupProtection.cs b/...es/RecoveryServices.Backup/Cmdlets/Item/DisableAzureRmRecoveryServicesBackupProtection.cs
@@ -24,6 +24,7 @@
 using System.Management.Automation;
 using Microsoft.Rest.Azure.OData;
 using System;
+using Microsoft.Azure.Commands.Common.Exceptions;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -58,8 +59,7 @@ public SwitchParameter RemoveRecoveryPoints
         /// If this option is used, all the data backed up for this item will 
         /// expire as per the protection policy retention settings
         /// </summary>
-        [Parameter(Mandatory = false,  HelpMessage = ParamHelpMsgs.Item.SuspendBackupOption)]
-        [ValidateNotNullOrEmpty]
+        [Parameter(Mandatory = false,  HelpMessage = ParamHelpMsgs.Item.SuspendBackupOption)]        
         public SwitchParameter RetainRecoveryPointsAsPerPolicy { get; set; }
 
         /// <summary>
@@ -100,7 +100,7 @@ public override void ExecuteCmdlet()
 
                         if(DeleteBackupData && RetainRecoveryPointsAsPerPolicy.IsPresent)
                         {
-                            throw new ArgumentException(String.Format(Resources.CantRemoveAndRetainRPsSimultaneously));
+                            throw new AzPSArgumentException(String.Format(Resources.CantRemoveAndRetainRPsSimultaneously), "RetainRecoveryPointsAsPerPolicy");
                         }
 
                         PsBackupProviderManager providerManager =

diff --git a/src/RecoveryServices/RecoveryServices.Management.Sdk/Properties/AssemblyInfo.cs b/src/RecoveryServices/RecoveryServices.Management.Sdk/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("f1393c09-b594-43e7-8987-81393db883d0")]
 
-[assembly: AssemblyVersion("6.1.3")]
-[assembly: AssemblyFileVersion("6.1.3")]
+[assembly: AssemblyVersion("6.1.2")]
+[assembly: AssemblyFileVersion("6.1.2")]
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
+                // to uncomment while adding expiry time for CRR RPs
                 /*if (recoveryPoint.RecoveryPointProperties != null)
                 {
                     rpBase.RecoveryPointExpiryTime = (recoveryPoint.RecoveryPointProperties.ExpiryTime != null) ? DateTime.Parse(recoveryPoint.RecoveryPointProperties.ExpiryTime): (DateTime?)null;
@@ Expand Down @@