Update Libgit2sharp to 0.23.1

git-tfs · Apr 12, 2017 · 7aaa6b2 · 7aaa6b2
1 parent 87b25a0
commit 7aaa6b2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 42 deletions.
diff --git a/GitTfs.Setup/GitTfs.Setup.csproj b/GitTfs.Setup/GitTfs.Setup.csproj
@@ -100,13 +100,6 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
-      <PropertyGroup>
-        <__paket__WixSharp_targets>WixSharp</__paket__WixSharp_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
   <!-- 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.
   <Target Name="BeforeBuild">
@@ -124,18 +117,18 @@
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="WixSharp.UI">
-          <HintPath>..\packages\WixSharp\lib\WixSharp.UI.dll</HintPath>
+        <Reference Include="WixSharp">
+          <HintPath>..\packages\WixSharp\lib\WixSharp.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="WixSharp">
-          <HintPath>..\packages\WixSharp\lib\WixSharp.dll</HintPath>
+        <Reference Include="WixSharp.UI">
+          <HintPath>..\packages\WixSharp\lib\WixSharp.UI.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\packages\WixSharp\build\$(__paket__WixSharp_targets).targets" Condition="Exists('..\packages\WixSharp\build\$(__paket__WixSharp_targets).targets')" Label="Paket" />
+  <Import Project="..\packages\WixSharp\build\WixSharp.targets" Condition="Exists('..\packages\WixSharp\build\WixSharp.targets')" Label="Paket" />
 </Project>
diff --git a/GitTfs.Vs2015/GitTfs.Vs2015.csproj b/GitTfs.Vs2015/GitTfs.Vs2015.csproj
@@ -98,13 +98,6 @@
     <None Include="paket.references" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
-      <PropertyGroup>
-        <__paket__Microsoft_TeamFoundationServer_ExtendedClient_targets>Microsoft.TeamFoundationServer.ExtendedClient</__paket__Microsoft_TeamFoundationServer_ExtendedClient_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
   <PropertyGroup>
     <PostBuildEvent>xcopy /y /I "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)$(ProjectName)" /EXCLUDE:$(SolutionDir)files_to_ignore_during_post_build_copy.txt</PostBuildEvent>
   </PropertyGroup>
@@ -226,5 +219,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\packages\Microsoft.TeamFoundationServer.ExtendedClient\build\$(__paket__Microsoft_TeamFoundationServer_ExtendedClient_targets).targets" Condition="Exists('..\packages\Microsoft.TeamFoundationServer.ExtendedClient\build\$(__paket__Microsoft_TeamFoundationServer_ExtendedClient_targets).targets')" Label="Paket" />
+  <Import Project="..\packages\Microsoft.TeamFoundationServer.ExtendedClient\build\Microsoft.TeamFoundationServer.ExtendedClient.targets" Condition="Exists('..\packages\Microsoft.TeamFoundationServer.ExtendedClient\build\Microsoft.TeamFoundationServer.ExtendedClient.targets')" Label="Paket" />
 </Project>
diff --git a/GitTfs/Core/GitRepository.cs b/GitTfs/Core/GitRepository.cs
@@ -697,7 +697,8 @@ public bool Checkout(string commitish)
         {
             try
             {
-                _repository.Checkout(commitish);
+
+                LibGit2Sharp.Commands.Checkout(_repository, commitish);
                 return true;
             }
             catch (CheckoutConflictException)

diff --git a/GitTfs/GitTfs.csproj b/GitTfs/GitTfs.csproj
@@ -1,5 +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\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries\build\LibGit2Sharp.NativeBinaries.props')" Label="Paket" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -280,14 +281,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
-      <PropertyGroup>
-        <__paket__LibGit2Sharp_NativeBinaries_props>LibGit2Sharp.NativeBinaries</__paket__LibGit2Sharp_NativeBinaries_props>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries\build\$(__paket__LibGit2Sharp_NativeBinaries_props).props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries\build\$(__paket__LibGit2Sharp_NativeBinaries_props).props')" Label="Paket" />
   <!-- 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.
   <Target Name="BeforeBuild">

diff --git a/GitTfsTest/GitTfsTest.csproj b/GitTfsTest/GitTfsTest.csproj
@@ -1,5 +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\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries\build\LibGit2Sharp.NativeBinaries.props')" Label="Paket" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -202,14 +203,6 @@
     </When>
   </Choose>
   <Import Project="..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props" Condition="Exists('..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props')" Label="Paket" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
-      <PropertyGroup>
-        <__paket__LibGit2Sharp_NativeBinaries_props>LibGit2Sharp.NativeBinaries</__paket__LibGit2Sharp_NativeBinaries_props>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries\build\$(__paket__LibGit2Sharp_NativeBinaries_props).props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries\build\$(__paket__LibGit2Sharp_NativeBinaries_props).props')" Label="Paket" />
   <PropertyGroup>
     <PreBuildEvent Condition="'$(OS)' == 'Windows_NT'">xcopy /S /Y "$(SolutionDir)\lib\libgit2sharp\Lib\NativeBinaries" "$(TargetDir)"\NativeBinaries\</PreBuildEvent>
     <PreBuildEvent Condition="'$(OS)' != 'Windows_NT'">cp -Rp "$(SolutionDir)/lib/libgit2sharp/Lib/NativeBinaries" "$(TargetDir)"</PreBuildEvent>

diff --git a/paket.lock b/paket.lock
@@ -1,9 +1,9 @@
 FRAMEWORK: NET40, NET45
 NUGET
   remote: https://www.nuget.org/api/v2
-    LibGit2Sharp (0.22)
-      LibGit2Sharp.NativeBinaries (1.0.129)
-    LibGit2Sharp.NativeBinaries (1.0.129)
+    LibGit2Sharp (0.23.1)
+      LibGit2Sharp.NativeBinaries (1.0.164)
+    LibGit2Sharp.NativeBinaries (1.0.164)
     Microsoft.AspNet.WebApi.Client (5.2.3)
       Newtonsoft.Json (>= 6.0.4) - framework: net45
     Microsoft.AspNet.WebApi.Core (5.2.3)
@@ -32,13 +32,13 @@ NUGET
       Newtonsoft.Json (>= 6.0.8) - framework: net45
       System.IdentityModel.Tokens.Jwt (>= 4.0) - framework: net45
       WindowsAzure.ServiceBus (>= 2.5.1) - framework: net45
-    MSBuildTasks (1.4.0.45) - framework: >= net40
+    MSBuildTasks (1.4.0.45)
     Newtonsoft.Json (9.0.1)
     NLog (4.3.10)
     NuGet.CommandLine (3.4.3)
     System.IdentityModel.Tokens.Jwt (5.0)
     WindowsAzure.ServiceBus (3.4) - framework: net45
-    WixSharp (1.0.22.3) - framework: >= net40
+    WixSharp (1.0.22.3)
     xunit (2.1)
       xunit.assert (2.1)
       xunit.core (2.1)