Update to NativeBinaries 1.0.137

Update to NativeBinaries 1.0.137, update paths to `lib` from `NativeBinaries`. Update name of Windows 64-bit library to 'x64' to reflect Microsoft's recommended naming.

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/GlobalSettingsFixture.cs

@@ -19,7 +19,7 @@ public void CanGetMinimumCompiledInFeatures()
 publicvoidCanRetrieveValidVersionString()
 {
 // Version string format is:
-// Major.Minor.Patch[-preDateTime]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)
+// Major.Minor.Patch[-preDateTime]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|x64 - features)
 // Example output:
 // "0.17.0[-pre20170914123547]-deadcafe-06d772d (x86 - Threads, Https)"
 
@@ -29,7 +29,7 @@ public void CanRetrieveValidVersionString()
 // version: '0.17.0[-pre20170914123547]' LibGit2Sharp version number.
 // git2SharpHash:'unknown' ( when compiled from source ) else LibGit2Sharp library hash.
 // git2hash: '06d772d' LibGit2 library hash.
-// arch: 'x86' or 'amd64' LibGit2 target.
+// arch: 'x86' or 'x64' LibGit2 target.
 // git2Features: 'Threads, Ssh' LibGit2 features compiled with.
 stringregex=@"^(?<version>\d{1,}\.\d{1,2}\.\d{1,3}(-(pre|dev)\d{14})?)-(?<git2SharpHash>\w+)-(?<git2Hash>\w+) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
 
@@ -38,7 +38,7 @@ public void CanRetrieveValidVersionString()
 MatchregexResult=Regex.Match(versionInfo,regex);
 
 Assert.True(regexResult.Success,"The following version string format is enforced:"+
-"Major.Minor.Patch[-preDateTime]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)");
+"Major.Minor.Patch[-preDateTime]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|x64 - features)");
 
 GroupCollectionmatchGroups=regexResult.Groups;
 

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
 stringcachedAssemblyParentPath=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
 stringsourceAssemblyParentPath=
 Path.GetDirectoryName(newUri(sourceAssembly.EscapedCodeBase).LocalPath);
-Assert.True(Directory.Exists(Path.Combine(sourceAssemblyParentPath,"NativeBinaries")));
+Assert.True(Directory.Exists(Path.Combine(sourceAssemblyParentPath,"lib")));
 }
 
 AppDomain.Unload(domain);

LibGit2Sharp/Core/Platform.cs

@@ -13,7 +13,7 @@ internal static class Platform
 {
 publicstaticstringProcessorArchitecture
 {
-get{returnEnvironment.Is64BitProcess?"amd64":"x86";}
+get{returnEnvironment.Is64BitProcess?"x64":"x86";}
 }
 
 publicstaticOperatingSystemTypeOperatingSystem

LibGit2Sharp/GlobalSettings.cs

@@ -24,7 +24,7 @@ static GlobalSettings()
 if(Platform.OperatingSystem==OperatingSystemType.Windows)
 {
 stringmanagedPath=newUri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath;
-nativeLibraryPath=Path.Combine(Path.GetDirectoryName(managedPath),"NativeBinaries");
+nativeLibraryPath=Path.Combine(Path.Combine(Path.GetDirectoryName(managedPath),"lib"),"win32");
 }
 
 registeredFilters=newDictionary<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"?>
+<?xml version="1.0" encoding="utf-8"?>
 <ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ImportProject="..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props"Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.132\build\LibGit2Sharp.NativeBinaries.props')" />
+ <ImportProject="..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props"Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props')" />
  <PropertyGroup>
  <ConfigurationCondition=" '$(Configuration)' == '' ">Debug</Configuration>
  <PlatformCondition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -79,8 +79,8 @@
  <CompileInclude="Core\GitFetchOptions.cs" />
  <CompileInclude="Core\GitPushUpdate.cs" />
  <CompileInclude="Core\GitSubmoduleIgnore.cs" />
- <CompileInclude="Core\Platform.cs" />
  <CompileInclude="Core\GitWriteStream.cs" />
+ <CompileInclude="Core\Platform.cs" />
  <CompileInclude="Core\WriteStream.cs" />
  <CompileInclude="Core\GitRebaseOperation.cs" />
  <CompileInclude="Core\GitRebaseOptions.cs" />
@@ -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>
- <ErrorCondition="!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'))" />
+ <ErrorCondition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.137\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.
@@ -390,7 +390,5 @@
  <Target Name="AfterBuild">
  </Target>
 -->
- <ItemGroup>
- <FolderInclude="Commands\" />
- </ItemGroup>
+ <ItemGroup />
 </Project>

LibGit2Sharp/Version.cs

@@ -77,7 +77,7 @@ private string RetrieveAbbrevShaFrom(string name)
 /// </summary>
 /// <para>
 /// The format of the version number is as follows:
-/// <para>Major.Minor.Patch-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)</para>
+/// <para>Major.Minor.Patch-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|x64 - features)</para>
 /// </para>
 /// <returns></returns>
 publicoverridestringToString()

LibGit2Sharp/packages.config

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