Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Mono.Posix

Browse Source
This commit is contained in:
Caelan
2024-09-22 16:57:00 -06:00
parent 4db0eeb5d5
commit b1f3b62fcb
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib-csharp/Util/SymbolicLink.cs
View File

@@ -3,7 +3,6 @@ using System.ComponentModel;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.Win32.SafeHandles;
using NCode.ReparsePoints;
namespace Velopack.Util
@@ -100,8 +99,7 @@ namespace Velopack.Util
rp.CreateSymbolicLink(linkPath, targetPath, false);
} else {
#if NETSTANDARD
var fileInfo = new Mono.Unix.UnixFileInfo(targetPath);
fileInfo.CreateSymbolicLink(linkPath);
UnixCreateSymlink(targetPath, linkPath);
#elif NET6_0_OR_GREATER
File.CreateSymbolicLink(linkPath, targetPath);
#else
@@ -123,8 +121,7 @@ namespace Velopack.Util
}
} else {
#if NETSTANDARD
var linkInfo = new Mono.Unix.UnixSymbolicLinkInfo(linkPath);
linkInfo.CreateSymbolicLinkTo(targetPath);
UnixCreateSymlink(targetPath, linkPath);
#elif NET6_0_OR_GREATER
Directory.CreateSymbolicLink(linkPath, targetPath);
#else
@@ -145,7 +142,7 @@ namespace Velopack.Util
return link.Target;
} else {
#if NETSTANDARD
return Mono.Unix.UnixPath.ReadLink(linkPath);;
return UnixReadLink(linkPath);
#elif NET6_0_OR_GREATER
return fsi!.LinkTarget!;
#else
@@ -169,5 +166,37 @@ namespace Velopack.Util
return (fsi.Attributes & FileAttributes.ReparsePoint) != 0;
}
#if NETSTANDARD
[DllImport("libc", SetLastError = true)]
private static extern nint readlink(string path, byte[] buffer, ulong bufferSize);
[DllImport("libc", SetLastError = true)]
private static extern int symlink(string target, string linkPath);
private static string UnixReadLink(string symlinkPath)
{
const int bufferSize = 1024;
byte[] buffer = new byte[bufferSize];
nint bytesWritten = readlink(symlinkPath, buffer, bufferSize);
if (bytesWritten < 1) {
throw new InvalidOperationException($"Error resolving symlink: {Marshal.GetLastWin32Error()}");
}
return Encoding.UTF8.GetString(buffer, 0, (int) bytesWritten);
}
private static void UnixCreateSymlink(string target, string linkPath)
{
// Call the symlink function from libc
int result = symlink(target, linkPath);
// Check for errors (-1 return value indicates failure)
if (result == -1) {
throw new InvalidOperationException($"Error creating symlink: {Marshal.GetLastWin32Error()}");
}
}
#endif
}
}

1
src/lib-csharp/Velopack.csproj
View File

@@ -32,7 +32,6 @@
<PackageReference Include="Newtonsoft.Json" Version="[13.0.1,)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0,)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework) == 'net6.0' ">

1
test/Velopack.Tests/Velopack.Tests.csproj
View File

@@ -24,7 +24,6 @@
<ItemGroup>
<PackageReference Include="System.IO.Packaging" Version="8.0.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">