Updates for new ProjFS API

GVFS/GVFS.Build/ProjFS.props

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjFSPackage>GVFS.ProjFS.2018.823.1</ProjFSPackage>
+    <ProjFSNativePackage>GVFS.ProjFS.2018.823.2</ProjFSNativePackage>
+    <ProjFSManagedPackage>Microsoft.Windows.ProjFS.1.0.19079.1</ProjFSManagedPackage>
   </PropertyGroup>
 </Project>

GVFS/GVFS.FunctionalTests/FileSystemRunners/BashRunner.cs

@@ -258,7 +258,8 @@ public override void DeleteFile_FileShouldNotBeFound(string path)
 
         public override void DeleteFile_AccessShouldBeDenied(string path)
         {
-            this.DeleteFile(path).ShouldContain(this.GetPermissionDeniedError());
+            // bash does not report any error messages when access is denied, so just confirm the file still exists
+            this.DeleteFile(path);
             this.FileExists(path).ShouldBeTrue($"{path} does not exist when it should");
         }
 

GVFS/GVFS.Installer.Windows/GVFS.Installer.Windows.csproj

@@ -47,7 +47,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="CreateInstaller" BeforeTargets="Build;SignFiles">
-    <Exec Command="$(PackagesDir)\Tools.InnoSetup.5.5.9\tools\ISCC.exe /DPlatformAndConfiguration=$(Platform)\$(Configuration) /DProjFSPackage=$(ProjFSPackage) /DBuildOutputDir=$(BuildOutputDir) /DPackagesDir=$(PackagesDir) /DGVFSVersion=$(GVFSVersion) Setup.iss /O$(OutputPath)" />
+    <Exec Command="$(PackagesDir)\Tools.InnoSetup.5.5.9\tools\ISCC.exe /DPlatformAndConfiguration=$(Platform)\$(Configuration) /DProjFSNativePackage=$(ProjFSNativePackage) /DBuildOutputDir=$(BuildOutputDir) /DPackagesDir=$(PackagesDir) /DGVFSVersion=$(GVFSVersion) Setup.iss /O$(OutputPath)" />
     <Copy SourceFiles="$(OutputPath)SetupGVFS.$(GVFSVersion).exe" DestinationFiles="$(BuildOutputDir)\GVFS.Build\SetupGVFS.$(GVFSVersion).exe" />
   </Target>
   <Target Name="Clean">

GVFS/GVFS.Installer.Windows/Setup.iss

@@ -3,7 +3,7 @@
 
 ; General documentation on how to use InnoSetup scripts: http://www.jrsoftware.org/ishelp/index.php
 
-#define PrjFltDir PackagesDir + "\" + ProjFSPackage + "\filter" 
+#define PrjFltDir PackagesDir + "\" + ProjFSNativePackage + "\filter" 
 #define VCRuntimeDir PackagesDir + "\GVFS.VCRuntime.0.2.0-build\lib\x64"
 #define GVFSDir BuildOutputDir + "\GVFS.Windows\bin\" + PlatformAndConfiguration
 #define GVFSCommonDir BuildOutputDir + "\GVFS.Common\bin\" + PlatformAndConfiguration + "\netstandard2.0"

GVFS/GVFS.Installer.Windows/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GVFS.ProjFS" version="2018.823.2" targetFramework="net461" />
   <package id="MicroBuild.Core" version="0.2.0" developmentDependency="true" />
   <package id="Tools.InnoSetup" version="5.5.9" targetFramework="net461" />
 </packages>

GVFS/GVFS.NativeTests/GVFS.NativeTests.vcxproj

@@ -64,7 +64,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>ProjectedFSLib.lib;fltlib.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64;$(PackagesDir)\$(ProjFSPackage)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64;$(PackagesDir)\$(ProjFSNativePackage)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -85,7 +85,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>ProjectedFSLib.lib;fltlib.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64;$(PackagesDir)\$(ProjFSPackage)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64;$(PackagesDir)\$(ProjFSNativePackage)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

GVFS/GVFS.Platform.Mac/MacFileSystemVirtualizer.cs

@@ -143,7 +143,7 @@ public override FileSystemResult WritePlaceholderDirectory(string relativePath)
             DateTime lastAccessTime,
             DateTime lastWriteTime,
             DateTime changeTime,
-            uint fileAttributes,
+            FileAttributes fileAttributes,
             long endOfFile,
             string shaContentId,
             UpdatePlaceholderType updateFlags,

GVFS/GVFS.Platform.Windows/ActiveEnumeration.cs

@@ -125,7 +125,7 @@ private void SaveFilter(string filter)
             {
                 this.filterString = filter;
 
-                if (ProjFS.Utils.DoesNameContainWildCards(this.filterString))
+                if (Microsoft.Windows.ProjFS.Utils.DoesNameContainWildCards(this.filterString))
                 {
                     this.doesPatternMatch = doesWildcardPatternMatch;
                 }

GVFS/GVFS.Platform.Windows/DiskLayoutUpgrades/DiskLayout12to13Upgrade_FolderPlaceholder.cs

@@ -2,7 +2,7 @@
 using GVFS.Common.FileSystem;
 using GVFS.Common.Tracing;
 using GVFS.DiskLayoutUpgrades;
-using ProjFS;
+using Microsoft.Windows.ProjFS;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -81,30 +81,32 @@ private static IEnumerable<string> GetFolderPlaceholdersFromDisk(ITracer tracer,
                 {
                     if (!directory.EndsWith(Path.DirectorySeparatorChar + GVFSConstants.DotGit.Root))
                     {
-                        OnDiskFileState fileState = OnDiskFileState.Full;
-                        HResult result = Utils.GetOnDiskFileState(directory, out fileState);
-                        if (result == HResult.Ok)
+                        if (Directory.Exists(directory))
                         {
-                            if (IsPlaceholder(fileState))
+                            OnDiskFileState fileState = OnDiskFileState.Full;
+                            bool result = Utils.TryGetOnDiskFileState(directory, out fileState);
+                            if (result == true)
                             {
-                                yield return directory;
-                            }
+                                if (IsPlaceholder(fileState))
+                                {
+                                    yield return directory;
+                                }
 
-                            // Recurse into placeholders and full folders skipping the tombstones
-                            if (!IsTombstone(fileState))
-                            {
-                                foreach (string placeholderPath in GetFolderPlaceholdersFromDisk(tracer, fileSystem, directory))
+                                // Recurse into placeholders and full folders skipping the tombstones
+                                if (!IsTombstone(fileState))
                                 {
-                                    yield return placeholderPath;
+                                    foreach (string placeholderPath in GetFolderPlaceholdersFromDisk(tracer, fileSystem, directory))
+                                    {
+                                        yield return placeholderPath;
+                                    }
                                 }
                             }
-                        }
-                        else if (result != HResult.FileNotFound)
-                        {
-                            // FileNotFound is returned for tombstones when the filter is attached to the volume so we want to
-                            // just skip those folders.  Any other HResults may cause valid folder placeholders not to be written
-                            // to the placeholder database so we want to error out on those.
-                            throw new InvalidDataException($"Error getting on disk file state. HResult = {result} for {directory}");
+                            else
+                            {
+                                // May cause valid folder placeholders not to be written
+                                // to the placeholder database so we want to error out.
+                                throw new InvalidDataException($"Error getting on disk file state. HResult = {result} for {directory}");
+                            }
                         }
                     }
                 }

GVFS/GVFS.Platform.Windows/GVFS.Platform.Windows.csproj

@@ -45,8 +45,8 @@
       <HintPath>..\..\..\packages\Microsoft.Database.Isam.1.9.4\lib\net40\Esent.Isam.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ProjectedFSLib.Managed, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
-      <HintPath>$(PackagesDir)\$(ProjFSPackage)\lib\x64\ProjectedFSLib.Managed.dll</HintPath>
+    <Reference Include="ProjectedFSLib.Managed, Version=1.0.19079.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
+      <HintPath>..\..\..\packages\Microsoft.Windows.ProjFS.1.0.19079.1\lib\net461\ProjectedFSLib.Managed.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -91,6 +91,7 @@
     <Compile Include="WindowsPlatform.cs" />
     <Compile Include="WindowsPlatform.Shared.cs" />
     <Compile Include="WindowsFileSystem.cs" />
+    <Compile Include="WindowsRequiredCallbacks.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">

GVFS/GVFS.Platform.Windows/HResultExtensions.cs

@@ -1,4 +1,4 @@
-using ProjFS;
+using Microsoft.Windows.ProjFS;
 
 namespace GVFS.Platform.Windows
 {

GVFS/GVFS.Platform.Windows/ProjFSFilter.cs

@@ -2,7 +2,7 @@
 using GVFS.Common.FileSystem;
 using GVFS.Common.Tracing;
 using Microsoft.Win32;
-using ProjFS;
+using Microsoft.Windows.ProjFS;
 using System;
 using System.ComponentModel;
 using System.IO;
@@ -617,7 +617,7 @@ private bool TryPrepareFolderForCallbacksImpl(string folderPath, out string erro
         {
             error = string.Empty;
             Guid virtualizationInstanceGuid = Guid.NewGuid();
-            HResult result = VirtualizationInstance.ConvertDirectoryToVirtualizationRoot(virtualizationInstanceGuid, folderPath);
+            HResult result = VirtualizationInstance.MarkDirectoryAsVirtualizationRoot(folderPath, virtualizationInstanceGuid);
             if (result != HResult.Ok)
             {
                 error = "Failed to prepare \"" + folderPath + "\" for callbacks, error: " + result.ToString("F");