Skip to content

Commit 98dcc63

Browse files
xoofxxoofx
committed
Use local LibGit2Sharp native libraries in order to workaround issue described in libgit2/libgit2sharp#1170 
1 parent f44bc85 commit 98dcc63

10 files changed

+41
-6
lines changed

‎external/libgit2sharp/LibGit2Sharp.dll

0 Bytes
Binary file not shown.

‎external/libgit2sharp/LibGit2Sharp.dll.config

+2-2
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-4d6362b" target="NativeBinaries/linux/amd64/libgit2-4d6362b.so" />
3-
<dllmap os="osx" cpu="x86,x86-64" dll="git2-4d6362b" target="NativeBinaries/osx/libgit2-4d6362b.dylib" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-4d6362b" target="libsnative/linux/amd64/libgit2-4d6362b.so" />
3+
<dllmap os="osx" cpu="x86,x86-64" dll="git2-4d6362b" target="libsnative/osx/libgit2-4d6362b.dylib" />
44
</configuration>

‎external/libgit2sharp/libsnative/linux/amd64/libgit2-4d6362b.so

1.03 MB
Binary file not shown.

‎external/libgit2sharp/libsnative/osx/libgit2-4d6362b.dylib

1.48 MB
Binary file not shown.

‎external/libgit2sharp/libsnative/windows/amd64/git2-4d6362b.dll

1 MB
Binary file not shown.

‎external/libgit2sharp/libsnative/windows/x86/git2-4d6362b.dll

770 KB
Binary file not shown.

‎src/GitRocketFilter.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" />
4-
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.72\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.72\build\LibGit2Sharp.NativeBinaries.props')" />
54
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +12,7 @@
1312
<AssemblyName>git-rocket-filter</AssemblyName>
1413
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1514
<FileAlignment>512</FileAlignment>
16-
<NuGetPackageImportStamp>413c35cc</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>28d7f87b</NuGetPackageImportStamp>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -72,12 +71,12 @@
7271
<None Include="App.config" />
7372
<None Include="packages.config" />
7473
</ItemGroup>
74+
<Import Project="$(MSBuildThisFileDirectory)\LibGit2Sharp.NativeBinaries.props"/>
7575
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7676
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7777
<PropertyGroup>
7878
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7979
</PropertyGroup>
80-
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.72\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.72\build\LibGit2Sharp.NativeBinaries.props'))" />
8180
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
8281
</Target>
8382
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/LibGit2Sharp.NativeBinaries.props

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\libgit2_hash.txt" />
5+
</ItemGroup>
6+
<ItemGroup>
7+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\amd64\git2-4d6362b.dll')" Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\amd64\git2-4d6362b.dll">
8+
<Link>libsnative\amd64\git2-4d6362b.dll</Link>
9+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10+
</None>
11+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\amd64\git2-4d6362b.pdb')" Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\amd64\git2-4d6362b.pdb">
12+
<Link>libsnative\amd64\git2-4d6362b.pdb</Link>
13+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
14+
</None>
15+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\x86\git2-4d6362b.dll')" Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\x86\git2-4d6362b.dll">
16+
<Link>libsnative\x86\git2-4d6362b.dll</Link>
17+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18+
</None>
19+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\x86\git2-4d6362b.pdb')" Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\windows\x86\git2-4d6362b.pdb">
20+
<Link>libsnative\x86\git2-4d6362b.pdb</Link>
21+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22+
</None>
23+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\osx\libgit2-4d6362b.dylib')" Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\osx\libgit2-4d6362b.dylib">
24+
<Link>libsnative\osx\libgit2-4d6362b.dylib</Link>
25+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26+
</None>
27+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\linux\amd64\libgit2-4d6362b.so')" Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\libsnative\linux\amd64\libgit2-4d6362b.so">
28+
<Link>libsnative\linux\amd64\libgit2-4d6362b.so</Link>
29+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30+
</None>
31+
<None Include="$(MSBuildThisFileDirectory)\..\external\libgit2sharp\LibGit2Sharp.dll.config">
32+
<Link>LibGit2Sharp.dll.config</Link>
33+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
34+
</None>
35+
</ItemGroup>
36+
</Project>

‎src/libgit2_hash.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4d6362b168cdbc7d5b734810f2c81020c2837c4a

‎src/packages.config

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.72" targetFramework="net45" />
43
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net45" />
54
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net45" />
65
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net45" />

0 commit comments

Comments
 (0)