Checking the hash of each zip

Author: StanleyGoldman

src/GitHub.Api/Installer/GitInstaller.cs

@@ -11,10 +11,12 @@ class GitInstallDetails
         public string GitLfsExec { get; }
         public NPath GitLfsExecPath { get; }
 
+        public const string GitExtractedMD5 = "e6cfc0c294a2312042f27f893dfc9c0a";
+        public const string GitLfsExtractedMD5 = "ae968b69fbf42dff72311040d24a";
+
         public const string WindowsGitLfsExecutableMD5 = "177bb14d0c08f665a24f0d5516c3b080";
         public const string MacGitLfsExecutableMD5 = "f81a1a065a26a4123193e8fd96c561ad";
 
-        public const string ExtractedMD5 = "65fd0575d3b47d8207b9e19d02faca4f";
         public const string FileListMD5 = "a152a216b2e76f6c127053251187a278";
 
         private const string PackageVersion = "f02737a78695063deace08e96d5042710d3e32db";
@@ -108,22 +110,14 @@ public void SetupGitIfNeeded(ActionTask<NPath> onSuccess, ITask onFailure)
 
                         var gitExtractPath = tempZipPath.Combine("git").CreateDirectory();
                         var gitLfsExtractPath = tempZipPath.Combine("git-lfs").CreateDirectory();
-
-                        new UnzipTask(cancellationToken, gitArchivePath, gitExtractPath, sharpZipLibHelper)
-                            .Then(new UnzipTask(cancellationToken, gitLfsArchivePath, gitLfsExtractPath, sharpZipLibHelper))
+                        
+                        new UnzipTask(cancellationToken, gitArchivePath, gitExtractPath, sharpZipLibHelper, environment.FileSystem, GitInstallDetails.GitExtractedMD5)
+                            .Then(new UnzipTask(cancellationToken, gitLfsArchivePath, gitLfsExtractPath, sharpZipLibHelper, environment.FileSystem, GitInstallDetails.GitLfsExtractedMD5))
                             .Then(() => {
                                 var targetGitLfsExecPath = installDetails.GetGitLfsExecPath(gitExtractPath);
                                 var extractGitLfsExePath = gitLfsExtractPath.Combine(installDetails.GitLfsExec);
                                 extractGitLfsExePath.Move(targetGitLfsExecPath);
 
-                                var extractedMD5 = environment.FileSystem.CalculateFolderMD5(gitExtractPath);
-                                if (!extractedMD5.Equals(GitInstallDetails.ExtractedMD5, StringComparison.InvariantCultureIgnoreCase))
-                                {
-                                    Logger.Warning("MD5 {0} does not match expected {1}", extractedMD5, GitInstallDetails.ExtractedMD5);
-                                    Logger.Warning("Failed PortableGitInstallTask");
-                                    throw new Exception();
-                                }
-
                                 Logger.Trace("Moving tempDirectory:\"{0}\" to extractTarget:\"{1}\"", gitExtractPath,
                                     installDetails.GitInstallPath);
 

src/tests/IntegrationTests/UnzipTaskTests.cs

@@ -13,8 +13,6 @@ namespace IntegrationTests
     [TestFixture]
     class UnzipTaskTests : BaseTaskManagerTest
     {
-        private const string GitZipMD5 = "e6cfc0c294a2312042f27f893dfc9c0a";
-
         [Test]
         public void TaskSucceeds()
         {
@@ -30,7 +28,7 @@ public void TaskSucceeds()
 
             var zipProgress = 0;
             Logger.Trace("Pct Complete {0}%", zipProgress);
-            var unzipTask = new UnzipTask(CancellationToken.None, archiveFilePath, extractedPath, Environment.FileSystem, GitZipMD5, 
+            var unzipTask = new UnzipTask(CancellationToken.None, archiveFilePath, extractedPath, Environment.FileSystem, GitInstallDetails.GitExtractedMD5, 
                 new Progress<float>(zipFileProgress => {
                     var zipFileProgressInteger = (int) (zipFileProgress * 100);
                     if (zipProgress != zipFileProgressInteger)