Cleanup/Fixes

Author: gus33000

DumpIt.sln

@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33417.168
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DumpIt", "DumpIt.csproj", "{0D6EB7F0-F53D-4525-9703-B04C5A4B685B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DumpIt", "src\DumpIt.csproj", "{0D6EB7F0-F53D-4525-9703-B04C5A4B685B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

publish_win_arm64.cmd

@@ -1,3 +1,3 @@
 @echo off
 
-msbuild /m /t:restore,dumpit:publish /p:Platform=arm64 /p:RuntimeIdentifier=win-arm64 /p:PublishDir="%CD%\publish\artifacts\win-arm64\CLI" /p:PublishSingleFile=true /p:PublishTrimmed=false /p:Configuration=Release DumpIt.sln
+msbuild /m /t:restore,dumpit:publish /p:Platform=arm64 /p:RuntimeIdentifier=win-arm64 /p:PublishDir="%CD%\publish\artifacts\win-arm64\CLI" /p:PublishTrimmed=false /p:Configuration=Release /p:IncludeNativeLibrariesForSelfExtract=true DumpIt.sln

publish_win_x64.cmd

@@ -1,3 +1,3 @@
 @echo off
 
-msbuild /m /t:restore,dumpit:publish /p:Platform=x64 /p:RuntimeIdentifier=win-x64 /p:PublishDir="%CD%\publish\artifacts\win-x64\CLI" /p:PublishSingleFile=true /p:PublishTrimmed=false /p:Configuration=Release DumpIt.sln
+msbuild /m /t:restore,dumpit:publish /p:Platform=x64 /p:RuntimeIdentifier=win-x64 /p:PublishDir="%CD%\publish\artifacts\win-x64\CLI" /p:PublishTrimmed=false /p:Configuration=Release /p:IncludeNativeLibrariesForSelfExtract=true DumpIt.sln

ByteOperations.cs src/ByteOperations.csByteOperations.cs renamed to src/ByteOperations.cs

@@ -101,7 +101,7 @@ private struct DISK_GEOMETRY_EX
         }
 
         [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-        private static partial IntPtr CreateFile(string lpFileName, uint dwDesiredAccess, uint dwShareMode, IntPtr lpSecurityAttributes, uint dwCreationDisposition, uint dwFlagsAndAttributes, IntPtr hTemplateFile);
+        private static partial IntPtr CreateFileW(string lpFileName, uint dwDesiredAccess, uint dwShareMode, IntPtr lpSecurityAttributes, uint dwCreationDisposition, uint dwFlagsAndAttributes, IntPtr hTemplateFile);
 
         [LibraryImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
@@ -161,7 +161,7 @@ public DeviceStream(string device, FileAccess access)
 
             (_length, SectorSize) = GetDiskProperties(devicePath);
 
-            IntPtr ptr = CreateFile(devicePath, fileAccess, 0, IntPtr.Zero, OPEN_EXISTING, FILE_ATTRIBUTE_DEVICE | FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH, IntPtr.Zero);
+            IntPtr ptr = CreateFileW(devicePath, fileAccess, 0, IntPtr.Zero, OPEN_EXISTING, FILE_ATTRIBUTE_DEVICE | FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH, IntPtr.Zero);
             handleValue = new SafeFileHandle(ptr, true);
 
             if (handleValue.IsInvalid)
@@ -397,7 +397,7 @@ private static (long, uint) GetDiskProperties(string deviceName)
 
         private static void Execute<T>(ref T x, uint dwIoControlCode, string lpFileName, uint dwDesiredAccess = GENERIC_READ, uint dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ, IntPtr lpSecurityAttributes = default, uint dwCreationDisposition = OPEN_EXISTING, uint dwFlagsAndAttributes = 0, IntPtr hTemplateFile = default)
         {
-            nint hDevice = CreateFile(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
+            nint hDevice = CreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
 
             SafeFileHandle handleValue = new(hDevice, true);