Skip to content

Commit 5f856a7

Browse files
committed
Update props and config file for new RIDs
1 parent e423248 commit 5f856a7

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

UpdateLibgit2ToSha.ps1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,12 @@ Push-Location $libgit2Directory
115115
<Link>lib\osx\lib$binaryFilename.dylib</Link>
116116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117117
</None>
118-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\lib$binaryFilename.so">
119-
<Link>lib\linux\x86_64\lib$binaryFilename.so</Link>
118+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\lib$binaryFilename.so">
119+
<Link>lib\ubuntu-x64\lib$binaryFilename.so</Link>
120+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121+
</None>
122+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\lib$binaryFilename.so">
123+
<Link>lib\centos-x64\lib$binaryFilename.so</Link>
120124
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121125
</None>
122126
<None Include="`$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
@@ -131,7 +135,7 @@ Push-Location $libgit2Directory
131135

132136
$dllConfig = @"
133137
<configuration>
134-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/linux/x86_64/lib$binaryFilename.so" />
138+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/ubuntu-x64/lib$binaryFilename.so" />
135139
<dllmap os="osx" cpu="x86,x86-64" dll="$binaryFilename" target="lib/osx/lib$binaryFilename.dylib" />
136140
</configuration>
137141
"@

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
<Link>lib\osx\libgit2-1196807.dylib</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
24-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-1196807.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-1196807.so">
25-
<Link>lib\linux\x86_64\libgit2-1196807.so</Link>
24+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\libgit2-1196807.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu-x64\native\libgit2-1196807.so">
25+
<Link>lib\ubuntu-x64\libgit2-1196807.so</Link>
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
</None>
28+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\libgit2-1196807.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\centos-x64\native\libgit2-1196807.so">
29+
<Link>lib\centos-x64\libgit2-1196807.so</Link>
2630
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2731
</None>
2832
<None Include="$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<configuration>
2-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-1196807" target="lib/linux/x86_64/libgit2-1196807.so" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-1196807" target="lib/ubuntu-x64/libgit2-1196807.so" />
33
<dllmap os="osx" cpu="x86,x86-64" dll="git2-1196807" target="lib/osx/libgit2-1196807.dylib" />
44
</configuration>

0 commit comments

Comments
 (0)