Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LibGit2Sharp to 0.25.0-preview-0033 #1416

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,4 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>

</Project>
10 changes: 0 additions & 10 deletions src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
6 changes: 3 additions & 3 deletions src/GitVersionCore/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
1 change: 0 additions & 1 deletion src/GitVersionCore/GitVersionCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,4 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/GitVersionExe/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion src/GitVersionExe/GitVersionExe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions src/GitVersionTask.Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
4 changes: 2 additions & 2 deletions src/GitVersionTask.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions tools/packages.config
Original file line number Diff line number Diff line change
@@ -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>