diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
index 83cde8af1c..3be0950fa8 100644
--- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
+++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -70,5 +70,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs b/src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs
index b8a57127ba..d10e54fdc6 100644
--- a/src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs
+++ b/src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs
@@ -36,16 +36,6 @@ public IEnumerable<LogEntry> QueryBy(string path)
     {
         throw new NotImplementedException();
     }
-    
-    public Commit FindMergeBase(Commit first, Commit second)
-    {
-        return null;
-    }
-
-    public Commit FindMergeBase(IEnumerable<Commit> commits, MergeBaseFindingStrategy strategy)
-    {
-        throw new NotImplementedException();
-    }
 
     public IEnumerable<LogEntry> QueryBy(string path, CommitFilter filter)
     {
diff --git a/src/GitVersionCore/AssemblyInfo.cs b/src/GitVersionCore/AssemblyInfo.cs
index b4a21bb9ee..61b5c6ce2c 100644
--- a/src/GitVersionCore/AssemblyInfo.cs
+++ b/src/GitVersionCore/AssemblyInfo.cs
@@ -3,11 +3,11 @@
 
 [assembly: AssemblyTitle("GitVersionCore")]
 [assembly: AssemblyProduct("GitVersion")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
 [assembly: InternalsVisibleTo("GitVersionTask.Tests")]
 [assembly: InternalsVisibleTo("GitVersion")]
 [assembly: InternalsVisibleTo("GitVersionCore.Tests")]
 [assembly: InternalsVisibleTo("GitVersionExe.Tests")]
 
-[assembly: AssemblyInformationalVersion("4.0.0-netstandard.1+1538.Branch.feature/netstandard.Sha.91536c107ba91f755f14904fc69965a9ad70fcb0")]
+[assembly: AssemblyInformationalVersion("4.0.1-feat-UpgradeLibGit2Sharp.1+3.Branch.feat/UpgradeLibGit2Sharp.Sha.5662c303d7f2fd45c73b890f785338fdeee6b19d")]
\ No newline at end of file
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
index ebb4e6db9a..0b595a3246 100644
--- a/src/GitVersionCore/GitVersionCore.csproj
+++ b/src/GitVersionCore/GitVersionCore.csproj
@@ -105,5 +105,4 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/GitVersionExe/AssemblyInfo.cs b/src/GitVersionExe/AssemblyInfo.cs
index 8830673801..74457620d6 100644
--- a/src/GitVersionExe/AssemblyInfo.cs
+++ b/src/GitVersionExe/AssemblyInfo.cs
@@ -3,10 +3,10 @@
 
 [assembly: AssemblyTitle("GitVersion")]
 [assembly: AssemblyProduct("GitVersion")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.0.1.0")]
+[assembly: AssemblyFileVersion("4.0.1.0")]
 [assembly: InternalsVisibleTo("GitVersionTask.Tests")]
 [assembly: InternalsVisibleTo("AcceptanceTests")]
 [assembly: InternalsVisibleTo("GitVersionExe.Tests")]
 
-[assembly: AssemblyInformationalVersion("4.0.0-netstandard.1+1538.Branch.feature/netstandard.Sha.91536c107ba91f755f14904fc69965a9ad70fcb0")]
+[assembly: AssemblyInformationalVersion("4.0.1-feat-UpgradeLibGit2Sharp.1+3.Branch.feat/UpgradeLibGit2Sharp.Sha.5662c303d7f2fd45c73b890f785338fdeee6b19d")]
\ No newline at end of file
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
index 96ad53b903..02bd4b44f8 100644
--- a/src/GitVersionExe/GitVersionExe.csproj
+++ b/src/GitVersionExe/GitVersionExe.csproj
@@ -6,7 +6,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>GitVersion</RootNamespace>
     <AssemblyName>GitVersion</AssemblyName>
-    <TargetFrameworks>net40;netcoreapp20</TargetFrameworks>
+    <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
     <BuildDir>$(SolutionDir)..\build\</BuildDir>
     
     <GenerateAssemblyFileVersionAttribute Condition="'$(GenerateAssemblyFileVersionAttribute)' == ''">false</GenerateAssemblyFileVersionAttribute>
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
index b58c15326f..cc02661753 100644
--- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
+++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -85,5 +85,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/GitVersionTask.Tests/app.config b/src/GitVersionTask.Tests/app.config
index c39d7cb3ce..487756fc29 100644
--- a/src/GitVersionTask.Tests/app.config
+++ b/src/GitVersionTask.Tests/app.config
@@ -16,8 +16,8 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.24.0.0" newVersion="0.24.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-0.25.0.0" newVersion="0.25.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config
index 07302cf6d8..332e1a60e1 100644
--- a/src/GitVersionTask.Tests/packages.config
+++ b/src/GitVersionTask.Tests/packages.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
   <package id="Fody" version="2.0.8" targetFramework="net45" developmentDependency="true" />
   <package id="GitTools.Core" version="1.3.0" targetFramework="net45" />
   <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net45" />
-  <package id="LibGit2Sharp" version="0.24.0" targetFramework="net45" />
+  <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
diff --git a/tools/packages.config b/tools/packages.config
index 0f070f2afe..0308983b66 100644
--- a/tools/packages.config
+++ b/tools/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-	 <package id="Cake" version="0.27.2" />
-	 <package id="Cake.CoreCLR" version="0.27.2" />
+    <package id="Cake" version="0.28.1" />
 </packages>