Merge pull request #697 from dotnet/fixPathsToOSX

AArnott · web-flow · commit a8d30d463802 · 2021-11-25T08:08:08.000-07:00
Fix path calculation to OSX native libgit2 binaries
diff --git a/src/NerdBank.GitVersioning/LibGit2/LibGit2GitExtensions.cs b/src/NerdBank.GitVersioning/LibGit2/LibGit2GitExtensions.cs
@@ -173,7 +173,7 @@ public static IEnumerable<Commit> GetCommitsFromVersion(LibGit2Context context,
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                return Path.Combine(basePath, "lib", "osx");
+                return Path.Combine(basePath, "lib", "osx", RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "arm_64" : "x86_64");
             }
 
             return null;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static IEnumerable<Commit> GetCommitsFromVersion(LibGit2Context context,`
`173`	`173`	`}`
`174`	`174`	`else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`175`	`175`	`{`
`176`		`- return Path.Combine(basePath, "lib", "osx");`
	`176`	`+ return Path.Combine(basePath, "lib", "osx", RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "arm_64" : "x86_64");`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`return null;`