diff --git a/.nuget/packages.config b/.nuget/packages.config
index 0335ab080..57b9c468a 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runner.console" version="2.0.0" />
-  <package id="xunit.runner.msbuild" version="2.0.0" />
+  <package id="xunit.runner.console" version="2.2.0" />
+  <package id="xunit.runner.msbuild" version="2.2.0" />
 </packages>
diff --git a/.travis.yml b/.travis.yml
index 12830d15a..d09406bbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,20 +3,20 @@
 
 language: csharp
 mono:
- - 3.12.0
- - 4.2.3
+ - 4.8.0
 
 os:
  - osx
  - linux
 
-# The newer image cannot find mono 3.12 in the PATH
-osx_image: xcode6.4
-
 env:
  global:
   - MONO_OPTIONS=--debug
 
+install:
+  - curl -L -o nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+  - mono nuget.exe restore LibGit2Sharp.sln
+
 before_install:
  - date -u
  - uname -a
@@ -31,8 +31,8 @@ script:
 # Only watch the development branch
 branches:
  only:
-   - vNext
    - master
+   - /^maint.*/
 
 # Notify of build changes
 notifications:
diff --git a/CHANGES.md b/CHANGES.md
index 4d880fdc5..790f7a84f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@
   - Windows (x86/amd64): <https://ci.appveyor.com/project/libgit2/libgit2sharp>
   - Linux/Mac OS X: <https://travis-ci.org/libgit2/libgit2sharp>
 
-## v0.23 + 1
+## v0.24 + 1
 
 ### Additions
 
@@ -18,6 +18,14 @@
 
 ### Fixes
 
+## v0.24 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.23..v0.24))
+
+This is the last release before a moving to .NET Core compatible library.
+
+It will be the last supported release with the prior architecture; as a
+result, this release is primarily bugfixes and does not include major new
+APIs.
+
 ## v0.23 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.22..v0.23))
 
 ### Additions
diff --git a/CI/build.msbuild b/CI/build.msbuild
index ad2b5f573..d4b0faae4 100644
--- a/CI/build.msbuild
+++ b/CI/build.msbuild
@@ -6,7 +6,7 @@
     <DeployFolder>$(RootDir)\Build</DeployFolder>
   </PropertyGroup>
 
-  <UsingTask AssemblyFile="$(RootDir)\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.dll"
+  <UsingTask AssemblyFile="$(RootDir)\packages\xunit.runner.msbuild.2.2.0\build\net452\xunit.runner.msbuild.dll"
                TaskName="Xunit.Runner.MSBuild.xunit" />
   <Target Name="Clean">
     <Message Text="Commit SHA = $(CommitSha)" />
diff --git a/Lib/NuGet/NuGet.exe b/Lib/NuGet/NuGet.exe
index 9ca66594f..66794573f 100644
Binary files a/Lib/NuGet/NuGet.exe and b/Lib/NuGet/NuGet.exe differ
diff --git a/LibGit2Sharp.Tests/CheckoutFixture.cs b/LibGit2Sharp.Tests/CheckoutFixture.cs
index 4a85982e6..0648ded10 100644
--- a/LibGit2Sharp.Tests/CheckoutFixture.cs
+++ b/LibGit2Sharp.Tests/CheckoutFixture.cs
@@ -97,7 +97,7 @@ public void CanCheckoutAnExistingBranchByName(string branchName)
 
         [Theory]
         [InlineData("6dcf9bf", true, "6dcf9bf")]
-        [InlineData("refs/tags/lw", true, "refs/tags/lw")]
+        [InlineData("refs/tags/lw", true, "lw")]
         [InlineData("HEAD~2", true, "HEAD~2")]
         [InlineData("6dcf9bf", false, "6dcf9bf7541ee10456529833502442f385010c3d")]
         [InlineData("refs/tags/lw", false, "e90810b8df3e80c413d903f631643c716887138d")]
@@ -748,7 +748,7 @@ public void CheckingOutABranchDoesNotAlterBinaryFiles()
 
         [Theory]
         [InlineData("a447ba2ca8")]
-        [InlineData("refs/tags/lw")]
+        [InlineData("lw")]
         [InlineData("e90810^{}")]
         public void CheckoutFromDetachedHead(string commitPointer)
         {
diff --git a/LibGit2Sharp.Tests/ConfigurationFixture.cs b/LibGit2Sharp.Tests/ConfigurationFixture.cs
index 7edc6dab3..3e071c3b7 100644
--- a/LibGit2Sharp.Tests/ConfigurationFixture.cs
+++ b/LibGit2Sharp.Tests/ConfigurationFixture.cs
@@ -366,7 +366,7 @@ public static IEnumerable<object[]> ConfigAccessors
             }
         }
 
-        [Theory, PropertyData("ConfigAccessors")]
+        [Theory, MemberData(nameof(ConfigAccessors))]
         public void CanAccessConfigurationWithoutARepository(Func<string, string> localConfigurationPathProvider)
         {
             var path = SandboxStandardTestRepoGitDir();
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs
index 10d498500..cabf4a4cf 100644
--- a/LibGit2Sharp.Tests/ConflictFixture.cs
+++ b/LibGit2Sharp.Tests/ConflictFixture.cs
@@ -112,7 +112,7 @@ public void CanGetOriginalNamesOfRenameConflicts()
             }
         }
 
-        [Theory, PropertyData("ConflictData")]
+        [Theory, MemberData(nameof(ConflictData))]
         public void CanRetrieveSingleConflictByPath(string filepath, string ancestorId, string ourId, string theirId)
         {
             var path = SandboxMergedTestRepo();
diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
index cd23df948..63dc91103 100644
--- a/LibGit2Sharp.Tests/IndexFixture.cs
+++ b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -158,28 +158,34 @@ public void CanMoveAnExistingFileOverANonExistingFile(string sourcePath, FileSta
         }
 
         [Theory]
-        [InlineData("README", FileStatus.Unaltered, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
+        [InlineData("README", FileStatus.Unaltered)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex)]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir)]
+        public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus)
         {
+            var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" };
+
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
+        public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus)
         {
+            var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" };
+
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
         [Theory]
-        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        [InlineData("i_dont_exist.txt", FileStatus.Nonexistent, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
+        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
+        [InlineData("i_dont_exist.txt", FileStatus.Nonexistent)]
+        public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus)
         {
+            var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" };
+
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index 0be3440c6..eee61b802 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.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\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,9 +11,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LibGit2Sharp.Tests</RootNamespace>
     <AssemblyName>LibGit2Sharp.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -24,6 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,20 +36,36 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.7.8.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.7.8\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+    <Reference Include="Validation, Version=2.4.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Validation.2.4.15\lib\net45\Validation.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.extensions">
-      <HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
+    <Reference Include="Xunit.SkippableFact, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b2b52da82b58eb73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xunit.SkippableFact.1.3.1\lib\net452\Xunit.SkippableFact.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -130,7 +149,6 @@
     <Compile Include="TestHelpers\IPostTestDirectoryRemover.cs" />
     <Compile Include="TestHelpers\SelfCleaningDirectory.cs" />
     <Compile Include="TestHelpers\SignatureExtensions.cs" />
-    <Compile Include="TestHelpers\SkippableFactAttribute.cs" />
     <Compile Include="LogFixture.cs" />
     <Compile Include="TestHelpers\TestRemoteRefs.cs" />
     <Compile Include="TreeDefinitionFixture.cs" />
@@ -156,9 +174,9 @@
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <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>
+      <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\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.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.
diff --git a/LibGit2Sharp.Tests/OdbBackendFixture.cs b/LibGit2Sharp.Tests/OdbBackendFixture.cs
index 824738f13..975d0e88c 100644
--- a/LibGit2Sharp.Tests/OdbBackendFixture.cs
+++ b/LibGit2Sharp.Tests/OdbBackendFixture.cs
@@ -90,37 +90,46 @@ public void CanGeneratePredictableObjectShasWithAProvidedBackend()
         [Fact]
         public void CanRetrieveObjectsThroughOddSizedShortShas()
         {
-            string repoPath = InitNewRepository();
-
-            using (var repo = new Repository(repoPath))
+            try
             {
-                var backend = new MockOdbBackend();
-                repo.ObjectDatabase.AddBackend(backend, priority: 5);
+                GlobalSettings.SetStrictHashVerification(false);
 
-                AddCommitToRepo(repo);
+                string repoPath = InitNewRepository();
 
-                var blob1 = repo.Lookup<Blob>("9daeaf");
-                Assert.NotNull(blob1);
+                using (var repo = new Repository(repoPath))
+                {
+                    var backend = new MockOdbBackend();
+                    repo.ObjectDatabase.AddBackend(backend, priority: 5);
 
-                const string dummy = "dummy\n";
+                    AddCommitToRepo(repo);
 
-                // Inserts a fake blob with a similarly prefixed sha
-                var fakeId = new ObjectId("9daeaf0000000000000000000000000000000000");
-                using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(dummy)))
-                {
-                    Assert.Equal(0, backend.Write(fakeId, ms, dummy.Length, ObjectType.Blob));
-                }
+                    var blob1 = repo.Lookup<Blob>("9daeaf");
+                    Assert.NotNull(blob1);
+
+                    const string dummy = "dummy\n";
+
+                    // Inserts a fake blob with a similarly prefixed sha
+                    var fakeId = new ObjectId("9daeaf0000000000000000000000000000000000");
+                    using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(dummy)))
+                    {
+                        Assert.Equal(0, backend.Write(fakeId, ms, dummy.Length, ObjectType.Blob));
+                    }
 
-                var blob2 = repo.Lookup<Blob>(fakeId);
-                Assert.NotNull(blob2);
+                    var blob2 = repo.Lookup<Blob>(fakeId);
+                    Assert.NotNull(blob2);
 
-                Assert.Throws<AmbiguousSpecificationException>(() => repo.Lookup<Blob>("9daeaf"));
+                    Assert.Throws<AmbiguousSpecificationException>(() => repo.Lookup<Blob>("9daeaf"));
 
-                var newBlob1 = repo.Lookup("9daeafb");
-                var newBlob2 = repo.Lookup("9daeaf0");
+                    var newBlob1 = repo.Lookup("9daeafb");
+                    var newBlob2 = repo.Lookup("9daeaf0");
 
-                Assert.Equal(blob1, newBlob1);
-                Assert.Equal(blob2, newBlob2);
+                    Assert.Equal(blob1, newBlob1);
+                    Assert.Equal(blob2, newBlob2);
+                }
+            }
+            finally
+            {
+                GlobalSettings.SetStrictHashVerification(true);
             }
         }
 
diff --git a/LibGit2Sharp.Tests/Properties/AssemblyInfo.cs b/LibGit2Sharp.Tests/Properties/AssemblyInfo.cs
index 6d2256554..adf33cb34 100644
--- a/LibGit2Sharp.Tests/Properties/AssemblyInfo.cs
+++ b/LibGit2Sharp.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using Xunit;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
@@ -37,3 +38,5 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/LibGit2Sharp.Tests/StageFixture.cs b/LibGit2Sharp.Tests/StageFixture.cs
index b606a745e..5b4538670 100644
--- a/LibGit2Sharp.Tests/StageFixture.cs
+++ b/LibGit2Sharp.Tests/StageFixture.cs
@@ -33,6 +33,24 @@ public void CanStage(string relativePath, FileStatus currentStatus, bool doesCur
             }
         }
 
+        [Theory]
+        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromIndex)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInIndex)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInIndex)]
+        public void StagingWritesIndex(string relativePath, FileStatus expectedStatus)
+        {
+            string path = SandboxStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                Commands.Stage(repo, relativePath);
+            }
+
+            using (var repo = new Repository(path))
+            {
+                Assert.Equal(expectedStatus, repo.RetrieveStatus(relativePath));
+            }
+        }
+
         [Fact]
         public void CanStageTheUpdationOfAStagedFile()
         {
@@ -83,8 +101,8 @@ public void CanStageAnUnknownFileWithLaxUnmatchedExplicitPathsValidation(string
                 Assert.Null(repo.Index[relativePath]);
                 Assert.Equal(status, repo.RetrieveStatus(relativePath));
 
-                Assert.DoesNotThrow(() => Commands.Stage(repo, relativePath));
-                Assert.DoesNotThrow(() => Commands.Stage(repo, relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } }));
+                Commands.Stage(repo, relativePath);
+                Commands.Stage(repo, relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } });
 
                 Assert.Equal(status, repo.RetrieveStatus(relativePath));
             }
@@ -387,8 +405,7 @@ public void CanSuccessfullyStageTheContentOfAModifiedFileOfTheSameSizeWithinTheS
 
                     Commands.Stage(repo, "test.txt");
 
-                    Assert.DoesNotThrow(() => repo.Commit(
-                                "Commit", Constants.Signature, Constants.Signature));
+                    repo.Commit("Commit", Constants.Signature, Constants.Signature);
                 }
             }
         }
diff --git a/LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs b/LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs
deleted file mode 100644
index b9904dba3..000000000
--- a/LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml;
-using Xunit;
-using Xunit.Extensions;
-using Xunit.Sdk;
-//**********************************************************************
-//* This file is based on the DynamicSkipExample.cs in xUnit which is
-//* provided under the following Ms-PL license:
-//*
-//* This license governs use of the accompanying software. If you use
-//* the software, you accept this license. If you do not accept the
-//* license, do not use the software.
-//*
-//* 1. Definitions
-//*
-//* The terms "reproduce," "reproduction," "derivative works," and
-//* "distribution" have the same meaning here as under U.S. copyright
-//* law.
-//*
-//* A "contribution" is the original software, or any additions or
-//* changes to the software.
-//*
-//* A "contributor" is any person that distributes its contribution
-//* under this license.
-//*
-//* "Licensed patents" are a contributor's patent claims that read
-//* directly on its contribution.
-//*
-//* 2. Grant of Rights
-//*
-//* (A) Copyright Grant- Subject to the terms of this license, including
-//* the license conditions and limitations in section 3, each
-//* contributor grants you a non-exclusive, worldwide, royalty-free
-//* copyright license to reproduce its contribution, prepare derivative
-//* works of its contribution, and distribute its contribution or any
-//* derivative works that you create.
-//*
-//* (B) Patent Grant- Subject to the terms of this license, including
-//* the license conditions and limitations in section 3, each
-//* contributor grants you a non-exclusive, worldwide, royalty-free
-//* license under its licensed patents to make, have made, use, sell,
-//* offer for sale, import, and/or otherwise dispose of its contribution
-//* in the software or derivative works of the contribution in the
-//* software.
-//*
-//* 3. Conditions and Limitations
-//*
-//* (A) No Trademark License- This license does not grant you rights to
-//* use any contributors' name, logo, or trademarks.
-//*
-//* (B) If you bring a patent claim against any contributor over patents
-//* that you claim are infringed by the software, your patent license
-//* from such contributor to the software ends automatically.
-//*
-//* (C) If you distribute any portion of the software, you must retain
-//* all copyright, patent, trademark, and attribution notices that are
-//* present in the software.
-//*
-//* (D) If you distribute any portion of the software in source code
-//* form, you may do so only under this license by including a complete
-//* copy of this license with your distribution. If you distribute any
-//* portion of the software in compiled or object code form, you may
-//* only do so under a license that complies with this license.
-//**********************************************************************
-
-namespace LibGit2Sharp.Tests.TestHelpers
-{
-    class SkippableFactAttribute : FactAttribute
-    {
-        protected override IEnumerable<ITestCommand> EnumerateTestCommands(IMethodInfo method)
-        {
-            return base.EnumerateTestCommands(method).Select(SkippableTestCommand.Wrap(method));
-        }
-    }
-
-    class SkippableTheoryAttribute : TheoryAttribute
-    {
-        protected override IEnumerable<ITestCommand> EnumerateTestCommands(IMethodInfo method)
-        {
-            return base.EnumerateTestCommands(method).Select(SkippableTestCommand.Wrap(method));
-        }
-    }
-
-    class SkippableTestCommand : ITestCommand
-    {
-        public static Func<ITestCommand, ITestCommand> Wrap(IMethodInfo method)
-        {
-            return c => new SkippableTestCommand(method, c);
-        }
-
-        private readonly IMethodInfo method;
-        private readonly ITestCommand inner;
-
-        private SkippableTestCommand(IMethodInfo method, ITestCommand inner)
-        {
-            this.method = method;
-            this.inner = inner;
-        }
-
-        public MethodResult Execute(object testClass)
-        {
-            try
-            {
-                return inner.Execute(testClass);
-            }
-            catch (SkipException e)
-            {
-                return new SkipResult(method, DisplayName, e.Reason);
-            }
-        }
-
-        public XmlNode ToStartXml()
-        {
-            return inner.ToStartXml();
-        }
-
-        public string DisplayName
-        {
-            get { return inner.DisplayName; }
-        }
-
-        public bool ShouldCreateInstance
-        {
-            get { return inner.ShouldCreateInstance; }
-        }
-
-        public int Timeout
-        {
-            get { return inner.Timeout; }
-        }
-    }
-
-    class SkipException : Exception
-    {
-        public SkipException(string reason)
-        {
-            Reason = reason;
-        }
-
-        public string Reason { get; private set; }
-    }
-}
diff --git a/LibGit2Sharp.Tests/UnstageFixture.cs b/LibGit2Sharp.Tests/UnstageFixture.cs
index 786ed14c7..c4791d10d 100644
--- a/LibGit2Sharp.Tests/UnstageFixture.cs
+++ b/LibGit2Sharp.Tests/UnstageFixture.cs
@@ -84,6 +84,25 @@ public void CanUnstage(
             }
         }
 
+
+        [Theory]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInWorkdir)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInWorkdir)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromWorkdir)]
+        public void UnstagingWritesIndex(string relativePath, FileStatus expectedStatus)
+        {
+            string path = SandboxStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                Commands.Unstage(repo, relativePath);
+            }
+
+            using (var repo = new Repository(path))
+            {
+                Assert.Equal(expectedStatus, repo.RetrieveStatus(relativePath));
+            }
+        }
+
         [Theory]
         [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("where-am-I.txt", FileStatus.Nonexistent)]
@@ -106,7 +125,8 @@ public void CanUnstageUnknownPathsWithLaxUnmatchedExplicitPathsValidation(string
             {
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
 
-                Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false }));
+                Commands.Unstage(repo, relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false });
+
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
             }
         }
@@ -182,8 +202,9 @@ public void CanUnstageUnknownPathsAgainstAnOrphanedHeadWithLaxUnmatchedExplicitP
 
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
 
-                Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath));
-                Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false }));
+                Commands.Unstage(repo, relativePath);
+                Commands.Unstage(repo, relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false });
+
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
             }
         }
diff --git a/LibGit2Sharp.Tests/app.config b/LibGit2Sharp.Tests/app.config
index 5ab38dff7..34dc4a041 100644
--- a/LibGit2Sharp.Tests/app.config
+++ b/LibGit2Sharp.Tests/app.config
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.2.1705" newVersion="1.9.2.1705" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
 </configuration>
diff --git a/LibGit2Sharp.Tests/packages.config b/LibGit2Sharp.Tests/packages.config
index 532dff7af..2748122d3 100644
--- a/LibGit2Sharp.Tests/packages.config
+++ b/LibGit2Sharp.Tests/packages.config
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Moq" version="4.2.1507.0118" targetFramework="net40" />
-  <package id="xunit" version="1.9.2" targetFramework="net40" />
-  <package id="xunit.extensions" version="1.9.2" targetFramework="net40" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net40" />
-</packages>
+  <package id="Castle.Core" version="4.0.0" targetFramework="net46" />
+  <package id="Moq" version="4.7.8" targetFramework="net46" />
+  <package id="Validation" version="2.4.15" targetFramework="net46" />
+  <package id="xunit" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
+  <package id="xunit.assert" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net46" />
+  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Xunit.SkippableFact" version="1.3.1" targetFramework="net46" />
+</packages>
\ No newline at end of file
diff --git a/LibGit2Sharp/Commands/Stage.cs b/LibGit2Sharp/Commands/Stage.cs
index 9917ca52a..a1febafcb 100644
--- a/LibGit2Sharp/Commands/Stage.cs
+++ b/LibGit2Sharp/Commands/Stage.cs
@@ -199,6 +199,8 @@ public static void Unstage(IRepository repository, IEnumerable<string> paths, Ex
             {
                 repository.Index.Replace(repository.Head.Tip, paths, explicitPathsOptions);
             }
+
+            repository.Index.Write();
         }
 
         /// <summary>
diff --git a/LibGit2Sharp/Core/GitErrorCategory.cs b/LibGit2Sharp/Core/GitErrorCategory.cs
index d9d930e1c..5fc4c7d57 100644
--- a/LibGit2Sharp/Core/GitErrorCategory.cs
+++ b/LibGit2Sharp/Core/GitErrorCategory.cs
@@ -34,6 +34,8 @@ internal enum GitErrorCategory
         Describe,
         Rebase,
         Filesystem,
-        Patch
+        Patch,
+        Worktree,
+        Sha1
     }
 }
diff --git a/LibGit2Sharp/Core/GitErrorCode.cs b/LibGit2Sharp/Core/GitErrorCode.cs
index 1ef7af7b0..6180cc4a8 100644
--- a/LibGit2Sharp/Core/GitErrorCode.cs
+++ b/LibGit2Sharp/Core/GitErrorCode.cs
@@ -125,5 +125,15 @@ internal enum GitErrorCode
         /// There are no more entries left to iterate.
         /// </summary>
         IterOver = -31,
+
+        /// <summary>
+        /// Internal-only.
+        /// </summary>
+        Retry = -32,
+
+        /// <summary>
+        /// A retrieved object did not match its expected ID.
+        /// </summary>
+        Mismatch = -33,
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index e8ab4cc7a..c69bc1f8b 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -636,6 +636,9 @@ internal static extern int git_filter_unregister(
         internal static extern int git_libgit2_opts(int option, uint level,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))]string path);
 
+        // git_libgit2_opts(GIT_OPT_ENABLE_*, int enabled)
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int git_libgit2_opts(int option, int enabled);
         #endregion
 
         [DllImport(libgit2)]
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
index bf81a4a9d..e73e5a83b 100644
--- a/LibGit2Sharp/Core/Proxy.cs
+++ b/LibGit2Sharp/Core/Proxy.cs
@@ -3345,25 +3345,31 @@ public static BuiltInFeatures git_libgit2_features()
         }
 
         // C# equivalent of libgit2's git_libgit2_opt_t
-        private enum LibGitOption
-        {
-            GetMWindowSize,             // GIT_OPT_GET_MWINDOW_SIZE
-            SetMWindowSize,             // GIT_OPT_SET_MWINDOW_SIZE
-            GetMWindowMappedLimit,      // GIT_OPT_GET_MWINDOW_MAPPED_LIMIT
-            SetMWindowMappedLimit,      // GIT_OPT_SET_MWINDOW_MAPPED_LIMIT
-            GetSearchPath,              // GIT_OPT_GET_SEARCH_PATH
-            SetSearchPath,              // GIT_OPT_SET_SEARCH_PATH
-            SetCacheObjectLimit,        // GIT_OPT_SET_CACHE_OBJECT_LIMIT
-            SetCacheMaxSize,            // GIT_OPT_SET_CACHE_MAX_SIZE
-            EnableCaching,              // GIT_OPT_ENABLE_CACHING
-            GetCachedMemory,            // GIT_OPT_GET_CACHED_MEMORY
-            GetTemplatePath,            // GIT_OPT_GET_TEMPLATE_PATH
-            SetTemplatePath,            // GIT_OPT_SET_TEMPLATE_PATH
-            SetSslCertLocations,        // GIT_OPT_SET_SSL_CERT_LOCATIONS
-            SetUserAgent,               // GIT_OPT_SET_USER_AGENT
-            EnableStrictObjectCreation, // GIT_OPT_ENABLE_STRICT_OBJECT_CREATION
-            SetSslCiphers,              // GIT_OPT_SET_SSL_CIPHERS
-            GetUserAgent,               // GIT_OPT_GET_USER_AGENT
+        private enum LibGit2Option
+        {
+            GetMWindowSize,                  // GIT_OPT_GET_MWINDOW_SIZE
+            SetMWindowSize,                  // GIT_OPT_SET_MWINDOW_SIZE
+            GetMWindowMappedLimit,           // GIT_OPT_GET_MWINDOW_MAPPED_LIMIT
+            SetMWindowMappedLimit,           // GIT_OPT_SET_MWINDOW_MAPPED_LIMIT
+            GetSearchPath,                   // GIT_OPT_GET_SEARCH_PATH
+            SetSearchPath,                   // GIT_OPT_SET_SEARCH_PATH
+            SetCacheObjectLimit,             // GIT_OPT_SET_CACHE_OBJECT_LIMIT
+            SetCacheMaxSize,                 // GIT_OPT_SET_CACHE_MAX_SIZE
+            EnableCaching,                   // GIT_OPT_ENABLE_CACHING
+            GetCachedMemory,                 // GIT_OPT_GET_CACHED_MEMORY
+            GetTemplatePath,                 // GIT_OPT_GET_TEMPLATE_PATH
+            SetTemplatePath,                 // GIT_OPT_SET_TEMPLATE_PATH
+            SetSslCertLocations,             // GIT_OPT_SET_SSL_CERT_LOCATIONS
+            SetUserAgent,                    // GIT_OPT_SET_USER_AGENT
+            EnableStrictObjectCreation,      // GIT_OPT_ENABLE_STRICT_OBJECT_CREATION
+            EnableStrictSymbolicRefCreation, // GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION
+            SetSslCiphers,                   // GIT_OPT_SET_SSL_CIPHERS
+            GetUserAgent,                    // GIT_OPT_GET_USER_AGENT
+            EnableOfsDelta,                  // GIT_OPT_ENABLE_OFS_DELTA
+            EnableFsyncGitdir,               // GIT_OPT_ENABLE_FSYNC_GITDIR
+            GetWindowsSharemode,             // GIT_OPT_GET_WINDOWS_SHAREMODE
+            SetWindowsSharemode,             // GIT_OPT_SET_WINDOWS_SHAREMODE
+            EnableStrictHashVerification,    // GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION
         }
 
         /// <summary>
@@ -3379,7 +3385,7 @@ public static string git_libgit2_opts_get_search_path(ConfigurationLevel level)
 
             using (var buf = new GitBuf())
             {
-                var res = NativeMethods.git_libgit2_opts((int)LibGitOption.GetSearchPath, (uint)level, buf);
+                var res = NativeMethods.git_libgit2_opts((int)LibGit2Option.GetSearchPath, (uint)level, buf);
                 Ensure.ZeroResult(res);
 
                 path = LaxUtf8Marshaler.FromNative(buf.ptr) ?? string.Empty;
@@ -3388,6 +3394,11 @@ public static string git_libgit2_opts_get_search_path(ConfigurationLevel level)
             return path;
         }
 
+        public static void git_libgit2_opts_enable_strict_hash_verification(bool enabled)
+        {
+            NativeMethods.git_libgit2_opts((int)LibGit2Option.EnableStrictHashVerification, enabled ? 1 : 0);
+        }
+
         /// <summary>
         /// Set the path(s) under which libgit2 searches for the configuration file of a given level.
         /// </summary>
@@ -3398,7 +3409,7 @@ public static string git_libgit2_opts_get_search_path(ConfigurationLevel level)
         /// </param>
         public static void git_libgit2_opts_set_search_path(ConfigurationLevel level, string path)
         {
-            var res = NativeMethods.git_libgit2_opts((int)LibGitOption.SetSearchPath, (uint)level, path);
+            var res = NativeMethods.git_libgit2_opts((int)LibGit2Option.SetSearchPath, (uint)level, path);
             Ensure.ZeroResult(res);
         }
 
diff --git a/LibGit2Sharp/GlobalSettings.cs b/LibGit2Sharp/GlobalSettings.cs
index a514caf04..8fac7877f 100644
--- a/LibGit2Sharp/GlobalSettings.cs
+++ b/LibGit2Sharp/GlobalSettings.cs
@@ -23,7 +23,26 @@ static GlobalSettings()
         {
             if (Platform.OperatingSystem == OperatingSystemType.Windows)
             {
-                string managedPath = new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath;
+                /* Assembly.CodeBase is not actually a correctly formatted
+                 * URI.  It's merely prefixed with `file:///` and has its
+                 * backslashes flipped.  This is superior to EscapedCodeBase,
+                 * which does not correctly escape things, and ambiguates a
+                 * space (%20) with a literal `%20` in the path.  Sigh.
+                 */
+                var managedPath = Assembly.GetExecutingAssembly().CodeBase;
+                if (managedPath == null)
+                {
+                    managedPath = Assembly.GetExecutingAssembly().Location;
+                }
+                else if (managedPath.StartsWith("file:///"))
+                {
+                    managedPath = managedPath.Substring(8).Replace('/', '\\');
+                }
+                else if (managedPath.StartsWith("file://"))
+                {
+                    managedPath = @"\\" + managedPath.Substring(7).Replace('/', '\\');
+                }
+
                 nativeLibraryPath = Path.Combine(Path.Combine(Path.GetDirectoryName(managedPath), "lib"), "win32");
             }
 
@@ -299,5 +318,10 @@ public static void SetConfigSearchPaths(ConfigurationLevel level, params string[
             var pathString = (paths == null) ? null : string.Join(Path.PathSeparator.ToString(), paths);
             Proxy.git_libgit2_opts_set_search_path(level, pathString);
         }
+
+        public static void SetStrictHashVerification(bool enabled)
+        {
+            Proxy.git_libgit2_opts_enable_strict_hash_verification(enabled);
+        }
     }
 }
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 6156af63b..34fb0d630 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/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.163\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.163\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -392,6 +392,6 @@
     <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.163\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.163\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/LibGit2Sharp/Properties/AssemblyInfo.cs b/LibGit2Sharp/Properties/AssemblyInfo.cs
index 34c8f06bd..18643022e 100644
--- a/LibGit2Sharp/Properties/AssemblyInfo.cs
+++ b/LibGit2Sharp/Properties/AssemblyInfo.cs
@@ -42,6 +42,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.23.0")]
-[assembly: AssemblyFileVersion("0.23.0")]
-[assembly: AssemblyInformationalVersion("0.23.0-dev00000000000000")]
+[assembly: AssemblyVersion("0.24.0")]
+[assembly: AssemblyFileVersion("0.24.0")]
+[assembly: AssemblyInformationalVersion("0.24.0-dev00000000000000")]
diff --git a/LibGit2Sharp/packages.config b/LibGit2Sharp/packages.config
index db6ebf4c3..72b9ea358 100644
--- a/LibGit2Sharp/packages.config
+++ b/LibGit2Sharp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.163" targetFramework="net40" allowedVersions="[1.0.163]" />
-</packages>
\ No newline at end of file
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net40" allowedVersions="[1.0.185]" />
+</packages>
diff --git a/appveyor.yml b/appveyor.yml
index dd4c82f1e..693cd95ee 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,10 +3,12 @@ version: '{build}'
 branches:
   only:
   - master
-  - vNext
+  - /^maint.*/
 
 skip_tags: true
 
+image: Visual Studio 2015
+
 clone_folder: C:\projects\libgit2sharp
 
 environment:
@@ -16,7 +18,7 @@ environment:
     secure: nuzUT+HecXGIi3KaPd/1hgFEZJan/j6+oNbPV75JKjk=
   coverity_email:
     secure: eGVilNg1Yuq+Xj+SW8r3WCtjnzhoDV0sNJkma4NRq7A=
-  version : 0.23.0
+  version : 0.24.0
   matrix:
   - xunit_runner: xunit.console.x86.exe
     Arch: 32
@@ -112,7 +114,7 @@ test_script:
     {
       .\packages\OpenCover\tools\OpenCover.Console.exe `
         -register:user `
-        "-target:""$Env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.0.0\tools\$Env:xunit_runner""" `
+        "-target:""$Env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.2.0\tools\$Env:xunit_runner""" `
         "-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp.Tests\bin\Release\LibGit2Sharp.Tests.dll"" -noshadow" `
         "-filter:+[LibGit2Sharp]* -[LibGit2Sharp.Tests]*" `
         -hideskipped:All `
@@ -120,7 +122,7 @@ test_script:
     }
     ElseIf ($Env:SHOULD_RUN_COVERITY_ANALYSIS -eq $False)
     {
-      & "$Env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.0.0\tools\$Env:xunit_runner" `
+      & "$Env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.2.0\tools\$Env:xunit_runner" `
           "$Env:APPVEYOR_BUILD_FOLDER\LibGit2Sharp.Tests\bin\Release\LibGit2Sharp.Tests.dll" -noshadow
     }
 
diff --git a/nuget.package/BuildNugetPackage.ps1 b/nuget.package/BuildNugetPackage.ps1
index 6770c14fc..77d9c9b88 100644
--- a/nuget.package/BuildNugetPackage.ps1
+++ b/nuget.package/BuildNugetPackage.ps1
@@ -52,14 +52,6 @@ function Clean-OutputFolder($folder) {
     }
 }
 
-# From http://www.dougfinke.com/blog/index.php/2010/12/01/note-to-self-how-to-programmatically-get-the-msbuild-path-in-powershell/
-
-Function Get-MSBuild {
-    $lib = [System.Runtime.InteropServices.RuntimeEnvironment]
-    $rtd = $lib::GetRuntimeDirectory()
-    Join-Path $rtd msbuild.exe
-}
-
 #################
 
 $root = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
@@ -79,7 +71,7 @@ Push-Location $projectPath
 try {
   Set-Content -Encoding ASCII $(Join-Path $projectPath "libgit2sharp_hash.txt") $commitSha
   Run-Command { & "$(Join-Path $projectPath "..\Lib\NuGet\Nuget.exe")" Restore "$slnPath" }
-  Run-Command { & (Get-MSBuild) "$slnPath" "/verbosity:minimal" "/p:Configuration=Release" }
+  Run-Command { & "MSBuild.exe" "$slnPath" "/verbosity:minimal" "/p:Configuration=Release" }
 
   If ($postBuild) {
     Write-Host -ForegroundColor "Green" "Run post build script..."
diff --git a/nuget.package/LibGit2Sharp.nuspec b/nuget.package/LibGit2Sharp.nuspec
index c8381e2cf..8d51c7581 100644
--- a/nuget.package/LibGit2Sharp.nuspec
+++ b/nuget.package/LibGit2Sharp.nuspec
@@ -4,14 +4,14 @@
     <id>$id$</id>
     <version>$version$</version>
     <authors>$author$</authors>
-    <owners>nulltoken</owners>
+    <owners>LibGit2Sharp maintainers</owners>
     <licenseUrl>https://github.com/libgit2/libgit2sharp/raw/master/LICENSE.md</licenseUrl>
     <projectUrl>https://github.com/libgit2/libgit2sharp/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <releaseNotes>https://github.com/libgit2/libgit2sharp/blob/master/CHANGES.md#libgit2sharp-changes</releaseNotes>
     <iconUrl>https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png</iconUrl>
-    <tags>libgit2 git wrapper bindings API dvcs vcs</tags>
+    <tags>git libgit2</tags>
   </metadata>
   <files>
     <file src="..\README.md" target="App_Readme\LibGit2Sharp.README.md" />