From b1ff6d32d37aad9f4a8723544db59bdffece97bc Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 27 Jan 2014 21:30:53 -0800 Subject: [PATCH] Fixed up resources. --- .../Common/CommonResources.Designer.cs | 9 ++++++--- .../Resources/RazorResources.Designer.cs | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNet.Razor/Common/CommonResources.Designer.cs b/src/Microsoft.AspNet.Razor/Common/CommonResources.Designer.cs index 4845a60641..04998663a9 100644 --- a/src/Microsoft.AspNet.Razor/Common/CommonResources.Designer.cs +++ b/src/Microsoft.AspNet.Razor/Common/CommonResources.Designer.cs @@ -11,7 +11,7 @@ namespace Microsoft.Internal.Web.Utils { using System; - + using System.Reflection; /// /// A strongly-typed resource class, for looking up localized strings, etc. @@ -43,12 +43,15 @@ namespace Microsoft.Internal.Web.Utils { get { + if (object.ReferenceEquals(resourceMan, null)) + { #if NET45 - if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.Common.CommonResources", typeof(CommonResources).Assembly); +#else + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.Common.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly); +#endif resourceMan = temp; } -#endif return resourceMan; } } diff --git a/src/Microsoft.AspNet.Razor/Resources/RazorResources.Designer.cs b/src/Microsoft.AspNet.Razor/Resources/RazorResources.Designer.cs index 915daca451..7fe7378d04 100644 --- a/src/Microsoft.AspNet.Razor/Resources/RazorResources.Designer.cs +++ b/src/Microsoft.AspNet.Razor/Resources/RazorResources.Designer.cs @@ -11,6 +11,7 @@ namespace Microsoft.AspNet.Razor.Resources { using System; + using System.Reflection; /// @@ -47,8 +48,10 @@ namespace Microsoft.AspNet.Razor.Resources { #if NET45 global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.Resources.RazorResources", typeof(RazorResources).Assembly); - resourceMan = temp; +#else + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.Resources.RazorResources", typeof(RazorResources).GetTypeInfo().Assembly); #endif + resourceMan = temp; } return resourceMan; }