Update Remove cmdlets and changelog

Author: fangl

src/ResourceManager/Sql/ChangeLog.md

@@ -18,8 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
-* Overview of change #1
-	- Add Data Sync PowerShell Cmdlets to AzureRM.Sql
+* Add Data Sync PowerShell Cmdlets to AzureRM.Sql
 
 ## Version 3.1.0
 * Restore-AzureRmSqlDatabase: Update documentation examples

src/ResourceManager/Sql/Commands.Sql/Data Sync/Cmdlet/RemoveAzureSqlSyncAgent.cs

@@ -81,14 +81,14 @@ protected override IEnumerable<AzureSqlSyncAgentModel> PersistChanges(IEnumerabl
         /// </summary>
         public override void ExecuteCmdlet()
         {
-            if (!Force.IsPresent && !ShouldProcess(
-                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncAgentDescription, this.Name),
-                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncAgentWarning, this.Name, this.ResourceGroupName),
-                Microsoft.Azure.Commands.Sql.Properties.Resources.ShouldProcessCaption))
+            if (ShouldProcess(this.Name))
             {
-                return;
+                if (Force || ShouldContinue(
+                    string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncAgentWarning, this.Name, this.ResourceGroupName), ""))
+                {
+                    base.ExecuteCmdlet();
+                }
             }
-            base.ExecuteCmdlet();
         }
     }
 }

src/ResourceManager/Sql/Commands.Sql/Data Sync/Cmdlet/RemoveAzureSqlSyncGroup.cs

@@ -81,14 +81,14 @@ protected override IEnumerable<AzureSqlSyncGroupModel> PersistChanges(IEnumerabl
         /// </summary>
         public override void ExecuteCmdlet()
         {
-            if (!Force.IsPresent && !ShouldProcess(
-                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncGroupDescription, this.Name),
-                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncGroupWarning, this.Name, this.DatabaseName),
-                Microsoft.Azure.Commands.Sql.Properties.Resources.ShouldProcessCaption))
+            if (ShouldProcess(this.Name))
             {
-                return;
+                if (Force || ShouldContinue(
+                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncGroupWarning, this.Name, this.DatabaseName), ""))
+                {
+                    base.ExecuteCmdlet();
+                }
             }
-            base.ExecuteCmdlet();
         }
     }
 }

src/ResourceManager/Sql/Commands.Sql/Data Sync/Cmdlet/RemoveAzureSqlSyncMember.cs

@@ -79,14 +79,14 @@ protected override IEnumerable<AzureSqlSyncMemberModel> PersistChanges(IEnumerab
         /// </summary>
         public override void ExecuteCmdlet()
         {
-            if (!Force.IsPresent && !ShouldProcess(
-                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncMemberDescription, this.Name),
-                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncMemberWarning, this.Name, this.SyncGroupName),
-                Microsoft.Azure.Commands.Sql.Properties.Resources.ShouldProcessCaption))
+            if (ShouldProcess(this.Name))
             {
-                return;
+                if (Force || ShouldContinue(
+                string.Format(CultureInfo.InvariantCulture, Microsoft.Azure.Commands.Sql.Properties.Resources.RemoveAzureSqlSyncMemberWarning, this.Name, this.SyncGroupName), ""))
+                {
+                    base.ExecuteCmdlet();
+                }
             }
-            base.ExecuteCmdlet();
         }
     }
 }