Move exception messages to resource file

yantang-msft · yantang-msft · commit f979353245b0 · 2016-01-13T14:43:13.000-08:00
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs
@@ -71,18 +71,18 @@ public static Hashtable GetPublicDiagnosticsConfiguration(string config, string
             int wadCfgBeginIndex = config.IndexOf("<WadCfg>");
             if (wadCfgBeginIndex == -1)
             {
-                throw new ArgumentException("Cannot find the WadCfg element in the config.");
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigNoWadCfgStartTag);
             }
 
             int wadCfgEndIndex = config.IndexOf("</WadCfg>");
             if (wadCfgEndIndex == -1)
             {
-                throw new ArgumentException("Cannot find the WadCfg end element in the config.");
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigNoWadCfgEndTag);
             }
 
             if (wadCfgEndIndex <= wadCfgBeginIndex)
             {
-                throw new ArgumentException("WadCfg start element in the config is not matching the end element.");
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigWadCfgTagNotMatch);
             }
 
             string encodedConfiguration = Convert.ToBase64String(
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.Designer.cs
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx b/src/ServiceManagement/Compute/Commands.ServiceManagement/Properties/Resources.resx
@@ -774,4 +774,13 @@
   <data name="DiagnosticsExtensionNullStorageAccountName" xml:space="preserve">
     <value>Storage account name is not specified.</value>
   </data>
+  <data name="DiagnosticsExtensionXmlConfigNoWadCfgEndTag" xml:space="preserve">
+    <value>Cannot find the WadCfg end element in the config.</value>
+  </data>
+  <data name="DiagnosticsExtensionXmlConfigNoWadCfgStartTag" xml:space="preserve">
+    <value>Cannot find the WadCfg element in the config.</value>
+  </data>
+  <data name="DiagnosticsExtensionXmlConfigWadCfgTagNotMatch" xml:space="preserve">
+    <value>WadCfg start element in the config is not matching the end element.</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -71,18 +71,18 @@ public static Hashtable GetPublicDiagnosticsConfiguration(string config, string`
`71`	`71`	`int wadCfgBeginIndex = config.IndexOf("<WadCfg>");`
`72`	`72`	`if (wadCfgBeginIndex == -1)`
`73`	`73`	`{`
`74`		`- throw new ArgumentException("Cannot find the WadCfg element in the config.");`
	`74`	`+ throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigNoWadCfgStartTag);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`int wadCfgEndIndex = config.IndexOf("</WadCfg>");`
`78`	`78`	`if (wadCfgEndIndex == -1)`
`79`	`79`	`{`
`80`		`- throw new ArgumentException("Cannot find the WadCfg end element in the config.");`
	`80`	`+ throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigNoWadCfgEndTag);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (wadCfgEndIndex <= wadCfgBeginIndex)`
`84`	`84`	`{`
`85`		`- throw new ArgumentException("WadCfg start element in the config is not matching the end element.");`
	`85`	`+ throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigWadCfgTagNotMatch);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`string encodedConfiguration = Convert.ToBase64String(`