diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
index 04e46664ca57..fb3825f62bc5 100644
--- a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
+++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
@@ -65,7 +65,7 @@
..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll
- ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.14-preview\lib\net40\Microsoft.Azure.ResourceManager.dll
+ ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.16-preview\lib\net40\Microsoft.Azure.ResourceManager.dll
True
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config b/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config
index ea861073dadd..3634a840964a 100644
--- a/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config
+++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config
@@ -5,7 +5,7 @@
-
+
diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
index d83520f6dbf5..b8ab3a9df847 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
+++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
@@ -70,7 +70,7 @@
False
- ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.14-preview\lib\net40\Microsoft.Azure.ResourceManager.dll
+ ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.16-preview\lib\net40\Microsoft.Azure.ResourceManager.dll
..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll
diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs
index bea91144b777..62612369d5b2 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs
+++ b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs
@@ -245,23 +245,33 @@ private void WriteDeploymentProgress(string resourceGroup, string deploymentName
if (operation.Properties.ProvisioningState != ProvisioningState.Failed)
{
- statusMessage = string.Format(normalStatusFormat,
+ if (operation.Properties.TargetResource != null)
+ {
+ statusMessage = string.Format(normalStatusFormat,
operation.Properties.TargetResource.ResourceType,
operation.Properties.TargetResource.ResourceName,
operation.Properties.ProvisioningState.ToLower());
- WriteVerbose(statusMessage);
+ WriteVerbose(statusMessage);
+ }
}
else
{
string errorMessage = ParseErrorMessage(operation.Properties.StatusMessage);
- statusMessage = string.Format(failureStatusFormat,
+ if(operation.Properties.TargetResource != null)
+ {
+ statusMessage = string.Format(failureStatusFormat,
operation.Properties.TargetResource.ResourceType,
operation.Properties.TargetResource.ResourceName,
errorMessage);
- WriteError(statusMessage);
+ WriteError(statusMessage);
+ }
+ else
+ {
+ WriteError(errorMessage);
+ }
List detailedMessage = ParseDetailErrorMessage(operation.Properties.StatusMessage);
diff --git a/src/ResourceManager/Resources/Commands.Resources/packages.config b/src/ResourceManager/Resources/Commands.Resources/packages.config
index 390071d6f989..5e2cac9bbdc0 100644
--- a/src/ResourceManager/Resources/Commands.Resources/packages.config
+++ b/src/ResourceManager/Resources/Commands.Resources/packages.config
@@ -6,7 +6,7 @@
-
+