Merge pull request #591 from vivsriaus/dev

Convert to resource for new and set cmdlets - this will fix the faili…

Author: stankovski

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceCmdlet.cs

@@ -129,7 +129,7 @@ protected override void OnProcessRecord()
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
 
-                    this.TryConvertAndWriteObject(result, this.OutputObjectFormat.Value);
+                    this.TryConvertToResourceAndWriteObject(result, this.OutputObjectFormat.Value);
                 });
         }
 

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/ResourceManagerCmdletBase.cs

@@ -277,6 +277,24 @@ protected void TryConvertAndWriteObject(string resultString, ResourceObjectForma
             }
         }
 
+        /// <summary>
+        /// Writes the object
+        /// </summary>
+        /// <param name="resultString">The result as a string</param>
+        /// <param name="objectFormat">The <see cref="ResourceObjectFormat"/></param>
+        protected void TryConvertToResourceAndWriteObject(string resultString, ResourceObjectFormat objectFormat)
+        {
+            Resource<JToken> resultResource;
+            if (resultString.TryConvertTo<Resource<JToken>>(out resultResource))
+            {
+                this.WriteObject(resultResource.ToPsObject(objectFormat));
+            }
+            else
+            {
+                this.WriteObject(resultString);
+            }
+        }
+
         /// <summary>
         /// Writes a <see cref="JToken"/> object as a <see cref="PSObject"/>.
         /// </summary>

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/SetAzureResourceCmdlet.cs

@@ -123,8 +123,8 @@ protected override void OnProcessRecord()
                     var activity = string.Format("{0} {1}", this.ShouldUsePatchSemantics() ? "PATCH" : "PUT", managementUri.PathAndQuery);
                     var result = this.GetLongRunningOperationTracker(activityName: activity, isResourceCreateOrUpdate: true)
                         .WaitOnOperation(operationResult: operationResult);
-                    
-                    this.TryConvertAndWriteObject(result, this.OutputObjectFormat.Value);
+
+                    this.TryConvertToResourceAndWriteObject(result, this.OutputObjectFormat.Value);
                 });
         }