From 69c33ed0be29de36e9fbd3188b55d0cd165d578a Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sat, 12 Jun 2021 16:20:35 -0600
Subject: [PATCH] Switch from PInvoke nuget dependency to CsWin32

Fixes #615
---
 .../ManagedGit/FileHelpers.cs                    | 16 +++++++++-------
 src/NerdBank.GitVersioning/NativeMethods.json    |  3 +++
 src/NerdBank.GitVersioning/NativeMethods.txt     |  2 ++
 .../NerdBank.GitVersioning.csproj                |  2 +-
 .../Nerdbank.GitVersioning.nuspec                |  2 --
 5 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 src/NerdBank.GitVersioning/NativeMethods.json
 create mode 100644 src/NerdBank.GitVersioning/NativeMethods.txt

diff --git a/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs b/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs
index 623539a1..eb250db9 100644
--- a/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs
+++ b/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs
@@ -5,8 +5,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
-using static PInvoke.Kernel32;
-using FileShare = PInvoke.Kernel32.FileShare;
+using Microsoft.Windows.Sdk;
 
 namespace Nerdbank.GitVersioning.ManagedGit
 {
@@ -24,7 +23,7 @@ internal static bool TryOpen(string path, out FileStream? stream)
         {
             if (IsWindows)
             {
-                var handle = CreateFile(path, ACCESS_MASK.GenericRight.GENERIC_READ, FileShare.FILE_SHARE_READ, (SECURITY_ATTRIBUTES?)null, CreationDisposition.OPEN_EXISTING, CreateFileFlags.FILE_ATTRIBUTE_NORMAL, SafeObjectHandle.Null);
+                var handle = PInvoke.CreateFile(path, FILE_ACCESS_FLAGS.FILE_GENERIC_READ, FILE_SHARE_FLAGS.FILE_SHARE_READ, lpSecurityAttributes: null, FILE_CREATE_FLAGS.OPEN_EXISTING, FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_NORMAL, null);
 
                 if (!handle.IsInvalid)
                 {
@@ -62,12 +61,15 @@ internal static unsafe bool TryOpen(ReadOnlySpan<char> path, [NotNullWhen(true)]
         {
             if (IsWindows)
             {
-                var handle = CreateFile(path, ACCESS_MASK.GenericRight.GENERIC_READ, FileShare.FILE_SHARE_READ, null, CreationDisposition.OPEN_EXISTING, CreateFileFlags.FILE_ATTRIBUTE_NORMAL, SafeObjectHandle.Null);
+                HANDLE handle;
+                fixed (char* pPath = &path[0])
+                {
+                    handle = PInvoke.CreateFile(pPath, FILE_ACCESS_FLAGS.FILE_GENERIC_READ, FILE_SHARE_FLAGS.FILE_SHARE_READ, null, FILE_CREATE_FLAGS.OPEN_EXISTING, FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_NORMAL, default);
+                }
 
-                if (!handle.IsInvalid)
+                if (!handle.Equals(Constants.INVALID_HANDLE_VALUE))
                 {
-                    var fileHandle = new SafeFileHandle(handle.DangerousGetHandle(), ownsHandle: true);
-                    handle.SetHandleAsInvalid();
+                    var fileHandle = new SafeFileHandle(handle, ownsHandle: true);
                     stream = new FileStream(fileHandle, System.IO.FileAccess.Read);
                     return true;
                 }
diff --git a/src/NerdBank.GitVersioning/NativeMethods.json b/src/NerdBank.GitVersioning/NativeMethods.json
new file mode 100644
index 00000000..69d2bcc5
--- /dev/null
+++ b/src/NerdBank.GitVersioning/NativeMethods.json
@@ -0,0 +1,3 @@
+{
+  "$schema": "https://aka.ms/CsWin32.schema.json"
+}
\ No newline at end of file
diff --git a/src/NerdBank.GitVersioning/NativeMethods.txt b/src/NerdBank.GitVersioning/NativeMethods.txt
new file mode 100644
index 00000000..885be08e
--- /dev/null
+++ b/src/NerdBank.GitVersioning/NativeMethods.txt
@@ -0,0 +1,2 @@
+CreateFile
+INVALID_HANDLE_VALUE
diff --git a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
index afeb8233..b196afbc 100644
--- a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
+++ b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
@@ -12,12 +12,12 @@
     <PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
     <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0096" PrivateAssets="none" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.422-beta" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
     <PackageReference Include="Validation" Version="2.5.5-beta" />
     <PackageReference Include="Nerdbank.GitVersioning.LKG" Version="3.4.173-alpha" />
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="PInvoke.Kernel32" Version="0.7.104" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
index 30e035fc..48fc3455 100644
--- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
+++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
@@ -23,7 +23,6 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
     <file src="$BaseOutputPath$net461\NerdBank.GitVersioning.dll" target="build\MSBuildFull\NerdBank.GitVersioning.dll" />
     <file src="$BaseOutputPath$net461\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildFull\Nerdbank.GitVersioning.Tasks.dll" />
     <file src="$BaseOutputPath$net461\Newtonsoft.Json.dll" target="build\MSBuildFull\Newtonsoft.Json.dll" />
-    <file src="$BaseOutputPath$net461\PInvoke.Kernel32.dll" target="build\MSBuildFull\PInvoke.Kernel32.dll" />
     <file src="$BaseOutputPath$net461\System.Buffers.dll" target="build\MSBuildFull\System.Buffers.dll" />
     <file src="$BaseOutputPath$net461\System.Memory.dll" target="build\MSBuildFull\System.Memory.dll" />
     <file src="$BaseOutputPath$net461\System.Numerics.Vectors.dll" target="build\MSBuildFull\System.Numerics.Vectors.dll" />
@@ -49,7 +48,6 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
     <file src="$BaseOutputPath$netcoreapp2.1\System.Text.Json.dll" target="build\MSBuildCore\System.Text.Json.dll" />
     <file src="$BaseOutputPath$netcoreapp2.1\Validation.dll" target="build\MSBuildCore\Validation.dll" />
     <file src="$BaseOutputPath$netcoreapp2.1\System.Runtime.CompilerServices.Unsafe.dll" target="build\MSBuildCore\System.Runtime.CompilerServices.Unsafe.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\PInvoke.Kernel32.dll" target="build\MSBuildCore\PInvoke.Kernel32.dll" />
 
     <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
     <file src="build\Nerdbank.GitVersioning.Common.targets" target="build\Nerdbank.GitVersioning.Common.targets" />