From e27ca500ab6e8f97e71d2d826511d9d54be33f64 Mon Sep 17 00:00:00 2001
From: Niraj Gandhi <nirajg@microsoft.com>
Date: Wed, 14 Sep 2016 14:12:03 -0700
Subject: [PATCH 1/2] Fix the progress for ARM cmdlets

---
 .../Components/LongRunningOperationHelper.cs  | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs
index 3a12c30b613e..171a85d9e299 100644
--- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs
+++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs
@@ -283,7 +283,7 @@ private ResourceManagerRestRestClient GetResourcesClient()
         /// <param name="result">The operation result</param>
         private void UpdateProgress(TrackingOperationResult result)
         {
-            this.ProgressTrackerObject.UpdateProgress(result);
+            this.ProgressTrackerObject.UpdateProgress(result, this.IsResourceCreateOrUpdate);
         }
 
         /// <summary>
@@ -332,26 +332,42 @@ internal ProgressTracker(string activityName, Func<ResourceManagerRestRestClient
                 this.ProgressRecord = new ProgressRecord(activityId: 0, activity: activityName, statusDescription: "Starting - 0.00% completed.");
             }
 
+            internal void SetProgressPercentageAndWriteProgress(double percentage)
+            {
+                this.SetProgressRecordPercentComplete(percentage);
+                this.WriteProgressAction(this.ProgressRecord);
+            }
+
             /// <summary>
             /// Logs the fact that the operation has progressed.
             /// </summary>
             /// <param name="result">The operation result</param>
-            internal void UpdateProgress(TrackingOperationResult result)
+            internal void UpdateProgress(TrackingOperationResult result, bool isResourceCreateOrUpdate)
             {
-                var currentState = this.GetOperationState(result.OperationResult);
-
-                if (result.Failed || currentState == null || !this.LastState.EqualsInsensitively(currentState))
+                if (isResourceCreateOrUpdate)
                 {
-                    this.SetProgressRecordPercentComplete(100.0);
-                    this.WriteProgressAction(this.ProgressRecord);
-                }
+                    var currentState = this.GetOperationState(result.OperationResult);
 
-                if (currentState == null)
+                    if (result.Failed || currentState == null || !this.LastState.EqualsInsensitively(currentState))
+                    {
+                        this.SetProgressPercentageAndWriteProgress(100.0);
+                    }
+
+                    if (currentState == null)
+                    {
+                        return;
+                    }
+
+                    this.LastState = currentState;
+                }
+                else
                 {
-                    return;
+                    if(result.Failed)
+                    {
+                        this.SetProgressPercentageAndWriteProgress(100.0);
+                    }
                 }
 
-                this.LastState = currentState;
                 this.SetProgressRecordPercentComplete(result.OperationResult.PercentComplete);
                 this.WriteProgressAction(this.ProgressRecord);
             }

From e8d13a2fc0412d3688ca0c8d17e386d3ad71b37e Mon Sep 17 00:00:00 2001
From: Niraj Gandhi <nirajg@microsoft.com>
Date: Wed, 21 Sep 2016 14:59:56 -0700
Subject: [PATCH 2/2] Updated the method summary

---
 .../Cmdlets/Components/LongRunningOperationHelper.cs             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs
index 171a85d9e299..9736a5bf1fb3 100644
--- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs
+++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs
@@ -342,6 +342,7 @@ internal void SetProgressPercentageAndWriteProgress(double percentage)
             /// Logs the fact that the operation has progressed.
             /// </summary>
             /// <param name="result">The operation result</param>
+            /// <param name="isResourceCreateOrUpdate">Is Create or Update operation, other option include Move etc.</param>
             internal void UpdateProgress(TrackingOperationResult result, bool isResourceCreateOrUpdate)
             {
                 if (isResourceCreateOrUpdate)