Re-enable assembly name comparison

andyleejordan · andyleejordan · commit 9ba6ba359dd1 · 2016-07-26T11:54:08.000-07:00
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -5698,11 +5698,7 @@ internal static Assembly LoadPSSnapInAssembly(PSSnapInInfo psSnapInInfo,
             {
                 AssemblyName assemblyName = ClrFacade.GetAssemblyName(psSnapInInfo.AbsoluteModulePath);
 
-                // Porting note: the snapins still require 'ProcessorArchitecture=MSIL' in
-                // the strong name, which is not in the strong name of assemblies created
-                // by dotnet-cli
-                if (!Platform.IsCore &&
-                    !string.Equals(assemblyName.FullName, psSnapInInfo.AssemblyName, StringComparison.OrdinalIgnoreCase))
+                if (!string.Equals(assemblyName.FullName, psSnapInInfo.AssemblyName, StringComparison.OrdinalIgnoreCase))
                 {
                     string message = StringUtil.Format(ConsoleInfoErrorStrings.PSSnapInAssemblyNameMismatch, psSnapInInfo.AbsoluteModulePath, psSnapInInfo.AssemblyName);
                     _PSSnapInTracer.TraceError(message);

Original file line number	Diff line number	Diff line change
`@@ -5698,11 +5698,7 @@ internal static Assembly LoadPSSnapInAssembly(PSSnapInInfo psSnapInInfo,`
`5698`	`5698`	`{`
`5699`	`5699`	`AssemblyName assemblyName = ClrFacade.GetAssemblyName(psSnapInInfo.AbsoluteModulePath);`
`5700`	`5700`
`5701`		`- // Porting note: the snapins still require 'ProcessorArchitecture=MSIL' in`
`5702`		`- // the strong name, which is not in the strong name of assemblies created`
`5703`		`- // by dotnet-cli`
`5704`		`- if (!Platform.IsCore &&`
`5705`		`- !string.Equals(assemblyName.FullName, psSnapInInfo.AssemblyName, StringComparison.OrdinalIgnoreCase))`
	`5701`	`+ if (!string.Equals(assemblyName.FullName, psSnapInInfo.AssemblyName, StringComparison.OrdinalIgnoreCase))`
`5706`	`5702`	`{`
`5707`	`5703`	`string message = StringUtil.Format(ConsoleInfoErrorStrings.PSSnapInAssemblyNameMismatch, psSnapInInfo.AbsoluteModulePath, psSnapInInfo.AssemblyName);`
`5708`	`5704`	`_PSSnapInTracer.TraceError(message);`