Update to NativeBinaries 1.0.135

Update to NativeBinaries 1.0.135, update paths to `lib` from
`NativeBinaries`.

Author: Edward Thomson

CI/build.msbuild

@@ -49,10 +49,10 @@
         DestinationFiles="@(OutputFiles->'$(DeployFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
 
     <ItemGroup>
-      <NativeBinaries Include="$(TestBuildDir)\NativeBinaries\**\*.*" />
+      <NativeBinaries Include="$(TestBuildDir)\lib\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(NativeBinaries)"
-      DestinationFiles="@(NativeBinaries->'$(DeployFolder)\NativeBinaries\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+      DestinationFiles="@(NativeBinaries->'$(DeployFolder)\lib\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
   </Target>
 </Project>

LibGit2Sharp.Tests/ShadowCopyFixture.cs

@@ -59,14 +59,14 @@ public void CanProbeForNativeBinariesFromAShadowCopiedAssembly()
 
             if (!Constants.IsRunningOnUnix)
             {
-                // ...that this cache doesn't contain the `NativeBinaries` folder
+                // ...that this cache doesn't contain the `lib` folder
                 string cachedAssemblyParentPath = Path.GetDirectoryName(cachedAssemblyLocation);
-                Assert.False(Directory.Exists(Path.Combine(cachedAssemblyParentPath, "NativeBinaries")));
+                Assert.False(Directory.Exists(Path.Combine(cachedAssemblyParentPath, "lib")));
 
-                // ...whereas `NativeBinaries` of course exists next to the source assembly
+                // ...whereas `lib` of course exists next to the source assembly
                 string sourceAssemblyParentPath =
                     Path.GetDirectoryName(new Uri(sourceAssembly.EscapedCodeBase).LocalPath);
-                Assert.True(Directory.Exists(Path.Combine(sourceAssemblyParentPath, "NativeBinaries")));
+                Assert.True(Directory.Exists(Path.Combine(sourceAssemblyParentPath, "lib")));
             }
 
             AppDomain.Unload(domain);

LibGit2Sharp/GlobalSettings.cs

@@ -24,7 +24,7 @@ static GlobalSettings()
             if (Platform.OperatingSystem == OperatingSystemType.Windows)
             {
                 string managedPath = new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath;
-                nativeLibraryPath = Path.Combine(Path.GetDirectoryName(managedPath), "NativeBinaries");
+                nativeLibraryPath = Path.Combine(Path.Combine(Path.GetDirectoryName(managedPath), "lib"), "win32");
             }
 
             registeredFilters = new Dictionary<Filter, FilterRegistration>();
@@ -129,10 +129,10 @@ public static LogConfiguration LogConfiguration
         /// <summary>
         /// Sets a hint path for searching for native binaries: when
         /// specified, native binaries will first be searched in a
-        /// subdirectory of the given path corresponding to the architecture
-        /// (eg, "x86" or "amd64") before falling back to the default
-        /// path ("NativeBinaries\x86" or "NativeBinaries\amd64" next
-        /// to the application).
+        /// subdirectory of the given path corresponding to the operating
+        /// system and architecture (eg, "x86" or "x64") before falling
+        /// back to the default path ("lib\win32\x86" or "lib\win32\x64"
+        /// next to the application).
         /// <para>
         /// This must be set before any other calls to the library,
         /// and is not available on Unix platforms: see your dynamic

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.135\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.135\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -381,7 +381,7 @@
     <PropertyGroup>
       <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>
     </PropertyGroup>
-    <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'))" />
+    <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'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

LibGit2Sharp/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.132" targetFramework="net4" allowedVersions="[1.0.132]" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.135" targetFramework="net4" allowedVersions="[1.0.135]" />
 </packages>