From eb0d6905ab6a7b9c0dc461c8d49457b455140e26 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Wed, 13 Jul 2016 19:55:18 -0700 Subject: [PATCH] Fix ResourceManager instantiation in WsManHelper.cs --- src/Microsoft.WSMan.Management/WsManHelper.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs index 53296c141d..5de81324ba 100644 --- a/src/Microsoft.WSMan.Management/WsManHelper.cs +++ b/src/Microsoft.WSMan.Management/WsManHelper.cs @@ -87,7 +87,7 @@ namespace Microsoft.WSMan.Management private FileStream _fs; private StreamReader _sr; - private static ResourceManager g_resourceMgr = new ResourceManager("WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly); + private static ResourceManager g_resourceMgr = new ResourceManager("Microsoft.WSMan.Management.resources.WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly); // @@ -135,20 +135,16 @@ namespace Microsoft.WSMan.Management internal WSManHelper() { - - _resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly); } internal WSManHelper(PSCmdlet cmdlet) { cmdletname = cmdlet; - _resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly); } internal WSManHelper(NavigationCmdletProvider provider) { _provider = provider; - _resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly); } internal static void ThrowIfNotAdministrator() @@ -164,14 +160,13 @@ namespace Microsoft.WSMan.Management internal string GetResourceMsgFromResourcetext(string rscname) { - return _resourceMgr.GetString(rscname); + return g_resourceMgr.GetString(rscname); } static internal string FormatResourceMsgFromResourcetextS(string rscname, params object[] args) { - ResourceManager resourceManager = new ResourceManager("WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly); - return FormatResourceMsgFromResourcetextS(resourceManager, rscname, args); + return FormatResourceMsgFromResourcetextS(g_resourceMgr, rscname, args); } internal string FormatResourceMsgFromResourcetext(string resourceName,