Skip to content

Commit

Permalink
Merge pull request #1701: [HOTFIX] Delete all macOS projects and plat…
Browse files Browse the repository at this point in the history
…form code

Some macOS projects were causing failures in the release process, so
let's finally get around to deleting them.

This is the hotfix PR, but it should help with launching the VFS for Git release process.
  • Loading branch information
derrickstolee authored Oct 21, 2020
2 parents 4043e5c + 78b4c41 commit 0e417a0
Show file tree
Hide file tree
Showing 54 changed files with 335 additions and 5,662 deletions.
105 changes: 8 additions & 97 deletions GVFS.sln

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions GVFS/GVFS.FunctionalTests.LockHolder/AcquireGVFSLock.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using CommandLine;
using GVFS.Common;
using GVFS.Common.NamedPipes;
using GVFS.Platform.Mac;
using GVFS.Platform.Windows;
using System;
using System.Diagnostics;
Expand Down Expand Up @@ -43,11 +42,6 @@ public void Execute()

private static bool TryGetGVFSEnlistmentRootImplementation(string directory, out string enlistmentRoot, out string errorMessage)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
return MacPlatform.TryGetGVFSEnlistmentRootImplementation(directory, out enlistmentRoot, out errorMessage);
}

// Not able to use WindowsPlatform here - because of its dependency on WindowsIdentity (and also kernel32.dll).
enlistmentRoot = null;

Expand All @@ -70,11 +64,6 @@ private static bool TryGetGVFSEnlistmentRootImplementation(string directory, out

private static string GetNamedPipeNameImplementation(string enlistmentRoot)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
return MacPlatform.GetNamedPipeNameImplementation(enlistmentRoot);
}

// Not able to use WindowsPlatform here - because of its dependency on WindowsIdentity (and also kernel32.dll).
return "GVFS_" + enlistmentRoot.ToUpper().Replace(':', '_');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<ItemGroup>
<Compile Include="..\GVFS.Platform.POSIX\POSIXFileSystem.Shared.cs" Link="POSIXFileSystem.Shared.cs" />
<Compile Include="..\GVFS.Platform.POSIX\POSIXPlatform.Shared.cs" Link="POSIXPlatform.Shared.cs" />
<Compile Include="..\GVFS.Platform.Mac\MacPlatform.Shared.cs" Link="MacPlatform.Shared.cs" />
<Compile Include="..\GVFS.Platform.Windows\WindowsFileSystem.Shared.cs" Link="WindowsFileSystem.Shared.cs" />
</ItemGroup>

Expand Down
112 changes: 0 additions & 112 deletions GVFS/GVFS.Hooks/GVFS.Hooks.Mac.csproj

This file was deleted.

37 changes: 0 additions & 37 deletions GVFS/GVFS.Installer.Mac/GVFS.Installer.Mac.csproj

This file was deleted.

35 changes: 0 additions & 35 deletions GVFS/GVFS.Mount/GVFS.Mount.Mac.csproj

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 0e417a0

Please sign in to comment.