From 7e90162def4d94656df794fc7116102f0a219707 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Thu, 14 Oct 2021 16:27:30 +0300
Subject: [PATCH] [Windows] revert PR3766 (#4278)

---
 images/win/scripts/Installers/Install-Git.ps1          | 10 ----------
 .../SoftwareReport/SoftwareReport.Generator.ps1        |  1 -
 .../scripts/SoftwareReport/SoftwareReport.Tools.psm1   |  5 -----
 images/win/scripts/Tests/Git.Tests.ps1                 |  6 ------
 4 files changed, 22 deletions(-)

diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1
index 4f543f5b..f48daf62 100644
--- a/images/win/scripts/Installers/Install-Git.ps1
+++ b/images/win/scripts/Installers/Install-Git.ps1
@@ -9,16 +9,6 @@ Choco-Install -PackageName git -ArgumentList '--installargs="/VERYSILENT /NOREST
 # Install hub
 Choco-Install -PackageName hub
 
-# Install GVFS
-$url = "https://api.github.com/repos/microsoft/VFSForGit/releases/latest"
-[System.String] $gvfsLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "SetupGVFS.+\.exe$"
-$gvfsInstallerPath = Start-DownloadWithRetry -Url $gvfsLatest -Name "SetupGVFS.exe"
-
-# Start-Process waits on the entire process tree but Wait-Process only waits on the initiating process(GVFS.Service.UI.exe)
-$env:GVFS_UNATTENDED = "1"
-$argList = "/VERYSILENT", "/NORESTART", "/NOCANCEL", "/SP-", "/CLOSEAPPLICATIONS", "/RESTARTAPPLICATIONS", "/SUPPRESSMSGBOXES"
-Start-Process $gvfsInstallerPath -ArgumentList $argList -PassThru | Wait-Process
-
 # Disable GCM machine-wide
 [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine)
 
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 608adaa2..6d5e8afa 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -104,7 +104,6 @@ $toolsList = @(
     (Get-GHCVersion),
     (Get-GitVersion),
     (Get-GitLFSVersion),
-    (Get-GVFSVersion),
     (Get-InnoSetupVersion),
     (Get-JQVersion),
     (Get-KindVersion),
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index 3c465142..ee47d502 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -73,11 +73,6 @@ function Get-GitLFSVersion {
     return "Git LFS $gitLfsVersion"
 }
 
-function Get-GVFSVersion {
-    $gvfsVersion = (Get-Command gvfs).Version
-    return "GVFS $gvfsVersion"
-}
-
 function Get-InnoSetupVersion {
     return $(choco list --local-only innosetup) | Select-String -Pattern "InnoSetup"
 }
diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/win/scripts/Tests/Git.Tests.ps1
index b9d6a8e0..9b71aa0b 100644
--- a/images/win/scripts/Tests/Git.Tests.ps1
+++ b/images/win/scripts/Tests/Git.Tests.ps1
@@ -23,9 +23,3 @@ Describe "Git" {
         $env:GCM_INTERACTIVE | Should -BeExactly Never
     }
 }
-
-Describe "GVFS" {
-    It "GVFS is installed" {
-        "gvfs --version" | Should -ReturnZeroExitCode
-    }
-}