diff --git a/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs
index 1d88d13de8..64f9b102d9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs
@@ -314,22 +314,6 @@ namespace Microsoft.AspNet.Mvc.Core
return GetString("ActionSelector_GetCandidateActionsIsAmbiguous");
}
- ///
- /// The argument must not be null or empty.
- ///
- internal static string ArgumentNullOrEmpty
- {
- get { return GetString("ArgumentNullOrEmpty"); }
- }
-
- ///
- /// The argument must not be null or empty.
- ///
- internal static string FormatArgumentNullOrEmpty()
- {
- return GetString("ArgumentNullOrEmpty");
- }
-
///
/// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'.
///
@@ -511,7 +495,7 @@ namespace Microsoft.AspNet.Mvc.Core
var value = _resourceManager.GetString(name);
System.Diagnostics.Debug.Assert(value != null);
-
+
if (formatterNames != null)
{
for (var i = 0; i < formatterNames.Length; i++)
diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs
index 61ae2ef6b5..a315191283 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/HtmlHelper.cs
@@ -502,7 +502,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
var fullName = ViewData.TemplateInfo.GetFullHtmlFieldName(name);
if (string.IsNullOrEmpty(fullName))
{
- throw new ArgumentException(Resources.ArgumentNullOrEmpty, "name");
+ throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, "name");
}
var tagBuilder = new TagBuilder("input");
diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TagBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TagBuilder.cs
index 52bfdda64b..7e6d6bc34a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TagBuilder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TagBuilder.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
{
if (string.IsNullOrEmpty(tagName))
{
- throw new ArgumentException(Resources.ArgumentNullOrEmpty, "tagName");
+ throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, "tagName");
}
TagName = tagName;
@@ -114,7 +114,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
{
if (string.IsNullOrEmpty(key))
{
- throw new ArgumentException(Resources.ArgumentNullOrEmpty, "key");
+ throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, "key");
}
if (replaceExisting || !Attributes.ContainsKey(key))
diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs
index b23ef41574..3284a7d307 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs
@@ -160,7 +160,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
{
if (string.IsNullOrEmpty(expression))
{
- throw new ArgumentException(Resources.ArgumentNullOrEmpty, "expression");
+ throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, "expression");
}
return ViewDataEvaluator.Eval(this, expression);
diff --git a/src/Microsoft.AspNet.Mvc.Core/Resources.resx b/src/Microsoft.AspNet.Mvc.Core/Resources.resx
index eafa388ba4..93319628df 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Resources.resx
+++ b/src/Microsoft.AspNet.Mvc.Core/Resources.resx
@@ -174,9 +174,6 @@
The supplied route values are ambiguous and can select multiple sets of actions.
-
- The argument must not be null or empty.
-
Property '{0}' is of type '{1}', but this method requires a value of type '{2}'.
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/AssociatedMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/AssociatedMetadataProvider.cs
index 1ad3bbb886..c219b34eb7 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/AssociatedMetadataProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/AssociatedMetadataProvider.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
{
if (string.IsNullOrEmpty(propertyName))
{
- throw new ArgumentException(Resources.FormatArgumentNullOrEmpty("propertyName"), "propertyName");
+ throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, "propertyName");
}
var typeInfo = GetTypeInformation(containerType);
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs
index 0776271a4c..d1a85bbbd4 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs
@@ -11,19 +11,19 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
= new ResourceManager("Microsoft.AspNet.Mvc.ModelBinding.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
- /// The argument '{0}' is null or empty.
+ /// The value cannot be null or empty.
///
- internal static string ArgumentNullOrEmpty
+ internal static string ArgumentCannotBeNullOrEmpty
{
- get { return GetString("ArgumentNullOrEmpty"); }
+ get { return GetString("ArgumentCannotBeNullOrEmpty"); }
}
///
- /// The argument '{0}' is null or empty.
+ /// The value cannot be null or empty.
///
- internal static string FormatArgumentNullOrEmpty(object p0)
+ internal static string FormatArgumentCannotBeNullOrEmpty()
{
- return string.Format(CultureInfo.CurrentCulture, GetString("ArgumentNullOrEmpty"), p0);
+ return GetString("ArgumentCannotBeNullOrEmpty");
}
///
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx b/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx
index a7daaeee94..5d6251b5b4 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx
@@ -117,8 +117,8 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- The argument '{0}' is null or empty.
+
+ The value cannot be null or empty.
The property {0}.{1} could not be found.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs
index a1b18d347c..9487c23071 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc.Razor
= new ResourceManager("Microsoft.AspNet.Mvc.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
- /// Value cannot be null or empty.
+ /// The value cannot be null or empty.
///
internal static string ArgumentCannotBeNullOrEmpty
{
@@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.Razor
}
///
- /// Value cannot be null or empty.
+ /// The value cannot be null or empty.
///
internal static string FormatArgumentCannotBeNullOrEmpty()
{
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Resources.resx b/src/Microsoft.AspNet.Mvc.Razor/Resources.resx
index 333ff7cea7..0fe0028e88 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Resources.resx
+++ b/src/Microsoft.AspNet.Mvc.Razor/Resources.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Value cannot be null or empty.
+ The value cannot be null or empty.
The layout view '{0}' could not be located.
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs
index bffcf113c2..d4fce4c204 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs
@@ -83,11 +83,11 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test.Binders
ExceptionAssert.ThrowsArgument(
() => provider.GetMetadataForProperty(modelAccessor: null, containerType: typeof(object), propertyName: null),
"propertyName",
- "The argument 'propertyName' is null or empty.");
+ "The value cannot be null or empty.");
ExceptionAssert.ThrowsArgument(
() => provider.GetMetadataForProperty(modelAccessor: null, containerType: typeof(object), propertyName: String.Empty),
"propertyName",
- "The argument 'propertyName' is null or empty.");
+ "The value cannot be null or empty.");
}
[Fact]