Delete non-shared version and switch over to shared version.

Author: Atsushi Kanamori

src/mscorlib/System.Private.CoreLib.csproj

@@ -455,10 +455,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\TypeToken.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\XXXOnTypeBuilderInstantiation.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(BclSourcesRoot)\System\Reflection\Runtime\Assemblies\AssemblyNameHelpers.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Reflection\Runtime\Assemblies\AssemblyNameLexer.cs" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Metadata\AssemblyExtensions.cs" />
   </ItemGroup>

src/mscorlib/src/System/Reflection/AssemblyName.cs

@@ -19,7 +19,6 @@ namespace System.Reflection
     using System;
     using System.IO;
     using System.Configuration.Assemblies;
-    using System.Reflection.Runtime.Assemblies;
     using System.Runtime.CompilerServices;
     using CultureInfo = System.Globalization.CultureInfo;
     using System.Runtime.Serialization;
@@ -282,7 +281,9 @@ public String FullName
             {
                 if (this.Name == null)
                     return string.Empty;
-                return AssemblyNameHelpers.ComputeDisplayName(this);
+                // Do not call GetPublicKeyToken() here - that latches the result into AssemblyName which isn't a side effect we want.
+                byte[] pkt = _PublicKeyToken ?? nGetPublicKeyToken();
+                return AssemblyNameFormatter.ComputeDisplayName(Name, Version, CultureName, pkt, Flags, ContentType);
             }
         }