Merge pull request #25 from 9ee1/develop

Capstone.NET 2.0.2 Release
9ee1 · May 17, 2019 · 91c5075 · 91c5075
2 parents cf9c6f3 + 1ed8e25
commit 91c5075
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.build/Gee.External.Capstone.nuspec b/.build/Gee.External.Capstone.nuspec
@@ -3,15 +3,15 @@
   <metadata>
     <id>Gee.External.Capstone</id>
     <title>Capstone.NET</title>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <authors>Ahmed Garhy (@9ee1)</authors>
     <owners>Ahmed Garhy (@9ee1)</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <license type="file">LICENSE</license>
     <projectUrl>https://github.com/9ee1/Capstone.NET</projectUrl>
     <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>
     <summary>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.</summary>
-    <releaseNotes>Capstone.NET 2.x 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-is-New-in-Capstone.NET-2.x for more information.</releaseNotes>
+    <releaseNotes>Capstone.NET 2.0.2 is a patch release. See https://github.com/9ee1/Capstone.NET/milestone/3 for more information. Capstone.NET 2.x 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-is-New-in-Capstone.NET-2.x for more information.</releaseNotes>
     <copyright>Copyright (c) Ahmed Garhy</copyright>
     <repository url="https://github.com/9ee1/Capstone.NET" />
     <tags>capstone disassembler reverse-engineering security arm x86</tags>

diff --git a/.build/pack.bat b/.build/pack.bat
@@ -13,28 +13,28 @@ CALL mkdir %~dp0\nuget\runtimes\win-x86\lib\netstandard2.0
 CALL dotnet msbuild %~dp0\..\Capstone.NET.sln ^
      /property:Configuration="Release" ^
      /property:Platform="Any CPU" ^
-     /property:AssemblyVersion=2.0.1.0 ^
+     /property:AssemblyVersion=2.0.2.0 ^
      /property:Copyright="Copyright (c) Ahmed Garhy" ^
-     /property:FileVersion=2.0.1.0 ^
-     /property:InformationalVersion=2.0.1.0 ^
+     /property:FileVersion=2.0.2.0 ^
+     /property:InformationalVersion=2.0.2.0 ^
      /property:Product="Capstone.NET"
 
 CALL dotnet msbuild %~dp0\..\Capstone.NET.sln ^
      /property:Configuration="Release" ^
      /property:Platform="x64" ^
-     /property:AssemblyVersion=2.0.1.0 ^
+     /property:AssemblyVersion=2.0.2.0 ^
      /property:Copyright="Copyright (c) Ahmed Garhy" ^
-     /property:FileVersion=2.0.1.0 ^
-     /property:InformationalVersion=2.0.1.0 ^
+     /property:FileVersion=2.0.2.0 ^
+     /property:InformationalVersion=2.0.2.0 ^
      /property:Product="Capstone.NET"
 
 CALL dotnet msbuild %~dp0\..\Capstone.NET.sln ^
      /property:Configuration="Release" ^
      /property:Platform="x86" ^
-     /property:AssemblyVersion=2.0.1.0 ^
+     /property:AssemblyVersion=2.0.2.0 ^
      /property:Copyright="Copyright (c) Ahmed Garhy" ^
-     /property:FileVersion=2.0.1.0 ^
-     /property:InformationalVersion=2.0.1.0 ^
+     /property:FileVersion=2.0.2.0 ^
+     /property:InformationalVersion=2.0.2.0 ^
      /property:Product="Capstone.NET"
 
 CALL copy /V /Y ^

diff --git a/Gee.External.Capstone/NativeCapstoneImport.cs b/Gee.External.Capstone/NativeCapstoneImport.cs
@@ -216,6 +216,7 @@ internal static class NativeCapstoneImport {
         ///     Thrown if the disassembler handle is disposed, or if the instruction handle is disposed.
         /// </exception>
         [DllImport("capstone", CallingConvention = CallingConvention.Cdecl, EntryPoint = "cs_disasm_iter")]
+        [return: MarshalAs(UnmanagedType.I1)]
         internal static extern bool Iterate(NativeDisassemblerHandle hDisassembler, ref IntPtr pCode, ref IntPtr codeSize, ref long address, NativeInstructionHandle hInstruction);
 
         /// <summary>