Use clrmd nuget package, closes #1013

WalkerGamat · Feb 13, 2019 · 62fdce5 · 62fdce5
1 parent 29a354d
commit 62fdce5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "Extensions/dnSpy.Debugger/netcorefiles"]
 	path = Extensions/dnSpy.Debugger/netcorefiles
 	url = https://github.com/0xd4d/netcorefiles.git
-[submodule "Extensions/dnSpy.Debugger/clrmd"]
-	path = Extensions/dnSpy.Debugger/clrmd
-	url = https://github.com/0xd4d/clrmd.git
 [submodule "dnSpy/Roslyn/Roslyn.ExpressionCompiler"]
 	path = dnSpy/Roslyn/Roslyn.ExpressionCompiler
 	url = https://github.com/0xd4d/Roslyn.ExpressionCompiler.git

diff --git a/DnSpyCommon.props b/DnSpyCommon.props
@@ -22,10 +22,11 @@
     <DnSpyAssemblyCopyright>Copyright (C) 2014-2019 [email protected]</DnSpyAssemblyCopyright>
 
     <!-- Update app.config whenever some of these versions change (eg. dnlib version) -->
-    <DnlibVersion>3.1.0</DnlibVersion>
     <DiaSymReaderVersion>1.7.0</DiaSymReaderVersion>
+    <DnlibVersion>3.1.0</DnlibVersion>
     <IcedVersion>1.1.1</IcedVersion>
     <MSBuildNuGetVersion>15.9.20</MSBuildNuGetVersion>
+    <MSDiagRuntimeVersion>1.0.3</MSDiagRuntimeVersion>
     <MSRegistryVersion>4.5.0</MSRegistryVersion>
     <MSVSCompositionNetFxAttributesVersion>15.8.117</MSVSCompositionNetFxAttributesVersion>
     <MSVSCompositionVersion>15.8.117</MSVSCompositionVersion>

diff --git a/Extensions/dnSpy.Debugger/clrmd b/Extensions/dnSpy.Debugger/clrmd
diff --git a/...sions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dnSpy.Debugger.DotNet.CorDebug.csproj b/...sions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dnSpy.Debugger.DotNet.CorDebug.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\DnSpyCommon.props" />
 
@@ -41,7 +41,6 @@
     <ProjectReference Include="..\..\..\dnSpy\dnSpy.Contracts.Debugger\dnSpy.Contracts.Debugger.csproj" />
     <ProjectReference Include="..\..\..\dnSpy\dnSpy.Contracts.DnSpy\dnSpy.Contracts.DnSpy.csproj" />
     <ProjectReference Include="..\..\..\dnSpy\dnSpy.Contracts.Logic\dnSpy.Contracts.Logic.csproj" />
-    <ProjectReference Include="..\clrmd\src\Microsoft.Diagnostics.Runtime\Microsoft.Diagnostics.Runtime.csproj" />
     <ProjectReference Include="..\dnSpy.Debugger.DotNet.Metadata\dnSpy.Debugger.DotNet.Metadata.csproj" />
   </ItemGroup>
 
@@ -71,6 +70,7 @@
 
   <ItemGroup>
     <PackageReference Include="Iced" Version="$(IcedVersion)" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="$(MSDiagRuntimeVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MSVSTextVersion)" />
   </ItemGroup>
 

diff --git a/dnSpy.sln b/dnSpy.sln
@@ -73,8 +73,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dnSpy.Contracts.Debugger",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dnSpy.Contracts.Debugger.DotNet.CorDebug", "dnSpy\dnSpy.Contracts.Debugger.DotNet.CorDebug\dnSpy.Contracts.Debugger.DotNet.CorDebug.csproj", "{A6D1AA27-ABDD-4832-B4D0-94E4B175C98F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Runtime", "Extensions\dnSpy.Debugger\clrmd\src\Microsoft.Diagnostics.Runtime\Microsoft.Diagnostics.Runtime.csproj", "{A82126CA-23AA-41F1-8586-A5938D44D0A7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dnSpy.Debugger.DotNet", "Extensions\dnSpy.Debugger\dnSpy.Debugger.DotNet\dnSpy.Debugger.DotNet.csproj", "{8EA4B210-37BE-478F-AB0E-8C8C3E016114}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dnSpy.Contracts.Debugger.DotNet", "dnSpy\dnSpy.Contracts.Debugger.DotNet\dnSpy.Contracts.Debugger.DotNet.csproj", "{2376E072-101F-4900-8770-79C6DFFBD0FB}"
@@ -471,18 +469,6 @@ Global
 		{A6D1AA27-ABDD-4832-B4D0-94E4B175C98F}.Release|x64.Build.0 = Release|Any CPU
 		{A6D1AA27-ABDD-4832-B4D0-94E4B175C98F}.Release|x86.ActiveCfg = Release|Any CPU
 		{A6D1AA27-ABDD-4832-B4D0-94E4B175C98F}.Release|x86.Build.0 = Release|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Debug|x64.Build.0 = Debug|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Release|x64.ActiveCfg = Release|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Release|x64.Build.0 = Release|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7}.Release|x86.Build.0 = Release|Any CPU
 		{8EA4B210-37BE-478F-AB0E-8C8C3E016114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EA4B210-37BE-478F-AB0E-8C8C3E016114}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8EA4B210-37BE-478F-AB0E-8C8C3E016114}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -688,7 +674,6 @@ Global
 		{AD6EE4B9-7EE6-4FF0-869E-32DADCAA1E4A} = {29E1907A-9C87-4F6E-961C-1C45273EFAFA}
 		{C92217E8-A68E-4F8D-9B98-D7328E89DAF1} = {293F0A13-6653-4580-9116-1D255F4C4E69}
 		{A6D1AA27-ABDD-4832-B4D0-94E4B175C98F} = {293F0A13-6653-4580-9116-1D255F4C4E69}
-		{A82126CA-23AA-41F1-8586-A5938D44D0A7} = {29E1907A-9C87-4F6E-961C-1C45273EFAFA}
 		{8EA4B210-37BE-478F-AB0E-8C8C3E016114} = {29E1907A-9C87-4F6E-961C-1C45273EFAFA}
 		{2376E072-101F-4900-8770-79C6DFFBD0FB} = {293F0A13-6653-4580-9116-1D255F4C4E69}
 		{379DB01F-CA3E-4E34-85F1-586EB20583E0} = {293F0A13-6653-4580-9116-1D255F4C4E69}