Use a platform-neutral name for Microsoft.DiaSymReader.Native (#125165)

Fixes issues that we're running into when rebootstrapping the
dotnet/dotnet build
(dotnet/dotnet#5155 (comment)).

`Microsoft.DiaSymReader.Native.(x86|x64|arm64).dll` clashes with the
same name DLL in the runtime pack. Not having a suffix is simpler in the
end.

Author: MichalStrehovsky

src/coreclr/scripts/superpmi_collect_setup.py

@@ -162,6 +162,7 @@
     "KernelTraceControl.Win61.dll",
     "llvm-mca.exe",
     "mcs.exe",
+    "Microsoft.DiaSymReader.Native.dll",
     "Microsoft.DiaSymReader.Native.amd64.dll",
     "Microsoft.DiaSymReader.Native.x86.dll",
     "mscordaccore.dll",

src/coreclr/tools/aot/ILCompiler.Diagnostics/PdbWriter.cs

@@ -92,26 +92,6 @@ public partial class PdbWriter
         UIntPtr _pdbMod;
         ISymNGenWriter2 _ngenWriter;
 
-        static PdbWriter()
-        {
-            NativeLibrary.SetDllImportResolver(typeof(PdbWriter).Assembly, DllImportResolver);
-        }
-
-        private static IntPtr DllImportResolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
-        {
-            IntPtr libraryHandle = IntPtr.Zero;
-            if (libraryName == DiaSymReaderLibrary)
-            {
-                string archSuffix = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();
-                if (archSuffix == "x64")
-                {
-                    archSuffix = "amd64";
-                }
-                libraryHandle = NativeLibrary.Load(DiaSymReaderLibrary + "." + archSuffix + ".dll", assembly, searchPath);
-            }
-            return libraryHandle;
-        }
-
         [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory | DllImportSearchPath.SafeDirectories)]
         [LibraryImport(DiaSymReaderLibrary, StringMarshalling = StringMarshalling.Utf16)]
         private static partial void CreateNGenPdbWriter(

src/coreclr/tools/aot/crossgen2/crossgen2.props

@@ -89,15 +89,16 @@
     <DiaSymReaderTargetArchFileName>Microsoft.DiaSymReader.Native.$(DiaSymReaderTargetArch).dll</DiaSymReaderTargetArchFileName>
     <DiaSymReaderTargetArchPath Condition="'$(PkgMicrosoft_DiaSymReader_Native)' != ''">$(PkgMicrosoft_DiaSymReader_Native)\runtimes\win\native\$(DiaSymReaderTargetArchFileName)</DiaSymReaderTargetArchPath>
     <!-- When publishing we won't have the NuGet packages, so use the copy from the build artifacts directory. -->
-    <DiaSymReaderTargetArchPath Condition="'$(PkgMicrosoft_DiaSymReader_Native)' == ''">$(CoreCLRArtifactsPath)crossgen2/$(DiaSymReaderTargetArchFileName)</DiaSymReaderTargetArchPath>
+    <DiaSymReaderTargetArchPath Condition="'$(PkgMicrosoft_DiaSymReader_Native)' == ''">$(CoreCLRArtifactsPath)crossgen2/Microsoft.DiaSymReader.Native.dll</DiaSymReaderTargetArchPath>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
     <Content Include="$(DiaSymReaderTargetArchPath)"
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="PreserveNewest"
       ExcludeFromSingleFile="$(PublishSingleFile)"
-      Link="%(FileName)%(Extension)"
+      Link="Microsoft.DiaSymReader.Native.dll"
+      TargetPath="Microsoft.DiaSymReader.Native.dll"
       />
   </ItemGroup>
 </Project>

src/coreclr/tools/r2rdump/Program.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Reflection.Metadata.Ecma335;
 using System.Reflection.PortableExecutable;
+using System.Runtime.InteropServices;
 using System.Text;
 using ILCompiler.Diagnostics;
 using ILCompiler.Reflection.ReadyToRun;
@@ -395,6 +396,22 @@ public RuntimeFunction FindRuntimeFunction(ReadyToRunReader r2r, int rtfQuery)
 
         public int Run()
         {
+            NativeLibrary.SetDllImportResolver(typeof(PdbWriter).Assembly,
+                (string libraryName, System.Reflection.Assembly assembly, DllImportSearchPath? searchPath) =>
+                {
+                    IntPtr libraryHandle = IntPtr.Zero;
+                    if (libraryName == "Microsoft.DiaSymReader.Native")
+                    {
+                        string archSuffix = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();
+                        if (archSuffix == "x64")
+                        {
+                            archSuffix = "amd64";
+                        }
+                        libraryHandle = NativeLibrary.Load(libraryName + "." + archSuffix + ".dll", assembly, searchPath);
+                    }
+                    return libraryHandle;
+                });
+
             Disassembler disassembler = null;
             List<string> inputs = Get(_command.In);
             bool inlineSignatureBinary = Get(_command.InlineSignatureBinary);