Skip to content

Commit

Permalink
修复编译错误
Browse files Browse the repository at this point in the history
修复搜索符合文件导致卡死
更新子模块
  • Loading branch information
wwh1004 committed Dec 14, 2019
1 parent 4ef383b commit cef0c72
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 23 deletions.
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,5 @@ csharp_space_between_square_brackets = false
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true

# IDE0063: Use simple 'using' statement
csharp_prefer_simple_using_statement = true:none
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "Libraries/clrmd"]
path = Libraries/clrmd
url = https://github.com/Microsoft/clrmd.git
[submodule "Libraries/NativeSharp"]
path = Libraries/NativeSharp
url = https://github.com/wwh1004/NativeSharp.git
[submodule "Libraries/dnlib"]
path = Libraries/dnlib
url = https://github.com/0xd4d/dnlib.git
Expand Down
4 changes: 0 additions & 4 deletions ExtremeDumper.AntiAntiDump/ExtremeDumper.AntiAntiDump.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@
<Project>{aed69d77-8c7b-41ba-9967-ac9b522430f9}</Project>
<Name>MetadataLocator</Name>
</ProjectReference>
<ProjectReference Include="..\Libraries\NativeSharp\NativeSharp\NativeSharp.csproj">
<Project>{2cd47f09-b324-4b20-8c8b-38fc4a037e37}</Project>
<Name>NativeSharp</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
7 changes: 0 additions & 7 deletions ExtremeDumper.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtremeDumper", "ExtremeDum
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Runtime.v2", "Libraries\clrmd\src\Microsoft.Diagnostics.Runtime\v2\Microsoft.Diagnostics.Runtime.v2.csproj", "{935D33C5-62F1-40FE-8DB0-46B6E01342FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeSharp", "Libraries\NativeSharp\NativeSharp\NativeSharp.csproj", "{2CD47F09-B324-4B20-8C8B-38FC4A037E37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtremeDumper.AntiAntiDump", "ExtremeDumper.AntiAntiDump\ExtremeDumper.AntiAntiDump.csproj", "{DFFAB16F-40BE-46B2-AA4A-0FD49C1CCCAA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dnlib", "Libraries\dnlib\src\dnlib.csproj", "{104CAC47-92E9-4634-A70E-17B3E697B1D1}"
Expand All @@ -33,10 +31,6 @@ Global
{935D33C5-62F1-40FE-8DB0-46B6E01342FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{935D33C5-62F1-40FE-8DB0-46B6E01342FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{935D33C5-62F1-40FE-8DB0-46B6E01342FB}.Release|Any CPU.Build.0 = Release|Any CPU
{2CD47F09-B324-4B20-8C8B-38FC4A037E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CD47F09-B324-4B20-8C8B-38FC4A037E37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CD47F09-B324-4B20-8C8B-38FC4A037E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2CD47F09-B324-4B20-8C8B-38FC4A037E37}.Release|Any CPU.Build.0 = Release|Any CPU
{DFFAB16F-40BE-46B2-AA4A-0FD49C1CCCAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DFFAB16F-40BE-46B2-AA4A-0FD49C1CCCAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DFFAB16F-40BE-46B2-AA4A-0FD49C1CCCAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -59,7 +53,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{935D33C5-62F1-40FE-8DB0-46B6E01342FB} = {B6C797F4-3545-48E4-AC52-6551B6CF4EEA}
{2CD47F09-B324-4B20-8C8B-38FC4A037E37} = {B6C797F4-3545-48E4-AC52-6551B6CF4EEA}
{104CAC47-92E9-4634-A70E-17B3E697B1D1} = {B6C797F4-3545-48E4-AC52-6551B6CF4EEA}
{AED69D77-8C7B-41BA-9967-AC9B522430F9} = {B6C797F4-3545-48E4-AC52-6551B6CF4EEA}
EndGlobalSection
Expand Down
9 changes: 5 additions & 4 deletions ExtremeDumper/ExtremeDumper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,11 @@
<Project>{AED69D77-8C7B-41BA-9967-AC9B522430F9}</Project>
<Name>MetadataLocator</Name>
</ProjectReference>
<ProjectReference Include="..\Libraries\NativeSharp\NativeSharp\NativeSharp.csproj">
<Project>{2cd47f09-b324-4b20-8c8b-38fc4a037e37}</Project>
<Name>NativeSharp</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NativeSharp-lib">
<Version>3.0.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
3 changes: 3 additions & 0 deletions ExtremeDumper/Program.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
using System;
using System.Windows.Forms;
using ExtremeDumper.Forms;
using Microsoft.Diagnostics.Runtime.Utilities;

namespace ExtremeDumper {
public static class Program {
[STAThread]
public static void Main() {
SymbolLocator._NT_SYMBOL_PATH = " ";
// 禁止在线搜索PDB文件
GlobalExceptionCatcher.Catch();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Expand Down
4 changes: 2 additions & 2 deletions ExtremeDumper/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
[assembly: AssemblyDescription(".NET Assemblies Dumper")]
[assembly: AssemblyProduct("ExtremeDumper")]
[assembly: AssemblyCopyright("Copyright © 2018-2019 Wwh")]
[assembly: AssemblyVersion("2.9.3.4")]
[assembly: AssemblyFileVersion("2.9.3.4")]
[assembly: AssemblyVersion("2.9.3.5")]
[assembly: AssemblyFileVersion("2.9.3.5")]
1 change: 0 additions & 1 deletion Libraries/NativeSharp
Submodule NativeSharp deleted from ad7782

0 comments on commit cef0c72

Please sign in to comment.