diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 10d8b58cd..99ad3cb96 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -298,13 +298,13 @@ stages: - task: UseDotNet@2 displayName: Install .NET Core SDK 2.1.811 inputs: - packageType: sdk - version: 2.1.811 + packageType: runtime + version: 2.1.x - task: UseDotNet@2 displayName: Install .NET Core SDK 3.1.100 inputs: - packageType: sdk - version: 3.1.100 + packageType: runtime + version: 3.1.x - task: UseDotNet@2 displayName: Install .NET Core SDK 5.0.202 inputs: diff --git a/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs b/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs index eb250db9c..e1d9713bb 100644 --- a/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs +++ b/src/NerdBank.GitVersioning/ManagedGit/FileHelpers.cs @@ -5,7 +5,9 @@ using System.IO; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; -using Microsoft.Windows.Sdk; +using Windows.Win32; +using Windows.Win32.Storage.FileSystem; +using Windows.Win32.System.SystemServices; namespace Nerdbank.GitVersioning.ManagedGit { @@ -23,7 +25,7 @@ internal static bool TryOpen(string path, out FileStream? stream) { if (IsWindows) { - 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); + var handle = PInvoke.CreateFile(path, FILE_ACCESS_FLAGS.FILE_GENERIC_READ, FILE_SHARE_MODE.FILE_SHARE_READ, lpSecurityAttributes: null, FILE_CREATION_DISPOSITION.OPEN_EXISTING, FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_NORMAL, null); if (!handle.IsInvalid) { @@ -64,7 +66,7 @@ internal static unsafe bool TryOpen(ReadOnlySpan path, [NotNullWhen(true)] 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); + handle = PInvoke.CreateFile(pPath, FILE_ACCESS_FLAGS.FILE_GENERIC_READ, FILE_SHARE_MODE.FILE_SHARE_READ, null, FILE_CREATION_DISPOSITION.OPEN_EXISTING, FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_NORMAL, default); } if (!handle.Equals(Constants.INVALID_HANDLE_VALUE)) diff --git a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj index b196afbc0..d6dfbf491 100644 --- a/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj +++ b/src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj @@ -12,7 +12,7 @@ - +