From 0328d59c054b3957021b461b5064bf43742ad465 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 16 Jul 2015 11:42:26 -0500 Subject: [PATCH] GenerateNativeDll task: use file name from nuget Use the `libgit2_filename.txt` from the NuGet package instead of trying to derive it based on the hash. --- Lib/CustomBuildTasks/CustomBuildTasks.dll | Bin 5632 -> 5632 bytes .../GenerateNativeDllNameTask.cs | 10 ++++------ LibGit2Sharp/NativeDllName.targets | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Lib/CustomBuildTasks/CustomBuildTasks.dll b/Lib/CustomBuildTasks/CustomBuildTasks.dll index a6f06156ca56180bbaf935a8fa4ac945ef1577ab..cd763a2e1f68224c340f3227de3ac40a5cf78be8 100644 GIT binary patch literal 5632 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 CClLbx diff --git a/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs b/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs index f68724978..9b31fba34 100644 --- a/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs +++ b/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs @@ -14,27 +14,25 @@ public class GenerateNativeDllNameTask : Task public override bool Execute() { var fileName = InputHashFile.GetMetadata("FullPath"); - string hash; + string libgit2FileName; using (var sr = new StreamReader(fileName)) { - hash = sr.ReadLine(); + libgit2FileName = sr.ReadLine(); } - var shortHash = hash.Substring(0, 7); - var nativeDllName = @"namespace LibGit2Sharp.Core {{ internal static class NativeDllName {{ - public const string Name = ""git2-{0}""; + public const string Name = ""{0}""; }} }} "; using (var sw = new StreamWriter(OutputFile)) { - sw.Write(nativeDllName, shortHash); + sw.Write(nativeDllName, libgit2FileName); } return true; diff --git a/LibGit2Sharp/NativeDllName.targets b/LibGit2Sharp/NativeDllName.targets index 33261d59e..a6afed504 100644 --- a/LibGit2Sharp/NativeDllName.targets +++ b/LibGit2Sharp/NativeDllName.targets @@ -14,7 +14,7 @@ - +