Updated standalone x64 and x86 disassemblers to ClrMD v3.

Author: timcassell

src/BenchmarkDotNet.Disassembler.x64/BenchmarkDotNet.Disassembler.x64.csproj

@@ -7,15 +7,46 @@
     <AssemblyName>BenchmarkDotNet.Disassembler.x64</AssemblyName>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
     <PlatformTarget>x64</PlatformTarget>
-    <SuppressNETCoreSdkPreviewMessage>True</SuppressNETCoreSdkPreviewMessage>
-    <DefineConstants>$(DefineConstants);CLRMDV1</DefineConstants>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <OutputPath>..\BenchmarkDotNet\Disassemblers</OutputPath>
     <RootNamespace>BenchmarkDotNet.Disassembler</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- Necessary components for disassembly. -->
+    <Compile Include="..\BenchmarkDotNet\Disassemblers\DataContracts.cs" />
+    <Compile Include="..\BenchmarkDotNet\Disassemblers\ClrMdV3Disassembler.cs" />
+    <Compile Include="..\BenchmarkDotNet\Disassemblers\SourceCodeProvider.cs" />
+    <Compile Include="..\BenchmarkDotNet\Disassemblers\IntelDisassembler.cs" />
+    <Compile Include="..\BenchmarkDotNet\Disassemblers\DisassemblySyntax.cs" />
+    
+    <!-- Dependencies. -->
+    <Compile Include="..\BenchmarkDotNet\Detectors\OsDetector.cs" />
+    <Compile Include="..\BenchmarkDotNet\Portability\RuntimeInformationShared.cs" />
+    <Compile Include="..\BenchmarkDotNet\Portability\StringExtensions.cs" />
+    <Compile Include="..\BenchmarkDotNet\Environments\Platform.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\HashCode.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\ExternalToolsHelper.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\LinuxOsReleaseHelper.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\ProcessHelper.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\SectionsHelper.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\ConsoleExitHandler.cs" />
+    <Compile Include="..\BenchmarkDotNet\Helpers\CodeAnnotations.cs" />
+    <Compile Include="..\BenchmarkDotNet\Loggers\ILogger.cs" />
+    <Compile Include="..\BenchmarkDotNet\Loggers\LogKind.cs" />
+    <Compile Include="..\BenchmarkDotNet\Loggers\NullLogger.cs" />
+    <Compile Include="..\BenchmarkDotNet\Loggers\AsyncProcessOutputReader.cs" />
+    <Compile Include="..\BenchmarkDotNet\Loggers\LoggerExtensions.cs" />
+    <Compile Include="..\BenchmarkDotNet\Extensions\CommonExtensionsShared.cs" />
+    <Compile Include="..\BenchmarkDotNet\Extensions\ProcessExtensionsShared.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Iced" Version="1.21.0" />
-    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="[1.1.142101]" />
+    <PackageReference Include="Gee.External.Capstone" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.21" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
+    <PackageReference Include="Perfolizer" Version="0.5.3" />
   </ItemGroup>
 </Project>

src/BenchmarkDotNet.Disassembler.x64/ClrMdV1Disassembler.cs

@@ -24,7 +24,8 @@ public static void Main(string[] args)
 
             try
             {
-                var methodsToExport = ClrMdV1Disassembler.AttachAndDisassemble(options);
+                // Update this to match SameArchitectureDisassembler if this standalone disassembler ever needs to support Arm or other architectures.
+                var methodsToExport = new IntelDisassembler().AttachAndDisassemble(options);
 
                 SaveToFile(methodsToExport, options.ResultsPath);
             }