From d54f395e076d3f81a720b356d9869d9d93298345 Mon Sep 17 00:00:00 2001
From: nulltoken <emeric.fermas@gmail.com>
Date: Fri, 20 Sep 2013 17:33:09 +0200
Subject: [PATCH] Make probing work from within the packages folder

Fix #515

This aligns the package content to the deployment layout and thus
allows usage of the LibGit2Sharp assembly directly from within the
unpacked NuGet folder.
---
 nuget.package/LibGit2Sharp.nuspec                   | 9 ++++++---
 nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nuget.package/LibGit2Sharp.nuspec b/nuget.package/LibGit2Sharp.nuspec
index 85805227f..3bacd546a 100644
--- a/nuget.package/LibGit2Sharp.nuspec
+++ b/nuget.package/LibGit2Sharp.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>
@@ -12,10 +12,13 @@
     <releaseNotes>https://github.com/libgit2/libgit2sharp/blob/master/CHANGES.md#libgit2sharp-changes</releaseNotes>
     <iconUrl>https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png</iconUrl>
     <tags>libgit2 git wrapper bindings API dvcs vcs</tags>
+    <references>
+      <reference file="LibGit2Sharp.dll" />
+    </references>
   </metadata>
   <files>
-    <file src="..\Lib\NativeBinaries\**\*.dll" target="NativeBinaries" />
-    <file src="..\Lib\NativeBinaries\**\*.pdb" target="NativeBinaries" />
+    <file src="..\Lib\NativeBinaries\**\*.dll" target="lib\net35\NativeBinaries" />
+    <file src="..\Lib\NativeBinaries\**\*.pdb" target="lib\net35\NativeBinaries" />
     <file src="..\README.md" target="App_Readme\LibGit2Sharp.README.md" />
     <file src="..\LICENSE.md" target="App_Readme\LibGit2Sharp.LICENSE.md" />
     <file src="..\CHANGES.md" target="App_Readme\LibGit2Sharp.CHANGES.md" />
diff --git a/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 b/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1
index 6d4a41fa2..eb32fe37d 100644
--- a/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1
+++ b/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1
@@ -1,7 +1,7 @@
 $solutionDir = [System.IO.Path]::GetDirectoryName($dte.Solution.FullName) + "\"
 $path = $installPath.Replace($solutionDir, "`$(SolutionDir)")
 
-$NativeAssembliesDir = Join-Path $path "NativeBinaries"
+$NativeAssembliesDir = Join-Path $path "lib\net35\NativeBinaries"
 $x86 = $(Join-Path $NativeAssembliesDir "x86\*.*")
 $x64 = $(Join-Path $NativeAssembliesDir "amd64\*.*")