From 4ecb691728d1f6376d2e4985d19164f60c604ef2 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 2 May 2014 13:12:19 +0200 Subject: [PATCH 1/5] Updating targets file to ensure that NativeBinaries are copied to the bin for projects as well as referencing projects. Adding props for collecting native binaries as part of a web publish. --- nuget.package/LibGit2Sharp.nuspec | 2 ++ nuget.package/build/LibGit2Sharp.props | 9 ++++++++ nuget.package/build/LibGit2Sharp.targets | 27 ++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 nuget.package/build/LibGit2Sharp.props create mode 100644 nuget.package/build/LibGit2Sharp.targets diff --git a/nuget.package/LibGit2Sharp.nuspec b/nuget.package/LibGit2Sharp.nuspec index 99c326536..a9b8dc25a 100644 --- a/nuget.package/LibGit2Sharp.nuspec +++ b/nuget.package/LibGit2Sharp.nuspec @@ -23,6 +23,8 @@ + + diff --git a/nuget.package/build/LibGit2Sharp.props b/nuget.package/build/LibGit2Sharp.props new file mode 100644 index 000000000..8216f816f --- /dev/null +++ b/nuget.package/build/LibGit2Sharp.props @@ -0,0 +1,9 @@ + + + + + CollectLibGitNativeBinaries; + $(PipelineCollectFilesPhaseDependsOn); + + + diff --git a/nuget.package/build/LibGit2Sharp.targets b/nuget.package/build/LibGit2Sharp.targets new file mode 100644 index 000000000..afe9c8303 --- /dev/null +++ b/nuget.package/build/LibGit2Sharp.targets @@ -0,0 +1,27 @@ + + + + + + + + <_LibGitFiles Include="..\packages\LibGit2Sharp.0.17.0.0\lib\net40\NativeBinaries\**\*" Condition="'%(_LibGit2SharpReference.FullPath)' != ''" /> + + ..\$(OutDir)NativeBinaries\%(RecursiveDir)%(Filename)%(Extension) + PreserveNewest + + + NativeBinaries\%(RecursiveDir)%(Filename)%(Extension) + PreserveNewest + + + + + + <_LibGitFiles Include="bin\NativeBinaries\**\*" /> + + bin\NativeBinaries\%(RecursiveDir)%(Filename)%(Extension) + + + + From 6e0e9fd62928d796574dfdd354c395717a1a08a9 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 2 May 2014 13:32:42 +0200 Subject: [PATCH 2/5] Correcting identation --- nuget.package/LibGit2Sharp.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nuget.package/LibGit2Sharp.nuspec b/nuget.package/LibGit2Sharp.nuspec index a9b8dc25a..cc503ee68 100644 --- a/nuget.package/LibGit2Sharp.nuspec +++ b/nuget.package/LibGit2Sharp.nuspec @@ -23,8 +23,8 @@ - - + + From 8c8d3eece5cd41a99775c54d59afe30569b1cd32 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 2 May 2014 14:23:04 +0200 Subject: [PATCH 3/5] Removing referenced Tools folder which is no longer used --- nuget.package/LibGit2Sharp.nuspec | 1 - 1 file changed, 1 deletion(-) diff --git a/nuget.package/LibGit2Sharp.nuspec b/nuget.package/LibGit2Sharp.nuspec index cc503ee68..141733478 100644 --- a/nuget.package/LibGit2Sharp.nuspec +++ b/nuget.package/LibGit2Sharp.nuspec @@ -22,7 +22,6 @@ - From 291a5c6a4c74139a506114d01faedb4c4d59f891 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 2 May 2014 15:22:50 +0200 Subject: [PATCH 4/5] Removing powershell scripts which are no longer used in the nuget package. --- nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 | 13 ------------- nuget.package/Tools/install.ps1 | 11 ----------- nuget.package/Tools/uninstall.ps1 | 9 --------- 3 files changed, 33 deletions(-) delete mode 100644 nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 delete mode 100644 nuget.package/Tools/install.ps1 delete mode 100644 nuget.package/Tools/uninstall.ps1 diff --git a/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 b/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 deleted file mode 100644 index e1847e610..000000000 --- a/nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -$solutionDir = [System.IO.Path]::GetDirectoryName($dte.Solution.FullName) + "\" -$path = $installPath.Replace($solutionDir, "`$(SolutionDir)") - -$NativeAssembliesDir = Join-Path $path "lib\net40\NativeBinaries" -$x86 = $(Join-Path $NativeAssembliesDir "x86\*.*") -$x64 = $(Join-Path $NativeAssembliesDir "amd64\*.*") - -$LibGit2SharpPostBuildCmd = " -if not exist `"`$(TargetDir)NativeBinaries`" md `"`$(TargetDir)NativeBinaries`" -if not exist `"`$(TargetDir)NativeBinaries\x86`" md `"`$(TargetDir)NativeBinaries\x86`" -xcopy /s /y /d `"$x86`" `"`$(TargetDir)NativeBinaries\x86`" -if not exist `"`$(TargetDir)NativeBinaries\amd64`" md `"`$(TargetDir)NativeBinaries\amd64`" -xcopy /s /y /d `"$x64`" `"`$(TargetDir)NativeBinaries\amd64`"" diff --git a/nuget.package/Tools/install.ps1 b/nuget.package/Tools/install.ps1 deleted file mode 100644 index bc403c27b..000000000 --- a/nuget.package/Tools/install.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -. (Join-Path $toolsPath "GetLibGit2SharpPostBuildCmd.ps1") - -# Get the current Post Build Event cmd -$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value - -# Append our post build command if it's not already there -if (!$currentPostBuildCmd.Contains($LibGit2SharpPostBuildCmd)) { - $project.Properties.Item("PostBuildEvent").Value += $LibGit2SharpPostBuildCmd -} \ No newline at end of file diff --git a/nuget.package/Tools/uninstall.ps1 b/nuget.package/Tools/uninstall.ps1 deleted file mode 100644 index a1854cb32..000000000 --- a/nuget.package/Tools/uninstall.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -. (Join-Path $toolsPath "GetLibGit2SharpPostBuildCmd.ps1") - -# Get the current Post Build Event cmd -$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value - -# Remove our post build command from it (if it's there) -$project.Properties.Item("PostBuildEvent").Value = $currentPostBuildCmd.Replace($LibGit2SharpPostBuildCmd, "") \ No newline at end of file From 1c737dab53b03e3fcd9d79b951f1741228c4974b Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Mon, 19 May 2014 16:42:34 +0200 Subject: [PATCH 5/5] Using MSBuildThisFileDirectory to avoid hard ref to path --- nuget.package/build/LibGit2Sharp.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget.package/build/LibGit2Sharp.targets b/nuget.package/build/LibGit2Sharp.targets index afe9c8303..c4594c576 100644 --- a/nuget.package/build/LibGit2Sharp.targets +++ b/nuget.package/build/LibGit2Sharp.targets @@ -5,7 +5,7 @@ - <_LibGitFiles Include="..\packages\LibGit2Sharp.0.17.0.0\lib\net40\NativeBinaries\**\*" Condition="'%(_LibGit2SharpReference.FullPath)' != ''" /> + <_LibGitFiles Include="$(MSBuildThisFileDirectory)..\lib\net40\NativeBinaries\**\*" Condition="'%(_LibGit2SharpReference.FullPath)' != ''" /> ..\$(OutDir)NativeBinaries\%(RecursiveDir)%(Filename)%(Extension) PreserveNewest