Moved error messages to resources.

Hovsep Mkrtchyan · Hovsep Mkrtchyan · commit 563407d5571f · 2016-05-19T13:25:14.000-07:00
diff --git a/src/Common/Commands.Common/Properties/Resources.Designer.cs b/src/Common/Commands.Common/Properties/Resources.Designer.cs
diff --git a/src/Common/Commands.Common/Properties/Resources.resx b/src/Common/Commands.Common/Properties/Resources.resx
@@ -1544,4 +1544,7 @@ Select Y to enable data collection [Y/N]:</value>
   <data name="NoCurrentContextForDataCmdlet" xml:space="preserve">
     <value>"There is no current context, please log in using Login-AzureRmAccount for Azure Resource Manager or Add-AzureAccount for Azure Service Management."</value>
   </data>
+  <data name="NoSubscriptionFoundForTenant" xml:space="preserve">
+    <value>No subscriptions are associated with the logged in account in Azure Service Management (RDFE). This means that the logged in user is not an administrator or co-administrator for any account.\r\nDid you mean to execute Login-AzureRmAccount?</value>
+  </data>
 </root>
diff --git a/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs b/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs
@@ -48,7 +48,9 @@ public override void ExecuteCmdlet()
             {
                 if(!Common.Authentication.AzureSession.DataStore.FileExists(Path))
                 {
-                    throw new PSArgumentException(string.Format("Cannot find file '{0}'", Path));
+                    throw new PSArgumentException(string.Format(
+                        Microsoft.Azure.Commands.Profile.Properties.Resources.FileNotFound, 
+                        Path));
                 }
 
                 AzureRmProfileProvider.Instance.Profile = new AzureRMProfile(Path);
diff --git a/src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs b/src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/Profile/Commands.Profile/Properties/Resources.resx b/src/ResourceManager/Profile/Commands.Profile/Properties/Resources.resx
@@ -138,6 +138,9 @@
   <data name="CurrentTenantInUse" xml:space="preserve">
     <value>Current tenant with Id '{0}' will be used.</value>
   </data>
+  <data name="FileNotFound" xml:space="preserve">
+    <value>Cannot find file '{0}'</value>
+  </data>
   <data name="InvalidSubscriptionId" xml:space="preserve">
     <value>The provided subscription ID "{0}" is not a valid Guid.</value>
   </data>
diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProfileClient.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProfileClient.cs
@@ -325,9 +325,7 @@ public AzureAccount AddAccountAndLoadSubscriptions(AzureAccount account, AzureEn
             if (subscriptionsFromServer == null ||
                 subscriptionsFromServer.Count ==0 )
             {
-                throw new ArgumentException("No subscriptions are associated with the logged in account in " + 
-                        "Azure Service Management (RDFE). This means that the logged in user is not an administrator " + 
-                        "or co-administrator for any account." + Environment.NewLine + "Did you mean to execute Login-AzureRmAccount?");
+                throw new ArgumentException(Resources.NoSubscriptionFoundForTenant);
             }
             // If account id is null the login failed
             if (account.Id != null)

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public override void ExecuteCmdlet()`
`48`	`48`	`{`
`49`	`49`	`if(!Common.Authentication.AzureSession.DataStore.FileExists(Path))`
`50`	`50`	`{`
`51`		`- throw new PSArgumentException(string.Format("Cannot find file '{0}'", Path));`
	`51`	`+ throw new PSArgumentException(string.Format(`
	`52`	`+ Microsoft.Azure.Commands.Profile.Properties.Resources.FileNotFound,`
	`53`	`+ Path));`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`AzureRmProfileProvider.Instance.Profile = new AzureRMProfile(Path);`
Original file line number	Diff line number	Diff line change
`@@ -325,9 +325,7 @@ public AzureAccount AddAccountAndLoadSubscriptions(AzureAccount account, AzureEn`
`325`	`325`	`if (subscriptionsFromServer == null \|\|`
`326`	`326`	`subscriptionsFromServer.Count ==0 )`
`327`	`327`	`{`
`328`		`- throw new ArgumentException("No subscriptions are associated with the logged in account in " +`
`329`		`- "Azure Service Management (RDFE). This means that the logged in user is not an administrator " +`
`330`		`- "or co-administrator for any account." + Environment.NewLine + "Did you mean to execute Login-AzureRmAccount?");`
	`328`	`+ throw new ArgumentException(Resources.NoSubscriptionFoundForTenant);`
`331`	`329`	`}`
`332`	`330`	`// If account id is null the login failed`
`333`	`331`	`if (account.Id != null)`