Merge branch 'master' into enhancements/gitcheckout

Author: shana

src/GitHub.Api/Installer/GitInstaller.cs

@@ -14,11 +14,12 @@ class GitInstallDetails
         public const string GitExtractedMD5 = "e6cfc0c294a2312042f27f893dfc9c0a";
         public const string GitLfsExtractedMD5 = "36e3ae968b69fbf42dff72311040d24a";
 
+        public const string WindowsGitExecutableMD5 = "50570ed932559f294d1a1361801740b9";
+        public const string MacGitExecutableMD5 = "";
+
         public const string WindowsGitLfsExecutableMD5 = "177bb14d0c08f665a24f0d5516c3b080";
         public const string MacGitLfsExecutableMD5 = "f81a1a065a26a4123193e8fd96c561ad";
 
-        public const string FileListMD5 = "a152a216b2e76f6c127053251187a278";
-
         private const string PackageVersion = "f02737a78695063deace08e96d5042710d3e32db";
         private const string PackageName = "PortableGit";
 
@@ -209,19 +210,21 @@ private bool IsGitExtracted()
                 return false;
             }
 
-            var fileListMD5 = environment.FileSystem.CalculateFolderMD5(installDetails.GitInstallationPath, false);
-            if (!fileListMD5.Equals(GitInstallDetails.FileListMD5, StringComparison.InvariantCultureIgnoreCase))
+            var gitExecutableMd5 = environment.FileSystem.CalculateFileMD5(installDetails.GitExecutablePath);
+            var expectedGitExecutableMd5 = environment.IsWindows ? GitInstallDetails.WindowsGitExecutableMD5 : GitInstallDetails.MacGitExecutableMD5;
+
+            if (!expectedGitExecutableMd5.Equals(gitExecutableMd5, StringComparison.InvariantCultureIgnoreCase))
             {
-                Logger.Warning($"Path {installDetails.GitInstallationPath} has MD5 {fileListMD5} expected {GitInstallDetails.FileListMD5}");
+                Logger.Warning($"Path {installDetails.GitExecutablePath} has MD5 {gitExecutableMd5} expected {expectedGitExecutableMd5}");
                 return false;
             }
 
-            var calculateMd5 = environment.FileSystem.CalculateFileMD5(installDetails.GitLfsExecutablePath);
-            var md5 = environment.IsWindows ? GitInstallDetails.WindowsGitLfsExecutableMD5 : GitInstallDetails.MacGitLfsExecutableMD5;
+            var gitLfsExecutableMd5 = environment.FileSystem.CalculateFileMD5(installDetails.GitLfsExecutablePath);
+            var expectedGitLfsExecutableMd5 = environment.IsWindows ? GitInstallDetails.WindowsGitLfsExecutableMD5 : GitInstallDetails.MacGitLfsExecutableMD5;
 
-            if (!md5.Equals(calculateMd5, StringComparison.InvariantCultureIgnoreCase))
+            if (!expectedGitLfsExecutableMd5.Equals(gitLfsExecutableMd5, StringComparison.InvariantCultureIgnoreCase))
             {
-                Logger.Warning($"Path {installDetails.GitLfsExecutablePath} has MD5 {calculateMd5} expected {md5}");
+                Logger.Warning($"Path {installDetails.GitLfsExecutablePath} has MD5 {gitLfsExecutableMd5} expected {expectedGitLfsExecutableMd5}");
                 return false;
             }
 

src/tests/IntegrationTests/Git/GitClientTests.cs

@@ -10,40 +10,36 @@ namespace IntegrationTests
     class GitClientTests : BaseGitEnvironmentTest
     {
         [Test]
-        public void ShouldGetGitVersion()
+        public async Task ShouldGetGitVersion()
         {
             Initialize(TestRepoMasterCleanSynchronized);
 
-            var version = GitClient.Version();
-            version.Start().Wait();
+            var result = await GitClient.Version().StartAwait();
 
-            var versionResult = version.Result;
             if (Environment.IsWindows)
             {
-                versionResult.Should().Be(new Version(2,11,1));
+                result.Should().Be(new Version(2,11,1));
             }
             else
             {
-                versionResult.Should().NotBeNull();
+                result.Should().NotBeNull();
             }
         }
 
         [Test]
-        public void ShouldGetGitLfsVersion()
+        public async Task ShouldGetGitLfsVersion()
         {
             Initialize(TestRepoMasterCleanSynchronized);
 
-            var version = GitClient.LfsVersion();
-            version.Start().Wait();
+            var result = await GitClient.LfsVersion().StartAwait();
 
-            var versionResult = version.Result;
             if (Environment.IsWindows)
             {
-                versionResult.Should().Be(new Version(2, 3, 4));
+                result.Should().Be(new Version(2, 3, 4));
             }
             else
             {
-                versionResult.Should().NotBeNull();
+                result.Should().NotBeNull();
             }
         }
     }