Update Git to v2.34.0.vfs.0.0

.github/workflows/build.yaml

@@ -109,7 +109,7 @@ jobs:
     - name: Run functional tests
       shell: cmd
       run: |
-        SET PATH=C:\Program Files\GVFS;%PATH%
+        SET PATH=C:\Program Files\VFS for Git;%PATH%
         SET GIT_TRACE2_PERF=C:\temp\git-trace2.log
         ft\GVFS.FunctionalTests.exe /result:TestResult.xml --ci
 

GVFS/GVFS.FunctionalTests/GVFS.FunctionalTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>

GVFS/GVFS.FunctionalTests/Settings.cs

@@ -45,15 +45,15 @@ public static void Initialize()
                 Commitish = @"FunctionalTests/20201014";
 
                 EnlistmentRoot = @"C:\Repos\GVFSFunctionalTests\enlistment";
-                PathToGVFS = @"C:\Program Files\GVFS\GVFS.exe";
+                PathToGVFS = @"C:\Program Files\VFS for Git\GVFS.exe";
                 PathToGit = @"C:\Program Files\Git\cmd\git.exe";
                 PathToBash = @"C:\Program Files\Git\bin\bash.exe";
 
                 ControlGitRepoRoot = @"C:\Repos\GVFSFunctionalTests\ControlRepo";
                 FastFetchBaseRoot = @"C:\Repos\GVFSFunctionalTests\FastFetch";
                 FastFetchRoot = Path.Combine(FastFetchBaseRoot, "test");
                 FastFetchControl = Path.Combine(FastFetchBaseRoot, "control");
-                PathToGVFSService = @"C:\Program Files\GVFS\GVFS.Service.exe";
+                PathToGVFSService = @"C:\Program Files\VFS for Git\GVFS.Service.exe";
                 BinaryFileNameExtension = ".exe";
             }
         }

GVFS/GVFS.FunctionalTests/Tools/ProjFSFilterInstaller.cs

@@ -9,7 +9,7 @@ public class ProjFSFilterInstaller
         private const string GVFSServiceName = "GVFS.Service";
         private const string ProjFSServiceName = "prjflt";
         private const string OptionalFeatureName = "Client-ProjFS";
-        private const string GVFSInstallPath = @"C:\Program Files\GVFS";
+        private const string GVFSInstallPath = @"C:\Program Files\VFS for Git";
         private const string NativeProjFSLibInstallLocation = GVFSInstallPath + @"\ProjFS\ProjectedFSLib.dll";
 
         private const string PrjfltInfName = "prjflt.inf";

GVFS/GVFS.FunctionalTests/Windows/Tests/ServiceTests.cs

@@ -16,7 +16,7 @@ namespace GVFS.FunctionalTests.Windows.Tests
     [Category(Categories.ExtraCoverage)]
     public class ServiceTests : TestsWithEnlistmentPerFixture
     {
-        private const string NativeLibPath = @"C:\Program Files\GVFS\ProjectedFSLib.dll";
+        private const string NativeLibPath = @"C:\Program Files\VFS for Git\ProjectedFSLib.dll";
         private const string PrjFltAutoLoggerKey = "SYSTEM\\CurrentControlSet\\Control\\WMI\\Autologger\\Microsoft-Windows-ProjFS-Filter-Log";
         private const string PrjFltAutoLoggerStartValue = "Start";
 

GVFS/GVFS.Installers/info.bat

@@ -3,10 +3,10 @@ SETLOCAL
 
 SET SYS_PRJFLT=C:\Windows\System32\drivers\prjflt.sys
 SET SYS_PROJFSLIB=C:\Windows\System32\ProjectedFSLib.dll
-SET VFS_PROJFSLIB=C:\Program Files\GVFS\ProjectedFSLib.dll
-SET VFS_BUND_PRJFLT=C:\Program Files\GVFS\Filter\PrjFlt.sys
-SET VFS_BUND_PROJFSLIB=C:\Program Files\GVFS\ProjFS\ProjectedFSLib.dll
-SET VFS_EXEC=C:\Program Files\GVFS\GVFS.exe
+SET VFS_PROJFSLIB=C:\Program Files\VFS for Git\ProjectedFSLib.dll
+SET VFS_BUND_PRJFLT=C:\Program Files\VFS for Git\Filter\PrjFlt.sys
+SET VFS_BUND_PROJFSLIB=C:\Program Files\VFS for Git\ProjFS\ProjectedFSLib.dll
+SET VFS_EXEC=C:\Program Files\VFS for Git\GVFS.exe
 SET GIT_EXEC=C:\Program Files\Git\cmd\git.exe
 
 ECHO Checking ProjFS Windows feature...

GVFS/GVFS.Installers/install.bat

@@ -16,4 +16,4 @@ ECHO Installing Git for Windows...
 %GIT_INSTALLER% /LOG="%LOGDIR%\git.log" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /ALLOWDOWNGRADE=1
 
 ECHO Installing VFS for Git...
-%GVFS_INSTALLER% /LOG="%LOGDIR%\gvfs.log" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART
+%GVFS_INSTALLER% /LOG="%LOGDIR%\gvfs.log" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART  /DIR="C:\Program Files\VFS for Git"

Version.props

@@ -18,7 +18,7 @@
        including taking version numbers 2.X.Y from upstream and updating .W if we have any
        hotfixes to microsoft/git.
     -->
-    <GitPackageVersion>2.20210817.4</GitPackageVersion>
+    <GitPackageVersion>2.20211115.1</GitPackageVersion>
     <MinimumGitVersion>v2.31.0.vfs.0.1</MinimumGitVersion>
   </PropertyGroup>
 

scripts/RunFunctionalTests.bat

@@ -5,7 +5,7 @@ IF "%1"=="" (SET "CONFIGURATION=Debug") ELSE (SET "CONFIGURATION=%1")
 
 REM Ensure GVFS installation is on the PATH for the Functional Tests to find
 SETLOCAL
-SET PATH=C:\Program Files\GVFS;C:\Program Files\Git\cmd;%PATH%
+SET PATH=C:\Program Files\VFS for Git\;C:\Program Files\GVFS;C:\Program Files\Git\cmd;%PATH%
 
 ECHO PATH = %PATH%