Skip to content

Commit c9feb25

Browse files
bordingbording
committed
Move embedded files to contentFiles
Props file now only for net40
1 parent a5d6454 commit c9feb25

File tree

12 files changed

+23
-37
lines changed

12 files changed

+23
-37
lines changed

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
*.dylib
55
*.so
66
*.zip
7-
8-
# nuget package placeholder
9-
*.here

‎NuGet.exe‎

-1.59 MB
Binary file not shown.

‎UpdateLibgit2ToSha.ps1‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,50 +88,46 @@ Push-Location $libgit2Directory
8888
$binaryFilename = "git2-" + $sha.Substring(0,7)
8989
}
9090

91-
sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt") $sha
92-
sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\libgit2\libgit2_filename.txt") $binaryFilename
91+
sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\contentFiles\any\any\libgit2_hash.txt") $sha
92+
sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\contentFiles\any\any\libgit2_filename.txt") $binaryFilename
9393

9494
$buildProperties = @"
9595
<?xml version="1.0" encoding="utf-8"?>
9696
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
9797
<ItemGroup>
98-
<EmbeddedResource Include="`$(MSBuildThisFileDirectory)\..\libgit2\libgit2_hash.txt" />
99-
<EmbeddedResource Include="`$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
100-
</ItemGroup>
101-
<ItemGroup>
102-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.dll">
98+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.dll">
10399
<Link>lib\win32\x64\$binaryFilename.dll</Link>
104100
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105101
</None>
106-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\$binaryFilename.pdb">
102+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\$binaryFilename.pdb">
107103
<Link>lib\win32\x64\$binaryFilename.pdb</Link>
108104
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109105
</None>
110-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.dll">
106+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.dll">
111107
<Link>lib\win32\x86\$binaryFilename.dll</Link>
112108
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113109
</None>
114-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\$binaryFilename.pdb">
110+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\$binaryFilename.pdb">
115111
<Link>lib\win32\x86\$binaryFilename.pdb</Link>
116112
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117113
</None>
118-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\osx\native\lib$binaryFilename.dylib')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\osx\native\lib$binaryFilename.dylib">
114+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\lib$binaryFilename.dylib')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\lib$binaryFilename.dylib">
119115
<Link>lib\osx\lib$binaryFilename.dylib</Link>
120116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121117
</None>
122-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\lib$binaryFilename.so">
118+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\lib$binaryFilename.so">
123119
<Link>lib\linux\x86_64\lib$binaryFilename.so</Link>
124120
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
125121
</None>
126-
<None Include="`$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
122+
<None Include="`$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
127123
<Link>LibGit2Sharp.dll.config</Link>
128124
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
129125
</None>
130126
</ItemGroup>
131127
</Project>
132128
"@
133129

134-
sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.props") $buildProperties
130+
sc -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net40\LibGit2Sharp.NativeBinaries.props") $buildProperties
135131

136132
$dllConfig = @"
137133
<configuration>

‎build.libgit2.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $projectDirectory = Split-Path $MyInvocation.MyCommand.Path
2222
$libgit2Directory = Join-Path $projectDirectory "libgit2"
2323
$x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x86\native"
2424
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x64\native"
25-
$hashFile = Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt"
25+
$hashFile = Join-Path $projectDirectory "nuget.package\contentFiles\any\any\libgit2_hash.txt"
2626
$sha = Get-Content $hashFile
2727

2828
if (![string]::IsNullOrEmpty($libgit2Name)) {

‎build.libgit2.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
LIBGIT2SHA=`cat ./nuget.package/libgit2/libgit2_hash.txt`
3+
LIBGIT2SHA=`cat ./nuget.package/contentFiles/any/any/libgit2_hash.txt`
44
SHORTSHA=${LIBGIT2SHA:0:7}
55

66
rm -rf libgit2/build

‎buildpackage.ps1‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,21 @@ $linuxDirectory = Join-Path $projectDirectory "nuget.package\runtimes\linux-x64\
1717
if ( -Not (Test-Path $x86Directory\*.dll) )
1818
{
1919
mkdir -fo $x86Directory > $null
20-
Set-Content $x86Directory\addbinaries.here $null
2120
}
2221

2322
if ( -Not (Test-Path $x64Directory\*.dll) )
2423
{
2524
mkdir -fo $x64Directory > $null
26-
Set-Content $x64Directory\addbinaries.here $null
2725
}
2826

2927
if ( -Not (Test-Path $osxDirectory\*.dylib) )
3028
{
3129
mkdir -fo $osxDirectory > $null
32-
Set-Content $osxDirectory\addbinaries.here $null
3330
}
3431

3532
if ( -Not (Test-Path $linuxDirectory\*.so) )
3633
{
3734
mkdir -fo $linuxDirectory > $null
38-
Set-Content $linuxDirectory\addbinaries.here $null
3935
}
4036

41-
.\Nuget.exe Pack nuget.package\NativeBinaries.nuspec -Version $version$versionSuffix -NoPackageAnalysis
37+
.\nuget.exe Pack nuget.package\NativeBinaries.nuspec -Version $version$versionSuffix -NoPackageAnalysis

‎download.build.artifacts.and.package.ps1‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ Add-Type -assembly "System.Io.Compression.Filesystem"
137137

138138
Write-Host -ForegroundColor "Yellow" "Including non Windows build artifacts"
139139
Move-Item "$($linuxBins.FullName).ext\libgit2\linux-x64\native\*.so" "$($package.FullName).ext\runtimes\linux-x64\native"
140-
Remove-Item "$($package.FullName).ext\runtimes\linux-x64\native\addbinaries.here"
141140
Move-Item "$($osxBins.FullName).ext\libgit2\osx\native\*.dylib" "$($package.FullName).ext\runtimes\osx\native"
142-
Remove-Item "$($package.FullName).ext\runtimes\osx\native\addbinaries.here"
143141

144142
Write-Host -ForegroundColor "Yellow" "Building final NuGet package"
145143
Push-location "$($package.FullName).ext"

‎nuget.exe‎

4.38 MB
Binary file not shown.

‎nuget.package/NativeBinaries.nuspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@
1010
<iconUrl>https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Native binaries for LibGit2Sharp</description>
13+
<contentFiles>
14+
<files include="**/*" buildAction="EmbeddedResource" />
15+
</contentFiles>
1316
</metadata>
1417
</package>

nuget.package/build/LibGit2Sharp.NativeBinaries.props renamed to nuget.package/build/net40/LibGit2Sharp.NativeBinaries.props

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_hash.txt" />
5-
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
6-
</ItemGroup>
7-
<ItemGroup>
8-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-15e1193.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-15e1193.dll">
4+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-15e1193.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-15e1193.dll">
95
<Link>lib\win32\x64\git2-15e1193.dll</Link>
106
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117
</None>
12-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-15e1193.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x64\native\git2-15e1193.pdb">
8+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-15e1193.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x64\native\git2-15e1193.pdb">
139
<Link>lib\win32\x64\git2-15e1193.pdb</Link>
1410
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1511
</None>
16-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-15e1193.dll')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-15e1193.dll">
12+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-15e1193.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-15e1193.dll">
1713
<Link>lib\win32\x86\git2-15e1193.dll</Link>
1814
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1915
</None>
20-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-15e1193.pdb')" Include="$(MSBuildThisFileDirectory)\..\runtimes\win7-x86\native\git2-15e1193.pdb">
16+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-15e1193.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win7-x86\native\git2-15e1193.pdb">
2117
<Link>lib\win32\x86\git2-15e1193.pdb</Link>
2218
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2319
</None>
24-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-15e1193.dylib')" Include="$(MSBuildThisFileDirectory)\..\runtimes\osx\native\libgit2-15e1193.dylib">
20+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\libgit2-15e1193.dylib')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\libgit2-15e1193.dylib">
2521
<Link>lib\osx\libgit2-15e1193.dylib</Link>
2622
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2723
</None>
28-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-15e1193.so')" Include="$(MSBuildThisFileDirectory)\..\runtimes\linux-x64\native\libgit2-15e1193.so">
24+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-15e1193.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-15e1193.so">
2925
<Link>lib\linux\x86_64\libgit2-15e1193.so</Link>
3026
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3127
</None>
32-
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
28+
<None Include="$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
3329
<Link>LibGit2Sharp.dll.config</Link>
3430
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3531
</None>

0 commit comments

Comments
 (0)