Merge pull request #245 from yadavbdev/release-0.8.15

Fixing the infinite loop issue

Author: markcowl

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageDetails.cs

@@ -53,7 +53,7 @@ public override void ExecuteCmdlet()
             CollectionUsageDetailsResult detailsUsage = null;
             string locale = String.Empty;
             RemoteAppOperationStatusResult operationResult = null;
-            int maxRetryCount = 600;
+            int maxRetryCount = 60;
 
             if (String.IsNullOrWhiteSpace(UsageMonth))
             {
@@ -77,12 +77,13 @@ public override void ExecuteCmdlet()
             // The request is async and we have to wait for the usage details to be produced here
             do
             {
+
                 System.Threading.Thread.Sleep(5000);
 
                 operationResult = CallClient(() => Client.OperationResults.Get(detailsUsage.UsageDetails.OperationTrackingId), Client.OperationResults);
             }
-            while(operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Success ||
-                operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Failed ||
+            while(operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Success &&
+                operationResult.RemoteAppOperationResult.Status != RemoteAppOperationStatus.Failed &&
                 --maxRetryCount > 0);
 
             if (operationResult.RemoteAppOperationResult.Status == RemoteAppOperationStatus.Success)
@@ -104,7 +105,9 @@ public override void ExecuteCmdlet()
                 else if (maxRetryCount <= 0)
                 {
                     ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(
-                        Commands_RemoteApp.RequestTimedOut,
+                        String.Format(System.Globalization.CultureInfo.InvariantCulture, 
+                            Commands_RemoteApp.RequestTimedOutFormat,
+                            detailsUsage.UsageDetails.OperationTrackingId),
                         String.Empty,
                         Client.Collections,
                         ErrorCategory.OperationTimeout);

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs

@@ -177,8 +177,8 @@
   <data name="NoVmImageFoundErrorFormat" xml:space="preserve">
     <value>No VM image found with name {0}.</value>
   </data>
-  <data name="RequestTimedOut" xml:space="preserve">
-    <value>Request timed out</value>
+  <data name="RequestTimedOutFormat" xml:space="preserve">
+    <value>Request timed out. To continue querying for the usage details operation status, please use Get-AzureRemoteAppOperationResult with tracking id: {0}</value>
   </data>
   <data name="SessionLogOffCaptionMessage" xml:space="preserve">
     <value>Logging off user session...</value>