Merge pull request #165: Update Git to include gvfs-helper update

See microsoft/git#206 and microsoft/git#207 for the Git updates. Un-ignore a functional test now that Git is doing the right thing. Resolves #147
microsoft · Oct 9, 2019 · 9dc5ce8 · 9dc5ce8
2 parents 307a500 + c3216f1
commit 9dc5ce8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.azure-pipelines/templates/windows-functional-test.yml b/.azure-pipelines/templates/windows-functional-test.yml
@@ -31,4 +31,5 @@ steps:
     displayName: Publish Git trace2 log
     inputs:
       pathtoPublish: '$(Build.ArtifactStagingDirectory)'
-      artifactName: trace2-event-windows.txt
+      artifactName: trace2-event-windows.txt
+    condition: failed()
diff --git a/Scalar.Build/Scalar.props b/Scalar.Build/Scalar.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <ScalarVersion>0.2.173.2</ScalarVersion>
-    <GitPackageVersion>2.20191004.2-sc</GitPackageVersion>
+    <GitPackageVersion>2.20191009.1-sc</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

diff --git a/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs b/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
@@ -103,7 +103,6 @@ public void DownloadingACommitWithoutTreesDoesntBreakNextClone()
         }
 
         [TestCase]
-        [Ignore("TODO #147: Renamed this test after git recreates the gvfs.sharedCache folder if it's missing")]
         public void MountReusesLocalCacheKeyWhenGitObjectsRootDeleted()
         {
             ScalarFunctionalTestEnlistment enlistment = this.CloneAndMountEnlistment();