Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit d32338b

Browse files
asbjornuasbjornu
committed
Upgrade LibGit2Sharp
Upgrade LibGit2Sharp from version 0.22.0 to version 0.23.0-pre20150419160303 and LibGit2Sharp.NativeBinaries from version 1.0.129 to version 1.0.137.
1 parent 87a6b86 commit d32338b

File tree

11 files changed

+183
-171
lines changed

11 files changed

+183
-171
lines changed

‎src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void UpdatesCurrentBranch()
8787
// Advance remote
8888
fixture.Repository.Checkout("develop");
8989
var advancedCommit = fixture.Repository.MakeACommit();
90-
localFixture.Repository.Network.Fetch(localFixture.Repository.Network.Remotes["origin"]);
90+
Commands.Fetch((Repository)localFixture.Repository, localFixture.Repository.Network.Remotes["origin"].Name, null, null, null);
9191
localFixture.Repository.Checkout(advancedCommit.Sha);
9292
localFixture.Repository.DumpGraph();
9393
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "ref/heads/develop");

‎src/GitTools.Core.Tests/GitRepositoryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void UpdatesCurrentBranch()
116116
// Advance remote
117117
fixture.Repository.Checkout("develop");
118118
var advancedCommit = fixture.Repository.MakeACommit();
119-
localFixture.Repository.Network.Fetch(localFixture.Repository.Network.Remotes["origin"]);
119+
Commands.Fetch((Repository)localFixture.Repository, localFixture.Repository.Network.Remotes["origin"].Name, null, null, null);
120120
localFixture.Repository.Checkout(advancedCommit.Sha);
121121
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: "ref/heads/develop");
122122

‎src/GitTools.Core.Tests/GitTools.Core.Tests.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
3+
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,8 +46,8 @@
4646
<HintPath>..\packages\GitTools.Testing.1.1.0\lib\net4\GitTools.Testing.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
49-
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
50-
<HintPath>..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
49+
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
50+
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
@@ -86,6 +86,7 @@
8686
</ProjectReference>
8787
</ItemGroup>
8888
<ItemGroup>
89+
<None Include="app.config" />
8990
<None Include="packages.config" />
9091
</ItemGroup>
9192
<ItemGroup />
@@ -94,7 +95,7 @@
9495
<PropertyGroup>
9596
<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>
9697
</PropertyGroup>
97-
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
98+
<Error Condition="!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'))" />
9899
</Target>
99100
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
100101
Other similar extension points exist, see Microsoft.Common.targets.

‎src/GitTools.Core.Tests/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-0.23.0.0" newVersion="0.23.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎src/GitTools.Core.Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="Atlassian.SDK" version="2.5.0" targetFramework="net45" />
44
<package id="GitTools.Testing" version="1.1.0" targetFramework="net45" />
5-
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net45" />
6-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
5+
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
6+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
77
<package id="NUnit" version="3.2.1" targetFramework="net45" />
88
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
99
</packages>

‎src/GitTools.Core/GitTools.Core.NET40/GitTools.Core.NET40.csproj

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{C11252F9-0ECA-44DC-860B-E029C04FBD10}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>GitTools</RootNamespace>
12-
<AssemblyName>GitTools.Core</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<LangVersion>5</LangVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<TargetFrameworkProfile />
17-
<NuGetPackageImportStamp>
18-
</NuGetPackageImportStamp>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>..\..\..\output\Debug\GitTools.Core\net4\</OutputPath>
25-
<DefineConstants>TRACE;DEBUG</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
28-
<DocumentationFile>..\..\..\output\Debug\GitTools.Core\net4\GitTools.Core.xml</DocumentationFile>
29-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
30-
<NoWarn>1591</NoWarn>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<OutputPath>..\..\..\output\Release\GitTools.Core\net4\</OutputPath>
36-
<DefineConstants>TRACE</DefineConstants>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
39-
<NoWarn>1591</NoWarn>
40-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
41-
<DocumentationFile>..\..\..\output\Release\GitTools.Core\net4\GitTools.Core.xml</DocumentationFile>
42-
</PropertyGroup>
43-
<ItemGroup>
44-
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
46-
<Private>True</Private>
47-
</Reference>
48-
<Reference Include="System" />
49-
<Reference Include="System.Core" />
50-
<Reference Include="System.Xml.Linq" />
51-
<Reference Include="System.Data.DataSetExtensions" />
52-
<Reference Include="Microsoft.CSharp" />
53-
<Reference Include="System.Data" />
54-
<Reference Include="System.Xml" />
55-
</ItemGroup>
56-
<ItemGroup>
57-
<Compile Include="..\..\SolutionAssemblyInfo.cs">
58-
<Link>Properties\SolutionAssemblyInfo.cs</Link>
59-
</Compile>
60-
<Compile Include="App_Packages\LibLog.4.2\LibLog.cs" />
61-
<Compile Include="Properties\JetBrainsAnnotations.cs" />
62-
<Compile Include="Properties\AssemblyInfo.cs" />
63-
</ItemGroup>
64-
<ItemGroup>
65-
<None Include="packages.config" />
66-
</ItemGroup>
67-
<Import Project="..\GitTools.Core.Shared\GitTools.Core.Shared.projitems" Label="Shared" />
68-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
69-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
70-
<PropertyGroup>
71-
<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>
72-
</PropertyGroup>
73-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
74-
</Target>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props')" />
4+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{C11252F9-0ECA-44DC-860B-E029C04FBD10}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>GitTools</RootNamespace>
12+
<AssemblyName>GitTools.Core</AssemblyName>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<LangVersion>5</LangVersion>
15+
<FileAlignment>512</FileAlignment>
16+
<TargetFrameworkProfile />
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<OutputPath>..\..\..\output\Debug\GitTools.Core\net4\</OutputPath>
25+
<DefineConstants>TRACE;DEBUG</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
<DocumentationFile>..\..\..\output\Debug\GitTools.Core\net4\GitTools.Core.xml</DocumentationFile>
29+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
30+
<NoWarn>1591</NoWarn>
31+
</PropertyGroup>
32+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33+
<DebugType>pdbonly</DebugType>
34+
<Optimize>true</Optimize>
35+
<OutputPath>..\..\..\output\Release\GitTools.Core\net4\</OutputPath>
36+
<DefineConstants>TRACE</DefineConstants>
37+
<ErrorReport>prompt</ErrorReport>
38+
<WarningLevel>4</WarningLevel>
39+
<NoWarn>1591</NoWarn>
40+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
41+
<DocumentationFile>..\..\..\output\Release\GitTools.Core\net4\GitTools.Core.xml</DocumentationFile>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll</HintPath>
46+
<Private>True</Private>
47+
</Reference>
48+
<Reference Include="System" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="System.Xml.Linq" />
51+
<Reference Include="System.Data.DataSetExtensions" />
52+
<Reference Include="Microsoft.CSharp" />
53+
<Reference Include="System.Data" />
54+
<Reference Include="System.Xml" />
55+
</ItemGroup>
56+
<ItemGroup>
57+
<Compile Include="..\..\SolutionAssemblyInfo.cs">
58+
<Link>Properties\SolutionAssemblyInfo.cs</Link>
59+
</Compile>
60+
<Compile Include="App_Packages\LibLog.4.2\LibLog.cs" />
61+
<Compile Include="Properties\JetBrainsAnnotations.cs" />
62+
<Compile Include="Properties\AssemblyInfo.cs" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<None Include="packages.config" />
66+
</ItemGroup>
67+
<Import Project="..\GitTools.Core.Shared\GitTools.Core.Shared.projitems" Label="Shared" />
68+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
69+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
70+
<PropertyGroup>
71+
<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>
72+
</PropertyGroup>
73+
<Error Condition="!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'))" />
74+
</Target>
7575
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7676
Other similar extension points exist, see Microsoft.Common.targets.
7777
<Target Name="BeforeBuild">
7878
</Target>
7979
<Target Name="AfterBuild">
8080
</Target>
81-
-->
81+
-->
8282
</Project>

‎src/GitTools.Core/GitTools.Core.NET40/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net40" />
4-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net40" />
5-
<package id="LibLog" version="4.2.5" targetFramework="net40" developmentDependency="true" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
4+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />
5+
<package id="LibLog" version="4.2.5" targetFramework="net40" developmentDependency="true" />
66
</packages>

0 commit comments

Comments
 (0)