From 0350f6ed48931f8f4d87ba108028ffb414f822fa Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 10 Sep 2015 16:13:18 -0700 Subject: [PATCH] Adding NeutralResourcesLanguageAttribute to Mvc assemblies --- src/Microsoft.AspNet.JsonPatch/Properties/AssemblyInfo.cs | 4 +++- .../Properties/AssemblyInfo.cs | 2 ++ .../Properties/AssemblyInfo.cs | 8 ++++++++ src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs | 2 ++ src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs | 4 +++- .../Properties/AssemblyInfo.cs | 4 +++- .../Properties/AssemblyInfo.cs | 8 ++++++++ .../Properties/AssemblyInfo.cs | 4 +++- .../Properties/AssemblyInfo.cs | 8 ++++++++ .../Properties/AssemblyInfo.cs | 2 ++ src/Microsoft.AspNet.Mvc.Razor/Properties/AssemblyInfo.cs | 2 ++ .../Properties/AssemblyInfo.cs | 2 ++ .../Properties/AssemblyInfo.cs | 2 ++ .../Properties/AssemblyInfo.cs | 4 +++- src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs | 4 +++- .../Properties/AssemblyInfo.cs | 4 +++- .../project.json | 3 ++- 17 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 src/Microsoft.AspNet.Mvc.ApiExplorer/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.AspNet.Mvc.Formatters.Json/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.AspNet.Mvc.Localization/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.JsonPatch/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.JsonPatch/Properties/AssemblyInfo.cs index 025a94598c..b2437d9ad6 100644 --- a/src/Microsoft.AspNet.JsonPatch/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.JsonPatch/Properties/AssemblyInfo.cs @@ -2,5 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; -[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Properties/AssemblyInfo.cs index 7167de3cda..a5e4753a2a 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Properties/AssemblyInfo.cs @@ -2,8 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Abstractions.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b2437d9ad6 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/Properties/AssemblyInfo.cs @@ -0,0 +1,8 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; +using System.Resources; + +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs index 317891ec69..2ed49a2624 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Properties/AssemblyInfo.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Core.Test")] @@ -9,3 +10,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.TagHelpers.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] diff --git a/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs index 94ca1cb48c..f7f2347b3a 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Cors.Test")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Cors.Test")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs index 84b3354e9a..7b1cecb2d7 100644 --- a/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.DataAnnotations.Test")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.DataAnnotations.Test")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b2437d9ad6 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/Properties/AssemblyInfo.cs @@ -0,0 +1,8 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; +using System.Resources; + +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs index 025a94598c..b2437d9ad6 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs @@ -2,5 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; -[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Localization/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Localization/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b2437d9ad6 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Localization/Properties/AssemblyInfo.cs @@ -0,0 +1,8 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; +using System.Resources; + +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/AssemblyInfo.cs index b85e75b597..14f4b47575 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/AssemblyInfo.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Razor.Host.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Razor/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Razor/Properties/AssemblyInfo.cs index 8797b96848..c054249048 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Properties/AssemblyInfo.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Razor.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/Properties/AssemblyInfo.cs index e78aff3705..ab7e56ef71 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/Properties/AssemblyInfo.cs @@ -2,8 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.TagHelpers.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs index 64e4af4593..e750d9279f 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.ViewFeatures.Test")] @@ -10,3 +11,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Formatters.Xml.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs index 025a94598c..b2437d9ad6 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs @@ -2,5 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; -[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs index 1fd2520817..7d10a32f57 100644 --- a/src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc/Properties/AssemblyInfo.cs @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; [assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Test")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Test")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/Properties/AssemblyInfo.cs index 025a94598c..b2437d9ad6 100644 --- a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/Properties/AssemblyInfo.cs @@ -2,5 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; +using System.Resources; -[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json index a824b56111..ea7a04b6fb 100644 --- a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json +++ b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json @@ -12,7 +12,8 @@ "dnx451": { }, "dnxcore50": { "dependencies": { - "System.IO": "4.0.11-beta-*" + "System.IO": "4.0.11-beta-*", + "System.Resources.ResourceManager": "4.0.1-beta-*" } } }