admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ResourceManager instantiation in WsManHelper.cs

Browse Source
This commit is contained in:
Sergei Vorobev
2016-07-14 13:46:29 -07:00
parent 2afedf3eea
commit eb0d6905ab
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.WSMan.Management/WsManHelper.cs
+3 -8
View File
@@ -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,