Skip to content

Commit f9db2e7

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 016e4ab + 0f07f90 commit f9db2e7

File tree

305 files changed

+27468
-9816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+27468
-9816
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>Gee.External.Capstone</id>
5+
<title>Capstone.NET</title>
6+
<version>2.0.0</version>
7+
<authors>Ahmed Garhy (@9ee1)</authors>
8+
<owners>Ahmed Garhy (@9ee1)</owners>
9+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10+
<licenseUrl>https://github.com/9ee1/Capstone.NET/blob/master/LICENSE</licenseUrl>
11+
<projectUrl>https://github.com/9ee1/Capstone.NET</projectUrl>
12+
<description>Capstone.NET is an opinionated .NET Core and a .NET Framework binding for the Capstone disassembly framework. It is written in C#, supports Capstone 4, and has a friendly and simple type safe API that is ridiculously easy to learn and quick to pick up.</description>
13+
<releaseNotes>Capstone.NET 2.0+ IS NOT backwards-compatible with previous releases of Capstone.NET, specifically Capstone.NET 1.x. Please do not upgrade until you are prepared to put in the effort to refactor your existing applications and libraries. See https://github.com/9ee1/Capstone.NET/wiki/What's-New-in-Capstone.NET-2.x for more information.</releaseNotes>
14+
<copyright>Copyright (c) Ahmed Garhy</copyright>
15+
<repository url="https://github.com/9ee1/Capstone.NET" />
16+
<tags>capstone disassembler reverse-engineering security arm x86</tags>
17+
<dependencies>
18+
<group targetFramework=".NETFramework4.0" />
19+
<group targetFramework=".NETFramework4.5" />
20+
<group targetFramework=".NETStandard2.0" />
21+
</dependencies>
22+
</metadata>
23+
</package>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Content Condition="'$(Platform)' == 'AnyCPU'"
5+
Include="$(MSBuildThisFileDirectory)\capstone-x64.dll">
6+
<Link>x64\capstone.dll</Link>
7+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8+
<Visible>false</Visible>
9+
</Content>
10+
<Content Condition="'$(Platform)' == 'AnyCPU'"
11+
Include="$(MSBuildThisFileDirectory)\capstone-x86.dll">
12+
<Link>x86\capstone.dll</Link>
13+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
14+
<Visible>false</Visible>
15+
</Content>
16+
<Content Condition="'$(Platform)' == 'x64'"
17+
Include="$(MSBuildThisFileDirectory)\capstone-x64.dll">
18+
<Link>capstone.dll</Link>
19+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
20+
<Visible>false</Visible>
21+
</Content>
22+
<Content Condition="'$(Platform)' == 'x86'"
23+
Include="$(MSBuildThisFileDirectory)\capstone-x86.dll">
24+
<Link>capstone.dll</Link>
25+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
26+
<Visible>false</Visible>
27+
</Content>
28+
</ItemGroup>
29+
</Project>

.build/pack.bat

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
@ECHO OFF
2+
CALL rmdir /S /Q %~dp0\nuget
3+
CALL mkdir %~dp0\nuget
4+
CALL mkdir %~dp0\nuget\build
5+
CALL mkdir %~dp0\nuget\lib\net40
6+
CALL mkdir %~dp0\nuget\lib\net45
7+
CALL mkdir %~dp0\nuget\ref\netstandard2.0
8+
CALL mkdir %~dp0\nuget\runtimes\win-x64\native
9+
CALL mkdir %~dp0\nuget\runtimes\win-x64\lib\netstandard2.0
10+
CALL mkdir %~dp0\nuget\runtimes\win-x86\native
11+
CALL mkdir %~dp0\nuget\runtimes\win-x86\lib\netstandard2.0
12+
13+
CALL dotnet msbuild %~dp0\..\Capstone.NET.sln ^
14+
/property:Configuration="Release" ^
15+
/property:Platform="Any CPU" ^
16+
/property:AssemblyVersion=2.0.0.0 ^
17+
/property:Copyright="Copyright (c) Ahmed Garhy" ^
18+
/property:FileVersion=2.0.0.0 ^
19+
/property:InformationalVersion=2.0.0.0 ^
20+
/property:Product="Capstone.NET"
21+
22+
CALL dotnet msbuild %~dp0\..\Capstone.NET.sln ^
23+
/property:Configuration="Release" ^
24+
/property:Platform="x64" ^
25+
/property:AssemblyVersion=2.0.0.0 ^
26+
/property:Copyright="Copyright (c) Ahmed Garhy" ^
27+
/property:FileVersion=2.0.0.0 ^
28+
/property:InformationalVersion=2.0.0.0 ^
29+
/property:Product="Capstone.NET"
30+
31+
CALL dotnet msbuild %~dp0\..\Capstone.NET.sln ^
32+
/property:Configuration="Release" ^
33+
/property:Platform="x86" ^
34+
/property:AssemblyVersion=2.0.0.0 ^
35+
/property:Copyright="Copyright (c) Ahmed Garhy" ^
36+
/property:FileVersion=2.0.0.0 ^
37+
/property:InformationalVersion=2.0.0.0 ^
38+
/property:Product="Capstone.NET"
39+
40+
CALL copy /V /Y ^
41+
%~dp0\Gee.External.Capstone.targets ^
42+
%~dp0\nuget\build\Gee.External.Capstone.targets
43+
44+
CALL copy /V /Y ^
45+
%~dp0\..\.external\capstone-4.0.1\capstone-x64.dll ^
46+
%~dp0\nuget\build\capstone-x64.dll
47+
48+
CALL copy /V /Y ^
49+
%~dp0\..\.external\capstone-4.0.1\capstone-x86.dll ^
50+
%~dp0\nuget\build\capstone-x86.dll
51+
52+
CALL copy /V /Y ^
53+
%~dp0\..\Gee.External.Capstone\bin\Release\net40\Gee.External.Capstone.dll ^
54+
%~dp0\nuget\lib\net40\Gee.External.Capstone.dll
55+
56+
CALL copy /V /Y ^
57+
%~dp0\..\Gee.External.Capstone\Gee.External.Capstone.xml ^
58+
%~dp0\nuget\lib\net40\Gee.External.Capstone.xml
59+
60+
CALL copy /V /Y ^
61+
%~dp0\..\Gee.External.Capstone\bin\Release\net45\Gee.External.Capstone.dll ^
62+
%~dp0\nuget\lib\net45\Gee.External.Capstone.dll
63+
64+
CALL copy /V /Y ^
65+
%~dp0\..\Gee.External.Capstone\Gee.External.Capstone.xml ^
66+
%~dp0\nuget\lib\net45\Gee.External.Capstone.xml
67+
68+
CALL copy /V /Y ^
69+
%~dp0\..\Gee.External.Capstone\bin\Release\netstandard2.0\Gee.External.Capstone.dll ^
70+
%~dp0\nuget\ref\netstandard2.0\Gee.External.Capstone.dll
71+
72+
CALL copy /V /Y ^
73+
%~dp0\..\Gee.External.Capstone\Gee.External.Capstone.xml ^
74+
%~dp0\nuget\ref\netstandard2.0\Gee.External.Capstone.xml
75+
76+
CALL copy /V /Y ^
77+
%~dp0\..\Gee.External.Capstone\bin\x64\Release\netstandard2.0\Gee.External.Capstone.dll ^
78+
%~dp0\nuget\runtimes\win-x64\lib\netstandard2.0\Gee.External.Capstone.dll
79+
80+
CALL copy /V /Y ^
81+
%~dp0\..\.external\capstone-4.0.1\capstone-x64.dll ^
82+
%~dp0\nuget\runtimes\win-x64\native\capstone.dll
83+
84+
CALL copy /V /Y ^
85+
%~dp0\..\Gee.External.Capstone\bin\x86\Release\netstandard2.0\Gee.External.Capstone.dll ^
86+
%~dp0\nuget\runtimes\win-x86\lib\netstandard2.0\Gee.External.Capstone.dll
87+
88+
CALL copy /V /Y ^
89+
%~dp0\..\.external\capstone-4.0.1\capstone-x86.dll ^
90+
%~dp0\nuget\runtimes\win-x86\native\capstone.dll
91+
92+
CALL copy /V /Y ^
93+
%~dp0\Gee.External.Capstone.nuspec ^
94+
%~dp0\nuget\Gee.External.Capstone.nuspec
95+
96+
CALL cd %~dp0\nuget
97+
CALL nuget pack

.external/capstone-4.0.1/LICENSE

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
This is the software license for Capstone disassembly framework.
2+
Capstone has been designed & implemented by Nguyen Anh Quynh <[email protected]>
3+
4+
See http://www.capstone-engine.org for further information.
5+
6+
Copyright (c) 2013, COSEINC.
7+
All rights reserved.
8+
9+
Redistribution and use in source and binary forms, with or without
10+
modification, are permitted provided that the following conditions are met:
11+
12+
* Redistributions of source code must retain the above copyright notice,
13+
this list of conditions and the following disclaimer.
14+
* Redistributions in binary form must reproduce the above copyright notice,
15+
this list of conditions and the following disclaimer in the documentation
16+
and/or other materials provided with the distribution.
17+
* Neither the name of the developer(s) nor the names of its
18+
contributors may be used to endorse or promote products derived from this
19+
software without specific prior written permission.
20+
21+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31+
POSSIBILITY OF SUCH DAMAGE.
3.67 MB
Binary file not shown.
3.52 MB
Binary file not shown.

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

.gitignore

Lines changed: 124 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,124 @@
1-
/*.sln.DotSettings.user
2-
**/bin
3-
**/obj
4-
packages/
5-
/*.suo
6-
/.vs/Capstone.NET/v15/Server/sqlite3/db.lock
7-
/.vs/Capstone.NET/v15/Server/sqlite3/storage.ide
8-
/.vs/Capstone.NET/v15/Server/sqlite3/storage.ide-shm
9-
/.vs/Capstone.NET/v15/Server/sqlite3/storage.ide-wal
10-
/.vs/Capstone.NET/v15/.suo
1+
### Standard GIT Ignore File.
2+
###
3+
### ...
4+
5+
### Custom Build Files.
6+
###
7+
### ...
8+
.build/nuget
9+
10+
### Visual Studio User Specific Files.
11+
###
12+
### ...
13+
*.suo
14+
*.user
15+
*.userosscache
16+
*.sln.docstates
17+
18+
### Visual Studio Build Files.
19+
###
20+
### ...
21+
[Dd]ebug/
22+
[Dd]ebugPublic/
23+
[Rr]elease/
24+
[Rr]eleases/
25+
x64/
26+
x86/
27+
!Gee.External.Capstone/X86/
28+
bld/
29+
[Bb]in/
30+
[Oo]bj/
31+
[Ll]og/
32+
*_i.c
33+
*_p.c
34+
*_i.h
35+
*.ilk
36+
*.meta
37+
*.obj
38+
*.pch
39+
*.pdb
40+
*.pgc
41+
*.pgd
42+
*.rsp
43+
*.sbr
44+
*.tlb
45+
*.tli
46+
*.tlh
47+
*.tmp
48+
*.tmp_proj
49+
*.log
50+
*.vspscc
51+
*.vssscc
52+
.builds
53+
*.pidb
54+
*.svclog
55+
*.scc
56+
57+
### Visual Studio 2015+ Cache Directory.
58+
###
59+
### ...
60+
.vs/
61+
62+
### Visual Studio Profiler Files.
63+
###
64+
### ...
65+
*.psess
66+
*.vsp
67+
*.vspx
68+
*.sap
69+
70+
### Visual Studio Cache Files.
71+
###
72+
### ...
73+
*.[Cc]ache
74+
!*.[Cc]ache/
75+
76+
### Visual Studio Code Coverage Result Files.
77+
###
78+
### ...
79+
*.coverage
80+
*.coveragexml
81+
82+
### MonoDevelop/Xamarin User Specific Files.
83+
###
84+
### ...
85+
*.userprefs
86+
87+
### .NETCore Files.
88+
###
89+
### ...
90+
project.lock.json
91+
project.fragment.lock.json
92+
artifacts/
93+
**/Properties/launchSettings.json
94+
95+
### NUnit Files.
96+
###
97+
### ...
98+
*.VisualState.xml
99+
TestResult.xml
100+
101+
### ReSharper User Files.
102+
###
103+
### ...
104+
_ReSharper*/
105+
*.[Rr]e[Ss]harper
106+
*.DotSettings.user
107+
108+
### DotCover Files.
109+
###
110+
### ...
111+
*.dotCover
112+
113+
### NuGet Packages.
114+
###
115+
### ...
116+
*.nupkg
117+
**/packages/*
118+
!**/packages/build/
119+
120+
### NuGet 3 Project Files.
121+
###
122+
### ...
123+
*.nuget.props
124+
*.nuget.targets

Capstone.NET.sln

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,37 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28306.52
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gee.External.Capstone", "Gee.External.Capstone\Gee.External.Capstone.csproj", "{1297DCEE-009D-4739-8124-3F064EA9EA10}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Gee.External.Capstone", "Tests.Gee.External.Capstone\Tests.Gee.External.Capstone.csproj", "{7D755424-C594-4605-820D-9AF880E091BC}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CapstoneCMD", "CapstoneCMD\CapstoneCMD.csproj", "{D1A6EC03-1420-4516-8548-4117A18DA8B3}"
11-
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET4", ".NET4", "{964BD054-E21A-438D-A477-D9CAEB50DA95}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gee.External.Capstone.4", "Gee.External.Capstone\Gee.External.Capstone.4.csproj", "{D8E7BF01-1424-4312-AF14-982E7DA9B9BC}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gee.External.Capstone", "Gee.External.Capstone\Gee.External.Capstone.csproj", "{52ECA690-0077-4E38-9139-31C7CF3B6853}"
157
EndProject
168
Global
179
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Debug|x64 = Debug|x64
1812
Debug|x86 = Debug|x86
13+
Release|Any CPU = Release|Any CPU
14+
Release|x64 = Release|x64
1915
Release|x86 = Release|x86
2016
EndGlobalSection
2117
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{1297DCEE-009D-4739-8124-3F064EA9EA10}.Debug|x86.ActiveCfg = .NET45Debug|x86
23-
{1297DCEE-009D-4739-8124-3F064EA9EA10}.Debug|x86.Build.0 = .NET45Debug|x86
24-
{1297DCEE-009D-4739-8124-3F064EA9EA10}.Release|x86.ActiveCfg = .NET45Release|x86
25-
{1297DCEE-009D-4739-8124-3F064EA9EA10}.Release|x86.Build.0 = .NET45Release|x86
26-
{7D755424-C594-4605-820D-9AF880E091BC}.Debug|x86.ActiveCfg = .NET45Debug|x86
27-
{7D755424-C594-4605-820D-9AF880E091BC}.Debug|x86.Build.0 = .NET45Debug|x86
28-
{7D755424-C594-4605-820D-9AF880E091BC}.Release|x86.ActiveCfg = .NET45Release|x86
29-
{7D755424-C594-4605-820D-9AF880E091BC}.Release|x86.Build.0 = .NET45Release|x86
30-
{D1A6EC03-1420-4516-8548-4117A18DA8B3}.Debug|x86.ActiveCfg = .NET45Debug|x86
31-
{D1A6EC03-1420-4516-8548-4117A18DA8B3}.Debug|x86.Build.0 = .NET45Debug|x86
32-
{D1A6EC03-1420-4516-8548-4117A18DA8B3}.Release|x86.ActiveCfg = .NET45Release|x86
33-
{D1A6EC03-1420-4516-8548-4117A18DA8B3}.Release|x86.Build.0 = .NET45Release|x86
34-
{D8E7BF01-1424-4312-AF14-982E7DA9B9BC}.Debug|x86.ActiveCfg = .NET4Debug|x86
35-
{D8E7BF01-1424-4312-AF14-982E7DA9B9BC}.Debug|x86.Build.0 = .NET4Debug|x86
36-
{D8E7BF01-1424-4312-AF14-982E7DA9B9BC}.Release|x86.ActiveCfg = .NET4Release|x86
37-
{D8E7BF01-1424-4312-AF14-982E7DA9B9BC}.Release|x86.Build.0 = .NET4Release|x86
18+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Debug|x64.ActiveCfg = Debug|x64
21+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Debug|x64.Build.0 = Debug|x64
22+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Debug|x86.ActiveCfg = Debug|x86
23+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Debug|x86.Build.0 = Debug|x86
24+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Release|x64.ActiveCfg = Release|x64
27+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Release|x64.Build.0 = Release|x64
28+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Release|x86.ActiveCfg = Release|x86
29+
{52ECA690-0077-4E38-9139-31C7CF3B6853}.Release|x86.Build.0 = Release|x86
3830
EndGlobalSection
3931
GlobalSection(SolutionProperties) = preSolution
4032
HideSolutionNode = FALSE
4133
EndGlobalSection
42-
GlobalSection(NestedProjects) = preSolution
43-
{D8E7BF01-1424-4312-AF14-982E7DA9B9BC} = {964BD054-E21A-438D-A477-D9CAEB50DA95}
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {78A7A476-9C20-46F4-A8EB-CAA16031EA22}
4436
EndGlobalSection
4537
EndGlobal

0 commit comments

Comments
 (0)