Skip to content

Commit b2773f7

Browse files
author
Edward Thomson
committed
Update to NativeBinaries 1.0.135
Update to NativeBinaries 1.0.135, update paths to `lib` from `NativeBinaries`.
1 parent 68d9be9 commit b2773f7

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

CI/build.msbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
DestinationFiles="@(OutputFiles->'$(DeployFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
5050

5151
<ItemGroup>
52-
<NativeBinaries Include="$(TestBuildDir)\NativeBinaries\**\*.*" />
52+
<NativeBinaries Include="$(TestBuildDir)\lib\**\*.*" />
5353
</ItemGroup>
5454

5555
<Copy SourceFiles="@(NativeBinaries)"
56-
DestinationFiles="@(NativeBinaries->'$(DeployFolder)\NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
56+
DestinationFiles="@(NativeBinaries->'$(DeployFolder)\lib\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
5757
</Target>
5858
</Project>

LibGit2Sharp.Tests/ShadowCopyFixture.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ public void CanProbeForNativeBinariesFromAShadowCopiedAssembly()
5959

6060
if (!Constants.IsRunningOnUnix)
6161
{
62-
// ...that this cache doesn't contain the `NativeBinaries` folder
62+
// ...that this cache doesn't contain the `lib` folder
6363
string cachedAssemblyParentPath = Path.GetDirectoryName(cachedAssemblyLocation);
64-
Assert.False(Directory.Exists(Path.Combine(cachedAssemblyParentPath, "NativeBinaries")));
64+
Assert.False(Directory.Exists(Path.Combine(cachedAssemblyParentPath, "lib")));
6565

66-
// ...whereas `NativeBinaries` of course exists next to the source assembly
66+
// ...whereas `lib` of course exists next to the source assembly
6767
string sourceAssemblyParentPath =
6868
Path.GetDirectoryName(new Uri(sourceAssembly.EscapedCodeBase).LocalPath);
69-
Assert.True(Directory.Exists(Path.Combine(sourceAssemblyParentPath, "NativeBinaries")));
69+
Assert.True(Directory.Exists(Path.Combine(sourceAssemblyParentPath, "lib")));
7070
}
7171

7272
AppDomain.Unload(domain);

LibGit2Sharp/GlobalSettings.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static GlobalSettings()
2424
if (Platform.OperatingSystem == OperatingSystemType.Windows)
2525
{
2626
string managedPath = new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath;
27-
nativeLibraryPath = Path.Combine(Path.GetDirectoryName(managedPath), "NativeBinaries");
27+
nativeLibraryPath = Path.Combine(Path.Combine(Path.GetDirectoryName(managedPath), "lib"), "win32");
2828
}
2929

3030
registeredFilters = new Dictionary<Filter, FilterRegistration>();
@@ -129,10 +129,10 @@ public static LogConfiguration LogConfiguration
129129
/// <summary>
130130
/// Sets a hint path for searching for native binaries: when
131131
/// specified, native binaries will first be searched in a
132-
/// subdirectory of the given path corresponding to the architecture
133-
/// (eg, "x86" or "amd64") before falling back to the default
134-
/// path ("NativeBinaries\x86" or "NativeBinaries\amd64" next
135-
/// to the application).
132+
/// subdirectory of the given path corresponding to the operating
133+
/// system and architecture (eg, "x86" or "x64") before falling
134+
/// back to the default path ("lib\win32\x86" or "lib\win32\x64"
135+
/// next to the application).
136136
/// <para>
137137
/// This must be set before any other calls to the library,
138138
/// and is not available on Unix platforms: see your dynamic

LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props')" />
3+
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.135\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.135\build\LibGit2Sharp.NativeBinaries.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -381,7 +381,7 @@
381381
<PropertyGroup>
382382
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
383383
</PropertyGroup>
384-
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props'))" />
384+
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.135\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.135\build\LibGit2Sharp.NativeBinaries.props'))" />
385385
</Target>
386386
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
387387
Other similar extension points exist, see Microsoft.Common.targets.

LibGit2Sharp/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.132" targetFramework="net4" allowedVersions="[1.0.132]" />
3+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.135" targetFramework="net4" allowedVersions="[1.0.135]" />
44
</packages>

0 commit comments

Comments
 (0)