Merge remote-tracking branch 'upstream/master' into cmn/inmemory

Author: carlosmn

.gitattributes

@@ -3,5 +3,3 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union

.gitignore

@@ -13,6 +13,7 @@ Thumbs.db
 *_p.c
 *.ncb
 *.suo
+.vs/
 *.sln.ide/
 *.tlb
 *.tlh
@@ -37,8 +38,8 @@ _ReSharper*/
 *.DotSettings
 #Ignore custom generated files
 LibGit2Sharp/Core/UniqueIdentifier.cs
+LibGit2Sharp/Core/NativeDllName.cs
 
-!Lib/NativeBinaries/*/*.pdb
 !nuget.package/build/
 _NCrunch_LibGit2Sharp/
 packages/

.gitmodules

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runners" version="1.9.2" />
+  <package id="xunit.runner.console" version="2.0.0" />
+  <package id="xunit.runner.msbuild" version="2.0.0" />
 </packages>

.nuget/packages.config

@@ -1,20 +1,25 @@
 # Travis-CI Build for libgit2sharp
 # see travis-ci.org for details
 
-language: c
+language: csharp
+mono:
+ - 3.12.0
+ - 4.2.3
 
 os:
  - osx
  - linux
 
+env:
+ global:
+  - MONO_OPTIONS=--debug
+
 before_install:
  - date -u
  - uname -a
- - export PATH=/opt/mono/bin:$PATH
  - env | sort
 
-# Make sure CMake and Mono are installed
-install: ./CI/travis.${TRAVIS_OS_NAME}.install.deps.sh
+solution: LibGit2Sharp.sln
 
 # Build libgit2, LibGit2Sharp and run the tests
 script:

.travis.yml

@@ -10,6 +10,72 @@
   - Windows (x86/amd64): <https://ci.appveyor.com/project/libgit2/libgit2sharp>
   - Linux/Mac OS X: <https://travis-ci.org/libgit2/libgit2sharp>
 
+## v0.22 + 1
+
+### Additions
+
+### Changes
+
+ - The native libraries are now expected to be in the `lib` directory,
+   instead of `NativeBinaries` for improved mono compatibility.  In
+   addition, the names of platform architectures now better reflect
+   the vendor naming (eg, `x86_64` instead of `amd64` on Linux).
+ - Obsolete the config paths in RepositoryOptions
+
+### Fixes
+
+## v0.22 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.21.1...v0.22))
+
+### Additions
+
+ - Add CustomHeaders in the push options (#1217)
+ - Expose the minimal diff algorithm (#1229)
+ - Expose Reset() with checkout options (#1219)
+ - Add a prettify option to history rewrite options (#1185)
+ - Add option to describe to only follow the first parent (#1190)
+ - Allow setting the config search path (#1123)
+ - Provide access to the remote's host HTTPS certificate (#1134)
+ - Add support for rebase (#964)
+ - ListReferences() now accepts a credentials provider (#1099)
+ - Introduce FileStatus.Conflicted and introduce staging of conflicts (#1062)
+ - Support streaming filters written in C# (#1030)
+ - Add support for the pre-push callback (#1061)
+ - Add support for listing remote references without a Repository instance (#1065)
+ - Add StashCollection.Apply() and .Pop() (#1068)
+ - Support retrieving a configuration for a repository without instantiating it (#1042)
+ - Implement 'log --follow'-like functionality (#963)
+ - Introduce in-memory merging via Repository.MergeCommits() (#990)
+ - Allow setting whether to prune during a fetch (#1258)
+
+### Changes
+
+ - Deprecate MergeConflictException in a backwards-compatible way (#1243)
+ - Improve type safety in the generic type for Diff.Compare() (#1180)
+ - Obsolete Repository.Commit(), NoteCollection.Add() and
+   NoteCollection.Remove() overloads which do not require a signature (#1173)
+ - BuildSignature() no longer tries to build a signature from the
+   environment if there is none configured (#1171)
+ - Rename the commit walker's Since to IncludeReachableFrom and Until to ExcludeReachableFrom (#1069)
+ - Rename MergeConflictException to CheckoutConflictException to more
+   accurately reflect what it means (#1059)
+ - Specify the diff algorithm instead of setting a boolean to use patience (#1043)
+ - Remove optional parameters (#1031)
+ - Move Repository.Reset(paths) into Index (#959)
+ - Move FindMergeBase() overloads to ObjectDatabase (#957)
+
+### Fixes
+
+ - ListReferences() is now able to handle symbolic references (#1132)
+ - Repository.IsValid() returns false on empty paths (#1156)
+ - The included version of libgit2 includes racy-git support
+ - Fix a racy NRE in the filters (#1113)
+
+## v0.21.1 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.21...v0.21.1))
+
+### Changes
+
+- Fix Fetch() related tests to cope with recent GitHub policy change regarding include-tag handling (#995, #1001)
+
 ## v0.21 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.20.2...v0.21))
 
 ### Additions

CHANGES.md

@@ -6,7 +6,7 @@
     <DeployFolder>$(RootDir)\Build</DeployFolder>
   </PropertyGroup>
 
-  <UsingTask AssemblyFile="$(RootDir)\packages\xunit.runners.1.9.2\tools\xunit.runner.msbuild.dll"
+  <UsingTask AssemblyFile="$(RootDir)\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.dll"
                TaskName="Xunit.Runner.MSBuild.xunit" />
   <Target Name="Clean">
     <Message Text="Commit SHA = $(CommitSha)" />
@@ -37,7 +37,7 @@
   </Target>
 
   <Target Name="Test" DependsOnTargets="Build">
-    <xunit Assembly="$(TestBuildDir)/LibGit2Sharp.Tests.dll" Xml="$(DeployFolder)/Test-result.xml" />
+    <xunit Assemblies="$(TestBuildDir)/LibGit2Sharp.Tests.dll" ShadowCopy="false" WorkingFolder="$(TestBuildDir)" Xml="$(DeployFolder)/Test-result.xml" />
   </Target>
 
   <Target Name="Deploy" DependsOnTargets="Test">
@@ -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>

CI/build.msbuild

@@ -0,0 +1,51 @@
+# How to Contribute
+
+We love Pull Requests! Your contributions help make LibGit2Sharp great.
+
+## Getting Started
+
+So you want to contribute to LibGit2Sharp. Great! Contributions take many forms from 
+submitting issues, writing documentation, to making code changes. We welcome it all.
+
+But first things first...
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a ticket for your issue, assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Make sure you fill in the earliest version that you know has the issue.
+* Fork the repository on GitHub, then clone it using your favorite Git client.
+* Make sure the project builds and all tests pass on your machine by running 
+  the `build.libgit2sharp.cmd` script on Windows or `build.libgit2sharp.sh` on Linux/Mac.
+
+## LibGit2
+
+LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.
+LibGit2 is a git submodule referencing the [libgit2 project](https://github.com/libgit2/libgit2). To learn more about 
+submodules read [here](http://git-scm.com/book/en/v2/Git-Tools-Submodules).
+To build libgit2 see [here](https://github.com/libgit2/libgit2sharp/wiki/How-to-build-x64-libgit2-and-LibGit2Sharp).
+
+## Making Changes
+
+* Create a topic branch off master (don't work directly on master).
+* Implement your feature or fix your bug. Please following existing coding styles and do not introduce new ones.
+* Make atomic, focused commits with good commit messages.
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+## Submitting Changes
+
+* Push your changes to a topic branch in your fork of the repository.
+* Send a Pull Request targeting the master branch. Note what issue/issues your patch fixes.
+
+Some things that will increase the chance that your pull request is accepted.
+
+* Following existing code conventions.
+* Including unit tests that would otherwise fail without the patch, but pass after applying it.
+* Updating the documentation and tests that are affected by the contribution.
+* If code from elsewhere is used, proper credit and a link to the source should exist in the code comments. 
+  Then licensing issues can be checked against LibGit2Sharp's very permissive MIT based open source license.
+* Having a configured git client that converts line endings to LF. [See here.](https://help.github.com/articles/dealing-with-line-endings/).
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/articles/using-pull-requests/)

CI/travis.linux.install.deps.sh

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CustomBuildTasks</RootNamespace>
     <AssemblyName>CustomBuildTasks</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -33,10 +33,11 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GenerateUniqueIdentifierTask.cs" />
+    <Compile Include="GenerateNativeDllNameTask.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

CI/travis.osx.install.deps.sh

@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace CustomBuildTasks
+{
+    public class GenerateNativeDllNameTask : Task
+    {
+        public ITaskItem InputHashFile { get; set; }
+
+        public string OutputFile { get; set; }
+
+        public override bool Execute()
+        {
+            var fileName = InputHashFile.GetMetadata("FullPath");
+            string libgit2FileName;
+
+            using (var sr = new StreamReader(fileName))
+            {
+                libgit2FileName = sr.ReadLine();
+            }
+
+            var nativeDllName = @"namespace LibGit2Sharp.Core
+{{
+    internal static class NativeDllName
+    {{
+        public const string Name = ""{0}"";
+    }}
+}}
+";
+
+            using (var sw = new StreamWriter(OutputFile))
+            {
+                sw.Write(nativeDllName, libgit2FileName);
+            }
+
+            return true;
+        }
+    }
+}