Remove the ProcessorArchitecture portion from the full name as it's obsolete (PowerShell#18320)

Author: daxian-dbw

src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs

@@ -865,7 +865,7 @@ internal static Version ReadVersionValue(RegistryKey mshsnapinKey, string name,
             return v;
         }
 
-        internal static void ReadRegistryInfo(out Version assemblyVersion, out string publicKeyToken, out string culture, out string architecture, out string applicationBase, out Version psVersion)
+        internal static void ReadRegistryInfo(out Version assemblyVersion, out string publicKeyToken, out string culture, out string applicationBase, out Version psVersion)
         {
             applicationBase = Utils.DefaultPowerShellAppBase;
             Dbg.Assert(
@@ -885,8 +885,7 @@ internal static void ReadRegistryInfo(out Version assemblyVersion, out string pu
             // culture, publickeytoken...This will break the scenarios where only one of
             // the assemblies is patched. ie., all monad assemblies should have the
             // same version number.
-            Assembly currentAssembly = typeof(PSSnapInReader).Assembly;
-            AssemblyName assemblyName = currentAssembly.GetName();
+            AssemblyName assemblyName = typeof(PSSnapInReader).Assembly.GetName();
             assemblyVersion = assemblyName.Version;
             byte[] publicTokens = assemblyName.GetPublicKeyToken();
             if (publicTokens.Length == 0)
@@ -899,11 +898,6 @@ internal static void ReadRegistryInfo(out Version assemblyVersion, out string pu
             // save some cpu cycles by hardcoding the culture to neutral
             // assembly should never be targeted to a particular culture
             culture = "neutral";
-
-            // Hardcoding the architecture MSIL as PowerShell assemblies are architecture neutral, this should
-            // be changed if the assumption is broken. Preferred hardcoded string to using (for perf reasons):
-            // string architecture = currentAssembly.GetName().ProcessorArchitecture.ToString()
-            architecture = "MSIL";
         }
 
         /// <summary>
@@ -931,13 +925,12 @@ internal static string ConvertByteArrayToString(byte[] tokens)
         /// </returns>
         internal static PSSnapInInfo ReadCoreEngineSnapIn()
         {
-            Version assemblyVersion, psVersion;
-            string publicKeyToken = null;
-            string culture = null;
-            string architecture = null;
-            string applicationBase = null;
-
-            ReadRegistryInfo(out assemblyVersion, out publicKeyToken, out culture, out architecture, out applicationBase, out psVersion);
+            ReadRegistryInfo(
+                out Version assemblyVersion,
+                out string publicKeyToken,
+                out string culture,
+                out string applicationBase,
+                out Version psVersion);
 
             // System.Management.Automation formats & types files
             Collection<string> types = new Collection<string>(new string[] { "types.ps1xml", "typesv3.ps1xml" });
@@ -946,8 +939,8 @@ internal static PSSnapInInfo ReadCoreEngineSnapIn()
                          "Help.format.ps1xml", "HelpV3.format.ps1xml", "PowerShellCore.format.ps1xml", "PowerShellTrace.format.ps1xml",
                          "Registry.format.ps1xml"});
 
-            string strongName = string.Format(CultureInfo.InvariantCulture, "{0}, Version={1}, Culture={2}, PublicKeyToken={3}, ProcessorArchitecture={4}",
-                s_coreSnapin.AssemblyName, assemblyVersion, culture, publicKeyToken, architecture);
+            string strongName = string.Format(CultureInfo.InvariantCulture, "{0}, Version={1}, Culture={2}, PublicKeyToken={3}",
+                s_coreSnapin.AssemblyName, assemblyVersion, culture, publicKeyToken);
 
             string moduleName = Path.Combine(applicationBase, s_coreSnapin.AssemblyName + ".dll");
 
@@ -985,13 +978,12 @@ internal static PSSnapInInfo ReadCoreEngineSnapIn()
         /// </returns>
         internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()
         {
-            Version assemblyVersion, psVersion;
-            string publicKeyToken = null;
-            string culture = null;
-            string architecture = null;
-            string applicationBase = null;
-
-            ReadRegistryInfo(out assemblyVersion, out publicKeyToken, out culture, out architecture, out applicationBase, out psVersion);
+            ReadRegistryInfo(
+                out Version assemblyVersion,
+                out string publicKeyToken,
+                out string culture,
+                out string applicationBase,
+                out Version psVersion);
 
             // System.Management.Automation formats & types files
             Collection<string> smaFormats = new Collection<string>(new string[]
@@ -1010,12 +1002,11 @@ internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()
 
                 string strongName = string.Format(
                     CultureInfo.InvariantCulture,
-                    "{0}, Version={1}, Culture={2}, PublicKeyToken={3}, ProcessorArchitecture={4}",
+                    "{0}, Version={1}, Culture={2}, PublicKeyToken={3}",
                     defaultMshSnapinInfo.AssemblyName,
                     assemblyVersionString,
                     culture,
-                    publicKeyToken,
-                    architecture);
+                    publicKeyToken);
 
                 Collection<string> formats = null;
                 Collection<string> types = null;

test/xUnit/csharp/test_MshSnapinInfo.cs

@@ -17,7 +17,7 @@ public void TestReadRegistryInfo()
             Skip.IfNot(Platform.IsWindows);
             Version someVersion = null;
             string someString = null;
-            PSSnapInReader.ReadRegistryInfo(out someVersion, out someString, out someString, out someString, out someString, out someVersion);
+            PSSnapInReader.ReadRegistryInfo(out someVersion, out someString, out someString, out someString, out someVersion);
         }
 
         // PublicKeyToken is null on Linux