Skip to content

Commit bf93cba

Browse files
committed
Use a build properties file instead of custom build actions to copy native binaries
1 parent f3a6b7e commit bf93cba

7 files changed

+49
-34
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ _ReSharper*/
3939
LibGit2Sharp/Core/UniqueIdentifier.cs
4040

4141
!Lib/NativeBinaries/*/*.pdb
42+
!nuget.package/build/
4243
_NCrunch_LibGit2Sharp/

UpdateLibgit2ToSha.ps1

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,32 @@ namespace LibGit2Sharp.Core
181181
sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp\Core\NativeDllName.cs") $dllNameClass
182182
sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp\libgit2_hash.txt") $sha
183183

184+
$buildProperties = @"
185+
<?xml version="1.0" encoding="utf-8"?>
186+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
187+
<ItemGroup>
188+
<None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\$binaryFilename.dll">
189+
<Link>NativeBinaries\amd64\$binaryFilename.dll</Link>
190+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
191+
</None>
192+
<None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\$binaryFilename.pdb">
193+
<Link>NativeBinaries\amd64\$binaryFilename.pdb</Link>
194+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
195+
</None>
196+
<None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\$binaryFilename.dll">
197+
<Link>NativeBinaries\x86\$binaryFilename.dll</Link>
198+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
199+
</None>
200+
<None Include="`$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\$binaryFilename.pdb">
201+
<Link>NativeBinaries\x86\$binaryFilename.pdb</Link>
202+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
203+
</None>
204+
</ItemGroup>
205+
</Project>
206+
"@
207+
208+
sc -Encoding UTF8 (Join-Path $libgit2sharpDirectory "nuget.package\build\LibGit2Sharp.props") $buildProperties
209+
184210
Write-Output "Done!"
185211
}
186212
exit

nuget.package/LibGit2Sharp.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<file src="..\README.md" target="App_Readme\LibGit2Sharp.README.md" />
2323
<file src="..\LICENSE.md" target="App_Readme\LibGit2Sharp.LICENSE.md" />
2424
<file src="..\CHANGES.md" target="App_Readme\LibGit2Sharp.CHANGES.md" />
25-
<file src="..\nuget.package\Tools\*.*" target="Tools" />
25+
<file src="..\nuget.package\build\*.*" target="build\net40" />
2626
<file src="..\Lib\NativeBinaries\libgit2.license.txt" target="App_Readme" />
2727
</files>
2828
</package>

nuget.package/Tools/GetLibGit2SharpPostBuildCmd.ps1

Lines changed: 0 additions & 13 deletions
This file was deleted.

nuget.package/Tools/install.ps1

Lines changed: 0 additions & 11 deletions
This file was deleted.

nuget.package/Tools/uninstall.ps1

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-69db893.dll">
5+
<Link>NativeBinaries\amd64\git2-69db893.dll</Link>
6+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7+
</None>
8+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-69db893.pdb">
9+
<Link>NativeBinaries\amd64\git2-69db893.pdb</Link>
10+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11+
</None>
12+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-69db893.dll">
13+
<Link>NativeBinaries\x86\git2-69db893.dll</Link>
14+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15+
</None>
16+
<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-69db893.pdb">
17+
<Link>NativeBinaries\x86\git2-69db893.pdb</Link>
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</None>
20+
</ItemGroup>
21+
</Project>

0 commit comments

Comments
 (0)