diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-08-25 20:28:25 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2016-01-25 14:35:19 +0300 |
| commit | df63cc98a32719d60a2804d59ea4e3970dedff63 (patch) | |
| tree | 855d062cf158e597d90ade1c46f66fbd37bda0fa | |
| parent | ecb1021662ccad58a15c88510b3b62822fc78d9c (diff) | |
Revert "GenerateNativeDll task: use file name from nuget"
This reverts commit 0328d59c054b3957021b461b5064bf43742ad465.
| -rw-r--r-- | Lib/CustomBuildTasks/CustomBuildTasks.dll | bin | 5632 -> 5632 bytes | |||
| -rw-r--r-- | Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs | 10 | ||||
| -rw-r--r-- | LibGit2Sharp/NativeDllName.targets | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Lib/CustomBuildTasks/CustomBuildTasks.dll b/Lib/CustomBuildTasks/CustomBuildTasks.dll Binary files differindex cd763a2e..a6f06156 100644 --- a/Lib/CustomBuildTasks/CustomBuildTasks.dll +++ b/Lib/CustomBuildTasks/CustomBuildTasks.dll diff --git a/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs b/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs index 9b31fba3..f6872497 100644 --- a/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs +++ b/Lib/CustomBuildTasks/GenerateNativeDllNameTask.cs @@ -14,25 +14,27 @@ namespace CustomBuildTasks public override bool Execute()
{
var fileName = InputHashFile.GetMetadata("FullPath");
- string libgit2FileName;
+ string hash;
using (var sr = new StreamReader(fileName))
{
- libgit2FileName = sr.ReadLine();
+ hash = sr.ReadLine();
}
+ var shortHash = hash.Substring(0, 7);
+
var nativeDllName = @"namespace LibGit2Sharp.Core
{{
internal static class NativeDllName
{{
- public const string Name = ""{0}"";
+ public const string Name = ""git2-{0}"";
}}
}}
";
using (var sw = new StreamWriter(OutputFile))
{
- sw.Write(nativeDllName, libgit2FileName);
+ sw.Write(nativeDllName, shortHash);
}
return true;
diff --git a/LibGit2Sharp/NativeDllName.targets b/LibGit2Sharp/NativeDllName.targets index a6afed50..33261d59 100644 --- a/LibGit2Sharp/NativeDllName.targets +++ b/LibGit2Sharp/NativeDllName.targets @@ -14,7 +14,7 @@ <Target Name="GenerateNativeDllNameCs" Inputs="@(EmbeddedResource)" Outputs="$(NativeDllNamePath)"> - <GenerateNativeDllNameTask InputHashFile="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_filename.txt' " OutputFile="$(NativeDllNamePath)" /> + <GenerateNativeDllNameTask InputHashFile="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_hash.txt' " OutputFile="$(NativeDllNamePath)" /> </Target> <Target Name="CleanNativeDllNameCs"> |