Fix ResourceManager instantiation in WsManHelper.cs

This commit is contained in:
Sergei Vorobev committed 2016-07-14 13:46:29 -07:00
1 parent 2afedf3eea
commit eb0d6905ab
1 file changed
+3 -8
@@ -87,7 +87,7 @@ namespace Microsoft.WSMan.Management
private FileStream _fs; private FileStream _fs;
private StreamReader _sr; 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() internal WSManHelper()
{ {
_resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly);
} }
internal WSManHelper(PSCmdlet cmdlet) internal WSManHelper(PSCmdlet cmdlet)
{ {
cmdletname = cmdlet; cmdletname = cmdlet;
_resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly);
} }
internal WSManHelper(NavigationCmdletProvider provider) internal WSManHelper(NavigationCmdletProvider provider)
{ {
_provider = provider; _provider = provider;
_resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly);
} }
internal static void ThrowIfNotAdministrator() internal static void ThrowIfNotAdministrator()
@@ -164,14 +160,13 @@ namespace Microsoft.WSMan.Management
internal string GetResourceMsgFromResourcetext(string rscname) internal string GetResourceMsgFromResourcetext(string rscname)
{ {
return _resourceMgr.GetString(rscname); return g_resourceMgr.GetString(rscname);
} }
static internal string FormatResourceMsgFromResourcetextS(string rscname, static internal string FormatResourceMsgFromResourcetextS(string rscname,
params object[] args) params object[] args)
{ {
ResourceManager resourceManager = new ResourceManager("WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly); return FormatResourceMsgFromResourcetextS(g_resourceMgr, rscname, args);
return FormatResourceMsgFromResourcetextS(resourceManager, rscname, args);
} }
internal string FormatResourceMsgFromResourcetext(string resourceName, internal string FormatResourceMsgFromResourcetext(string resourceName,