From 510d2608e77ebc1bac6acada64933e9917cef35c Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Tue, 8 Oct 2019 09:41:51 -0400
Subject: [PATCH 1/2] Update Git to include gvfs-helper update and fix

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 Scalar.Build/Scalar.props                                       | 2 +-
 .../Tests/MultiEnlistmentTests/SharedCacheTests.cs              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Scalar.Build/Scalar.props b/Scalar.Build/Scalar.props
index f67ae8a85c..326ad97c8e 100644
--- 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
index 4287ad7b74..4b8fe12be8 100644
--- 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();

From c3216f1d7f3b7f1dff8505fc2226ec8a01d77c91 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Wed, 9 Oct 2019 09:50:43 -0400
Subject: [PATCH 2/2] Publish trace2 logs only on failure

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 .azure-pipelines/templates/windows-functional-test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/templates/windows-functional-test.yml b/.azure-pipelines/templates/windows-functional-test.yml
index 079769b19d..bcbab1f40d 100644
--- 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()