Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 5dc3f6d

Browse files
Merge branch 'master' into enhancements/initialize-view
2 parents 1326949 + a88a5f3 commit 5dc3f6d

File tree

6 files changed

+31
-11
lines changed

6 files changed

+31
-11
lines changed

src/GitHub.Api/Installer/GitInstaller.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ namespace GitHub.Unity
66
{
77
class GitInstaller : IGitInstaller
88
{
9-
public const string WindowsGitLfsExecutableMD5 = "7cfa21e5e9f9819a7cb0c317b0be1c5b";
10-
public const string MacGitLfsExecutableMD5 = "54f586df05a4b80feae4fabed10d8e95";
9+
public const string WindowsGitLfsExecutableMD5 = "ef51379a06577bcdeef372d297d6cd7f";
10+
public const string MacGitLfsExecutableMD5 = "2b324cbfbb9196cf6a3c0a0918c434c7";
1111

1212
private const string PortableGitExpectedVersion = "f02737a78695063deace08e96d5042710d3e32db";
1313
private const string PackageName = "PortableGit";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:09781a02cb8ef9ff0abaa9e669ae5c0b94166a49fdb45c75a7604f98d772f71a
3-
size 2477147
2+
oid sha256:c86ab0b766e2d523ba2bf2ae427fe755e553989f7160217380b0f4dead7b802b
3+
size 2631425
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:749d4f91993eb4526f3667e524b9902e2d909fcd2a9ea8ee6025177eb16817f0
3-
size 2736142
2+
oid sha256:8b30e08751549f70f052eda49e0e2875ce006c98d013a17c46943b830f22e867
3+
size 2780647
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9aac2fdc3d1527ee6c796e4364eafeacbbeefc38714a4df63fb7c8a1ec7bcff5
3-
size 2596848
2+
oid sha256:64b2e9186ff553f2e4afe4db38b21d27e3dde08f3347ff8ea88c667dfcefb92f
3+
size 2807324

src/tests/IntegrationTests/Git/GitSetupTests.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task InstallGit()
6969

7070

7171
[Test]
72-
public void VerifyGitLfsBundle()
72+
public void VerifyWindowsGitLfsBundle()
7373
{
7474
var environmentPath = NPath.CreateTempDirectory("integration-test-environment");
7575

@@ -84,7 +84,27 @@ public void VerifyGitLfsBundle()
8484
gitLfsPath.Exists().Should().BeTrue();
8585

8686
var calculateMd5 = NPath.FileSystem.CalculateMD5(gitLfsPath);
87-
Assert.IsTrue(string.Compare(calculateMd5, GitInstaller.WindowsGitLfsExecutableMD5, true) == 0);
87+
calculateMd5.ToLower().Should().Be(GitInstaller.WindowsGitLfsExecutableMD5.ToLower());
88+
}
89+
90+
91+
[Test]
92+
public void VerifyMacGitLfsBundle()
93+
{
94+
var environmentPath = NPath.CreateTempDirectory("integration-test-environment");
95+
96+
var gitLfsPath = environmentPath.Combine("git-lfs");
97+
gitLfsPath.Exists().Should().BeFalse();
98+
99+
var inputZipFile = SolutionDirectory.Combine("PlatformResources", "mac", "git-lfs.zip");
100+
101+
var fastZip = new FastZip();
102+
fastZip.ExtractZip(inputZipFile, environmentPath, null);
103+
104+
gitLfsPath.Exists().Should().BeTrue();
105+
106+
var calculateMd5 = NPath.FileSystem.CalculateMD5(gitLfsPath);
107+
calculateMd5.ToLower().Should().Be(GitInstaller.MacGitLfsExecutableMD5.ToLower());
88108
}
89109
}
90110
}

src/tests/IntegrationTests/GitClientTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task ShouldGetGitLfsVersion()
3939
var versionResult = version.Result;
4040
if (Environment.IsWindows)
4141
{
42-
versionResult.Should().Be(new Version(2, 2, 0));
42+
versionResult.Should().Be(new Version(2, 3, 0));
4343
}
4444
else
4545
{

0 commit comments

Comments
 (0)