Skip to content

Commit 12438e2

Browse files
SimonCroppSimonCropp
committed
bump libgit
fixes #328
1 parent b2587a3 commit 12438e2

File tree

15 files changed

+100
-64
lines changed

15 files changed

+100
-64
lines changed

‎GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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.0.20.1.0\build\net40\LibGit2Sharp.props" Condition="Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,7 +13,7 @@
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
15-
<NuGetPackageImportStamp>398929b2</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>e51a7a82</NuGetPackageImportStamp>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -42,9 +43,9 @@
4243
<SpecificVersion>False</SpecificVersion>
4344
<HintPath>..\packages\ApprovalUtilities.3.0.7\lib\net35\ApprovalUtilities.dll</HintPath>
4445
</Reference>
45-
<Reference Include="LibGit2Sharp, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<Reference Include="LibGit2Sharp, Version=0.20.1.0, Culture=neutral, processorArchitecture=MSIL">
4647
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\LibGit2Sharp.0.19.0.0\lib\net40\LibGit2Sharp.dll</HintPath>
48+
<HintPath>..\packages\LibGit2Sharp.0.20.1.0\lib\net40\LibGit2Sharp.dll</HintPath>
4849
</Reference>
4950
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5051
<SpecificVersion>False</SpecificVersion>
@@ -120,17 +121,14 @@
120121
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
121122
<PropertyGroup>
122123
<PostBuildEvent>
123-
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
124-
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
125-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
126-
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
127-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
124+
</PostBuildEvent>
128125
</PropertyGroup>
129126
<Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
130127
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131128
<PropertyGroup>
132129
<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>
133130
</PropertyGroup>
134131
<Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
132+
<Error Condition="!Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props'))" />
135133
</Target>
136134
</Project>

‎GitVersionCore.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="ApprovalTests" version="3.0.7" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.7" targetFramework="net45" />
55
<package id="Fody" version="1.26.4" targetFramework="net45" developmentDependency="true" />
6-
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net45" />
6+
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
77
<package id="NUnit" version="2.6.4" targetFramework="net45" />
88
<package id="Shouldly" version="2.3.1" targetFramework="net45" />
99
<package id="YamlDotNet" version="3.5.0" targetFramework="net45" />

‎GitVersionCore/BuildServers/GitHelper.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,11 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent
158158

159159
static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, Remote remote, string username, string password)
160160
{
161-
return repo.Network.ListReferences(remote,
162-
new UsernamePasswordCredentials
163-
{
164-
Username = username,
165-
Password = password
166-
});
161+
return repo.Network.ListReferences(remote, (url, fromUrl, types) => new UsernamePasswordCredentials
162+
{
163+
Username = username,
164+
Password = password
165+
});
167166
}
168167

169168
static IEnumerable<DirectReference> GetRemoteTipsForAnonymousUser(Repository repo, Remote remote)

‎GitVersionCore/GitVersionCore.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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.0.20.1.0\build\net40\LibGit2Sharp.props" Condition="Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +12,7 @@
1112
<AssemblyName>GitVersionCore</AssemblyName>
1213
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>2780cf4a</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>c31ea180</NuGetPackageImportStamp>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -38,9 +39,9 @@
3839
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.2\Lib\JetBrains.Annotations.dll</HintPath>
3940
<Private>False</Private>
4041
</Reference>
41-
<Reference Include="LibGit2Sharp, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<Reference Include="LibGit2Sharp, Version=0.20.1.0, Culture=neutral, processorArchitecture=MSIL">
4243
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\LibGit2Sharp.0.19.0.0\lib\net40\LibGit2Sharp.dll</HintPath>
44+
<HintPath>..\packages\LibGit2Sharp.0.20.1.0\lib\net40\LibGit2Sharp.dll</HintPath>
4445
</Reference>
4546
<Reference Include="System" />
4647
<Reference Include="System.Core" />
@@ -140,14 +141,11 @@
140141
</PropertyGroup>
141142
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
142143
<Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
144+
<Error Condition="!Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props'))" />
143145
</Target>
144146
<PropertyGroup>
145147
<PostBuildEvent>
146-
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
147-
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
148-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
149-
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
150-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
148+
</PostBuildEvent>
151149
</PropertyGroup>
152150
<Target Name="Clean">
153151
<ItemGroup>

‎GitVersionCore/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.26.4" targetFramework="net40" developmentDependency="true" />
55
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
6-
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net40" />
6+
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net40" />
77
<package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
88
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
99
<package id="YamlDotNet" version="3.5.0" targetFramework="net40" />

‎GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
<Reference Include="ApprovalUtilities">
3737
<HintPath>..\packages\ApprovalUtilities.3.0.7\lib\net35\ApprovalUtilities.dll</HintPath>
3838
</Reference>
39-
<Reference Include="LibGit2Sharp">
40-
<HintPath>..\packages\LibGit2Sharp.0.19.0.0\lib\net40\LibGit2Sharp.dll</HintPath>
39+
<Reference Include="LibGit2Sharp, Version=0.20.1.0, Culture=neutral, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\packages\LibGit2Sharp.0.20.1.0\lib\net40\LibGit2Sharp.dll</HintPath>
4142
</Reference>
4243
<Reference Include="NSubstitute, Version=1.8.1.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
4344
<SpecificVersion>False</SpecificVersion>
@@ -75,7 +76,9 @@
7576
</ProjectReference>
7677
</ItemGroup>
7778
<ItemGroup>
78-
<None Include="packages.config" />
79+
<None Include="packages.config">
80+
<SubType>Designer</SubType>
81+
</None>
7982
<None Include="TestBuildFile.proj" />
8083
</ItemGroup>
8184
<ItemGroup>
@@ -92,10 +95,6 @@
9295
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9396
<PropertyGroup>
9497
<PostBuildEvent>
95-
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
96-
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
97-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
98-
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
99-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
98+
</PostBuildEvent>
10099
</PropertyGroup>
101100
</Project>

‎GitVersionExe.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="ApprovalTests" version="3.0.7" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.7" targetFramework="net45" />
5-
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net45" />
5+
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
66
<package id="NSubstitute" version="1.8.1.0" targetFramework="net45" />
77
<package id="NUnit" version="2.6.4" targetFramework="net45" />
88
<package id="Shouldly" version="2.3.1" targetFramework="net45" />

‎GitVersionExe/GitVersionExe.csproj

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props" Condition="Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +12,7 @@
1112
<AssemblyName>GitVersion</AssemblyName>
1213
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>a380a39e</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>99f39909</NuGetPackageImportStamp>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -41,7 +42,7 @@
4142
<Private>False</Private>
4243
</Reference>
4344
<Reference Include="LibGit2Sharp">
44-
<HintPath>..\packages\LibGit2Sharp.0.19.0.0\lib\net40\LibGit2Sharp.dll</HintPath>
45+
<HintPath>..\packages\LibGit2Sharp.0.20.1.0\lib\net40\LibGit2Sharp.dll</HintPath>
4546
</Reference>
4647
<Reference Include="System" />
4748
<Reference Include="System.Core" />
@@ -87,11 +88,11 @@
8788
</ItemGroup>
8889
<ItemGroup>
8990
<Content Include="GemAssets\.gitignore" />
90-
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\git2-69db893.dll">
91-
<Link>costura64\git2-69db893.dll</Link>
91+
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.20.1.0\lib\net40\NativeBinaries\amd64\git2-91fa31f.dll">
92+
<Link>costura64\git2-91fa31f.dll</Link>
9293
</EmbeddedResource>
93-
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\x86\git2-69db893.dll">
94-
<Link>costura32\git2-69db893.dll</Link>
94+
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.20.1.0\lib\net40\NativeBinaries\x86\git2-91fa31f.dll">
95+
<Link>costura32\git2-91fa31f.dll</Link>
9596
</EmbeddedResource>
9697
<Content Include="FodyWeavers.xml">
9798
<SubType>Designer</SubType>
@@ -171,6 +172,7 @@
171172
</PropertyGroup>
172173
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
173174
<Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
175+
<Error Condition="!Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props'))" />
174176
</Target>
175177
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
176178
<ParameterGroup>
@@ -210,11 +212,7 @@ foreach (var item in filesToCleanup)
210212
</Target>
211213
<PropertyGroup>
212214
<PostBuildEvent>
213-
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
214-
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
215-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
216-
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
217-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
215+
</PostBuildEvent>
218216
</PropertyGroup>
219217
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
220218
<Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />

‎GitVersionExe/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
55
<package id="Fody" version="1.26.4" targetFramework="net40" developmentDependency="true" />
66
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
7-
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net40" />
7+
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net40" />
88
<package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
99
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
1010
</packages>

‎GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<SpecificVersion>False</SpecificVersion>
4848
<HintPath>..\packages\FluentDateTime.1.11.0\Lib\NET35\FluentDateTime.dll</HintPath>
4949
</Reference>
50-
<Reference Include="LibGit2Sharp, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<Reference Include="LibGit2Sharp, Version=0.20.1.0, Culture=neutral, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\packages\LibGit2Sharp.0.19.0.0\lib\net40\LibGit2Sharp.dll</HintPath>
52+
<HintPath>..\packages\LibGit2Sharp.0.20.1.0\lib\net40\LibGit2Sharp.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Microsoft.Build.Framework" />
5555
<Reference Include="Microsoft.Build.Utilities.v4.0" />
@@ -251,11 +251,7 @@
251251
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
252252
<PropertyGroup>
253253
<PostBuildEvent>
254-
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
255-
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
256-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
257-
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
258-
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
254+
</PostBuildEvent>
259255
</PropertyGroup>
260256
<Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
261257
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

0 commit comments

Comments
 (0)