Skip to content

Commit 98359c2

Browse files
AArnottAArnott
authored
Merge pull request #210 from AArnott/fix143
Update libgit2sharp to latest stable version
2 parents 35e70f9 + 283a122 commit 98359c2

File tree

11 files changed

+55
-55
lines changed

11 files changed

+55
-55
lines changed

‎src/MSBuildExtensionTask/ContextAwareTask.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.IO;
55
using System.Linq;
66
using System.Reflection;
7-
#if NETCOREAPP1_0
7+
#if NETCOREAPP2_0
88
using System.Runtime.Loader;
99
#endif
1010
using Microsoft.Build.Framework;
@@ -18,7 +18,7 @@ public abstract class ContextAwareTask : Task
1818

1919
public override bool Execute()
2020
{
21-
#if NETCOREAPP1_0
21+
#if NETCOREAPP2_0
2222
string taskAssemblyPath = new Uri(this.GetType().GetTypeInfo().Assembly.CodeBase).LocalPath;
2323
var ctxt = new CustomAssemblyLoader(this);
2424
Assembly inContextAssembly = ctxt.LoadFromAssemblyPath(taskAssemblyPath);
@@ -68,7 +68,7 @@ public override bool Execute()
6868

6969
protected abstract bool ExecuteInner();
7070

71-
#if NETCOREAPP1_0
71+
#if NETCOREAPP2_0
7272
private class CustomAssemblyLoader : AssemblyLoadContext
7373
{
7474
private readonly ContextAwareTask loaderTask;

‎src/MSBuildExtensionTask/MSBuildExtensionTask.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.0;net45</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" PrivateAssets="all" />
1010
</ItemGroup>
11-
<ItemGroup Condition="'$(TargetFramework)' == 'net45' ">
11+
<ItemGroup Condition="'$(TargetFramework)' == 'net461' ">
1212
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
1313
</ItemGroup>
14-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
14+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
1515
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.1.548" />
1616
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
1717
</ItemGroup>

‎src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net452</TargetFramework>
3+
<TargetFramework>net461</TargetFramework>
44
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
55
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
66
<DebugType>full</DebugType>
@@ -27,7 +27,7 @@
2727
<PackageReference Include="7z.NET" Version="1.0.3" />
2828
<PackageReference Include="Newtonsoft.Json.Schema" Version="2.0.11" />
2929
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
30-
<PackageReference Include="Microsoft.Build" Version="14.3" Condition=" '$(TargetFramework)' == 'net452' " />
30+
<PackageReference Include="Microsoft.Build" Version="14.3" Condition=" '$(TargetFramework)' == 'net461' " />
3131
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.5.24" />
3232
<PackageReference Include="Xunit.Combinatorial" Version="1.1.12" />
3333
<PackageReference Include="xunit" Version="2.2.0" />

‎src/NerdBank.GitVersioning/GitExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public static IEnumerable<Commit> GetCommitsFromVersion(this Repository repo, Ve
289289
return possibleCommits;
290290
}
291291

292-
#if NET45
292+
#if NET461
293293
/// <summary>
294294
/// Assists the operating system in finding the appropriate native libgit2 module.
295295
/// </summary>
@@ -356,13 +356,13 @@ public static void AddDirectoryToPath(string directory)
356356
/// <returns>Receives the directory that native binaries are expected.</returns>
357357
public static string FindLibGit2NativeBinaries(string basePath)
358358
{
359-
#if !NET45
359+
#if !NET461
360360
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
361361
#endif
362362
{
363363
return Path.Combine(basePath, "lib", "win32", IntPtr.Size == 4 ? "x86" : "x64");
364364
}
365-
#if !NET45
365+
#if !NET461
366366
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
367367
{
368368
return Path.Combine(basePath, "lib", "linux", IntPtr.Size == 4 ? "x86" : "x86_64");

‎src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp1.0;net45</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
44
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<DebugType>Full</DebugType>
66
<IsPackable>false</IsPackable>
77
<PackageId>Nerdbank.GitVersioning.Core</PackageId>
88
</PropertyGroup>
99
<ItemGroup>
1010
<PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
11-
<PackageReference Include="LibGit2Sharp" Version="0.24.7-g9fca61fdda" PrivateAssets="None" />
11+
<PackageReference Include="LibGit2Sharp" Version="0.25.2" PrivateAssets="none" />
1212
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
13-
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
13+
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netcoreapp2.0' " />
1414
<PackageReference Include="Validation" Version="2.3.7" />
1515
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
1616
</ItemGroup>

‎src/NerdBank.GitVersioning/VersionFile.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
namespace Nerdbank.GitVersioning
22
{
3-
using System;
4-
using System.Collections.Generic;
5-
using System.IO;
6-
using System.Linq;
73
using Newtonsoft.Json;
84
using Newtonsoft.Json.Converters;
95
using Newtonsoft.Json.Linq;
106
using Newtonsoft.Json.Serialization;
7+
using System;
8+
using System.Collections.Generic;
9+
using System.IO;
10+
using System.Linq;
1111
using Validation;
1212

1313
/// <summary>
@@ -48,7 +48,7 @@ public static VersionOptions GetVersion(LibGit2Sharp.Commit commit, string repoR
4848
{
4949
string parentDirectory = searchDirectory.Length > 0 ? Path.GetDirectoryName(searchDirectory) : null;
5050

51-
string candidatePath = Path.Combine(searchDirectory, TxtFileName);
51+
string candidatePath = Path.Combine(searchDirectory, TxtFileName).Replace('\\', '/');
5252
var versionTxtBlob = commit.Tree[candidatePath]?.Target as LibGit2Sharp.Blob;
5353
if (versionTxtBlob != null)
5454
{
@@ -59,7 +59,7 @@ public static VersionOptions GetVersion(LibGit2Sharp.Commit commit, string repoR
5959
}
6060
}
6161

62-
candidatePath = Path.Combine(searchDirectory, JsonFileName);
62+
candidatePath = Path.Combine(searchDirectory, JsonFileName).Replace('\\', '/');
6363
var versionJsonBlob = commit.Tree[candidatePath]?.Target as LibGit2Sharp.Blob;
6464
if (versionJsonBlob != null)
6565
{

‎src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
public class AssemblyVersionInfo : Task
1616
{
17-
#if NET45
17+
#if NET461
1818
private static readonly CodeGeneratorOptions codeGeneratorOptions = new CodeGeneratorOptions
1919
{
2020
BlankLinesBetweenMembers = false,
@@ -70,7 +70,7 @@ the code is regenerated.
7070

7171
public string AssemblyConfiguration { get; set; }
7272

73-
#if NET45
73+
#if NET461
7474
public override bool Execute()
7575
{
7676
if (CodeDomProvider.IsDefinedLanguage(this.CodeLanguage))

‎src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private void CreateDefines()
166166
{
167167
if (!int.TryParse(this.AssemblyLanguage, out lcid))
168168
{
169-
#if NET45
169+
#if NET461
170170
try
171171
{
172172
var cultureInfo = new CultureInfo(this.AssemblyLanguage);

‎src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp1.0;net45</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55

66
<NuSpecFile>Nerdbank.GitVersioning.nuspec</NuSpecFile>
@@ -18,15 +18,15 @@
1818

1919
<Target Name="SetNuSpecPropertiesFinal" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion;SetNuSpecProperties">
2020
<PropertyGroup>
21-
<LibGit2SharpNativeBinaries>$(NuGetPackageRoot)libgit2sharp.nativebinaries\1.0.165\</LibGit2SharpNativeBinaries>
21+
<LibGit2SharpNativeBinaries>$(NuGetPackageRoot)libgit2sharp.nativebinaries\1.0.217\</LibGit2SharpNativeBinaries>
2222
<NuspecProperties>$(NuspecProperties);LicenseUrl=$(PackageLicenseUrl);Version=$(Version);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries)</NuspecProperties>
2323
</PropertyGroup>
2424
</Target>
2525

2626
<Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
2727
<PropertyGroup>
28-
<BuildSubDir Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">MSBuildCore\</BuildSubDir>
29-
<BuildSubDir Condition=" '$(TargetFramework)' == 'net45' ">MSBuildFull\</BuildSubDir>
28+
<BuildSubDir Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">MSBuildCore\</BuildSubDir>
29+
<BuildSubDir Condition=" '$(TargetFramework)' == 'net461' ">MSBuildFull\</BuildSubDir>
3030
</PropertyGroup>
3131
<Error Text="Unrecognized TargetFramework" Condition=" '$(BuildSubDir)' == '' " />
3232
<ItemGroup>
@@ -40,8 +40,8 @@
4040
<PackagePath>build\$(BuildSubDir)</PackagePath>
4141
</TfmSpecificPackageFile>
4242
<!-- Package up the libgit2 native binaries -->
43-
<TfmSpecificPackageFile Include="@(None)" Condition=" '%(None.CopyToOutputDirectory)' == 'PreserveNewest' ">
44-
<PackagePath>build\$(BuildSubDir)%(None.Link)</PackagePath>
43+
<TfmSpecificPackageFile Include="@(ContentWithTargetPath)" Condition=" '%(ContentWithTargetPath.CopyToOutputDirectory)' == 'PreserveNewest' ">
44+
<PackagePath>build\$(BuildSubDir)%(ContentWithTargetPath.TargetPath)</PackagePath>
4545
</TfmSpecificPackageFile>
4646
</ItemGroup>
4747
</Target>

‎src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@
1414
<tags>git commit versioning version assemblyinfo</tags>
1515
</metadata>
1616
<files>
17-
<file src="$BaseOutputPath$net45\LibGit2Sharp.dll" target="build\MSBuildFull\LibGit2Sharp.dll" />
18-
<file src="$BaseOutputPath$net45\LibGit2Sharp.dll.config" target="build\MSBuildFull\LibGit2Sharp.dll.config" />
19-
<file src="$BaseOutputPath$net45\MSBuildExtensionTask.dll" target="build\MSBuildFull\MSBuildExtensionTask.dll" />
20-
<file src="$BaseOutputPath$net45\NerdBank.GitVersioning.dll" target="build\MSBuildFull\NerdBank.GitVersioning.dll" />
21-
<file src="$BaseOutputPath$net45\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildFull\Nerdbank.GitVersioning.Tasks.dll" />
22-
<file src="$BaseOutputPath$net45\Newtonsoft.Json.dll" target="build\MSBuildFull\Newtonsoft.Json.dll" />
23-
<file src="$BaseOutputPath$net45\Validation.dll" target="build\MSBuildFull\Validation.dll" />
24-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.dll" target="build\MSBuildFull\lib\win32\x64\git2-1196807.dll" />
25-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.dll" target="build\MSBuildCore\lib\win32\x64\git2-1196807.dll" />
26-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.pdb" target="build\MSBuildFull\lib\win32\x64\git2-1196807.pdb" />
27-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.pdb" target="build\MSBuildCore\lib\win32\x64\git2-1196807.pdb" />
28-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.dll" target="build\MSBuildFull\lib\win32\x86\git2-1196807.dll" />
29-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.dll" target="build\MSBuildCore\lib\win32\x86\git2-1196807.dll" />
30-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.pdb" target="build\MSBuildFull\lib\win32\x86\git2-1196807.pdb" />
31-
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.pdb" target="build\MSBuildCore\lib\win32\x86\git2-1196807.pdb" />
32-
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-1196807.dylib" target="build\MSBuildFull\lib\osx\libgit2-1196807.dylib" />
33-
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-1196807.dylib" target="build\MSBuildCore\lib\osx\libgit2-1196807.dylib" />
34-
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-1196807.so" target="build\MSBuildFull\lib\linux\x86_64\libgit2-1196807.so" />
35-
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-1196807.so" target="build\MSBuildCore\lib\linux\x86_64\libgit2-1196807.so" />
17+
<file src="$BaseOutputPath$net461\LibGit2Sharp.dll" target="build\MSBuildFull\LibGit2Sharp.dll" />
18+
<file src="$BaseOutputPath$net461\LibGit2Sharp.dll.config" target="build\MSBuildFull\LibGit2Sharp.dll.config" />
19+
<file src="$BaseOutputPath$net461\MSBuildExtensionTask.dll" target="build\MSBuildFull\MSBuildExtensionTask.dll" />
20+
<file src="$BaseOutputPath$net461\NerdBank.GitVersioning.dll" target="build\MSBuildFull\NerdBank.GitVersioning.dll" />
21+
<file src="$BaseOutputPath$net461\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildFull\Nerdbank.GitVersioning.Tasks.dll" />
22+
<file src="$BaseOutputPath$net461\Newtonsoft.Json.dll" target="build\MSBuildFull\Newtonsoft.Json.dll" />
23+
<file src="$BaseOutputPath$net461\Validation.dll" target="build\MSBuildFull\Validation.dll" />
24+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-6311e88.dll" target="build\MSBuildFull\lib\win32\x64\git2-6311e88.dll" />
25+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-6311e88.dll" target="build\MSBuildCore\lib\win32\x64\git2-6311e88.dll" />
26+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-6311e88.pdb" target="build\MSBuildFull\lib\win32\x64\git2-6311e88.pdb" />
27+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-6311e88.pdb" target="build\MSBuildCore\lib\win32\x64\git2-6311e88.pdb" />
28+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-6311e88.dll" target="build\MSBuildFull\lib\win32\x86\git2-6311e88.dll" />
29+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-6311e88.dll" target="build\MSBuildCore\lib\win32\x86\git2-6311e88.dll" />
30+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-6311e88.pdb" target="build\MSBuildFull\lib\win32\x86\git2-6311e88.pdb" />
31+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-6311e88.pdb" target="build\MSBuildCore\lib\win32\x86\git2-6311e88.pdb" />
32+
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-6311e88.dylib" target="build\MSBuildFull\lib\osx\libgit2-6311e88.dylib" />
33+
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-6311e88.dylib" target="build\MSBuildCore\lib\osx\libgit2-6311e88.dylib" />
34+
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-6311e88.so" target="build\MSBuildFull\lib\linux\x86_64\libgit2-6311e88.so" />
35+
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-6311e88.so" target="build\MSBuildCore\lib\linux\x86_64\libgit2-6311e88.so" />
3636
<file src="$LibGit2SharpNativeBinaries$libgit2\LibGit2Sharp.dll.config" target="build\MSBuildCore\LibGit2Sharp.dll.config" />
37-
<file src="$BaseOutputPath$netcoreapp1.0\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />
38-
<file src="$BaseOutputPath$netcoreapp1.0\MSBuildExtensionTask.dll" target="build\MSBuildCore\MSBuildExtensionTask.dll" />
39-
<file src="$BaseOutputPath$netcoreapp1.0\NerdBank.GitVersioning.dll" target="build\MSBuildCore\NerdBank.GitVersioning.dll" />
40-
<file src="$BaseOutputPath$netcoreapp1.0\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildCore\Nerdbank.GitVersioning.Tasks.dll" />
41-
<file src="$BaseOutputPath$netcoreapp1.0\Newtonsoft.Json.dll" target="build\MSBuildCore\Newtonsoft.Json.dll" />
42-
<file src="$BaseOutputPath$netcoreapp1.0\Validation.dll" target="build\MSBuildCore\Validation.dll" />
37+
<file src="$BaseOutputPath$netcoreapp2.0\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />
38+
<file src="$BaseOutputPath$netcoreapp2.0\MSBuildExtensionTask.dll" target="build\MSBuildCore\MSBuildExtensionTask.dll" />
39+
<file src="$BaseOutputPath$netcoreapp2.0\NerdBank.GitVersioning.dll" target="build\MSBuildCore\NerdBank.GitVersioning.dll" />
40+
<file src="$BaseOutputPath$netcoreapp2.0\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildCore\Nerdbank.GitVersioning.Tasks.dll" />
41+
<file src="$BaseOutputPath$netcoreapp2.0\Newtonsoft.Json.dll" target="build\MSBuildCore\Newtonsoft.Json.dll" />
42+
<file src="$BaseOutputPath$netcoreapp2.0\Validation.dll" target="build\MSBuildCore\Validation.dll" />
4343

4444
<file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning.targets" />
4545
<file src="buildCrossTargeting\Nerdbank.GitVersioning.targets" target="buildCrossTargeting\Nerdbank.GitVersioning.targets" />

0 commit comments

Comments
 (0)