Fix ResourceManager instantiation in WsManHelper.cs

Sergei Vorobev · Sergei Vorobev · commit eb0d6905ab6a · 2016-07-14T13:46:29.000-07:00
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -87,7 +87,7 @@ internal class WSManHelper
         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 @@ internal static void ReleaseSessions()
 
         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 @@ internal static void ThrowIfNotAdministrator()
         
         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,

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ internal class WSManHelper`
`87`	`87`	`private FileStream _fs;`
`88`	`88`	`private StreamReader _sr;`
`89`	`89`
`90`		`- private static ResourceManager g_resourceMgr = new ResourceManager("WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly);`
	`90`	`+ private static ResourceManager g_resourceMgr = new ResourceManager("Microsoft.WSMan.Management.resources.WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly);`
`91`	`91`
`92`	`92`
`93`	`93`	`//`
`@@ -135,20 +135,16 @@ internal static void ReleaseSessions()`
`135`	`135`
`136`	`136`	`internal WSManHelper()`
`137`	`137`	`{`
`138`		`-`
`139`		`- _resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly);`
`140`	`138`	`}`
`141`	`139`
`142`	`140`	`internal WSManHelper(PSCmdlet cmdlet)`
`143`	`141`	`{`
`144`	`142`	`cmdletname = cmdlet;`
`145`		`- _resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly);`
`146`	`143`	`}`
`147`	`144`
`148`	`145`	`internal WSManHelper(NavigationCmdletProvider provider)`
`149`	`146`	`{`
`150`	`147`	`_provider = provider;`
`151`		`- _resourceMgr = new ResourceManager("WsManResources", this.GetType().GetTypeInfo().Assembly);`
`152`	`148`	`}`
`153`	`149`
`154`	`150`	`internal static void ThrowIfNotAdministrator()`
`@@ -164,14 +160,13 @@ internal static void ThrowIfNotAdministrator()`
`164`	`160`
`165`	`161`	`internal string GetResourceMsgFromResourcetext(string rscname)`
`166`	`162`	`{`
`167`		`- return _resourceMgr.GetString(rscname);`
	`163`	`+ return g_resourceMgr.GetString(rscname);`
`168`	`164`	`}`
`169`	`165`
`170`	`166`	`static internal string FormatResourceMsgFromResourcetextS(string rscname,`
`171`	`167`	`params object[] args)`
`172`	`168`	`{`
`173`		`- ResourceManager resourceManager = new ResourceManager("WsManResources", typeof(WSManHelper).GetTypeInfo().Assembly);`
`174`		`- return FormatResourceMsgFromResourcetextS(resourceManager, rscname, args);`
	`169`	`+ return FormatResourceMsgFromResourcetextS(g_resourceMgr, rscname, args);`
`175`	`170`	`}`
`176`	`171`
`177`	`172`	`internal string FormatResourceMsgFromResourcetext(string resourceName,`