Skip to content

Commit f4795ff

Browse files
JakeGinnivanJakeGinnivan
committed
Merge branch 'feature/mono-support'
2 parents 7144327 + d56f453 commit f4795ff

26 files changed

+150
-92
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@ GitVersion.sln.ide/
8787
Packages/
8888
build/
8989
site/
90+
/TestResult.xml
9091

9192
################
9293
# Project Rider
9394
################
9495

9596
.idea
96-
*.sln.iml
97+
*.sln.iml

‎.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: csharp
2+
solution: src/GitVersion.sln
3+
sudo: true
4+
install:
5+
- sudo nuget update -self
6+
- nuget restore src/GitVersion.sln
7+
- nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./src/packages
8+
script:
9+
- xbuild "./src/GitVersion.sln" /property:Configuration="Debug" /verbosity:detailed
10+
- mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ build_script:
3030
- cmd: appveyor PushArtifact "build\GitVersionTfsTaskBuild\gittools.gitversion-%GitVersion_SemVer%.vsix"
3131

3232
test_script:
33-
- nunit-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow
33+
- nunit3-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll"
3434

3535
cache:
3636
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

‎src/GitVersion.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionCore.Tests", "Git
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EFFC5D6-88D0-49D9-BB53-E1B7EB49DD45}"
1515
ProjectSection(SolutionItems) = preProject
16+
..\.travis.yml = ..\.travis.yml
1617
..\appveyor.yml = ..\appveyor.yml
1718
..\BREAKING CHANGES.md = ..\BREAKING CHANGES.md
1819
..\Build.cmd = ..\Build.cmd

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 11 additions & 11 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>
@@ -42,16 +42,16 @@
4242
<HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\GitTools.Core.1.0.0\lib\net45\GitTools.Core.dll</HintPath>
45+
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
49-
<Reference Include="GitTools.Testing, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\GitTools.Testing.1.1.0\lib\net4\GitTools.Testing.dll</HintPath>
49+
<Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\GitTools.Testing.1.1.1-beta0001\lib\net4\GitTools.Testing.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
54-
<HintPath>..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
53+
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
54+
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
@@ -66,9 +66,9 @@
6666
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
69+
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
70+
<HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
71+
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
7474
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
@@ -193,8 +193,8 @@
193193
<PropertyGroup>
194194
<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>
195195
</PropertyGroup>
196-
<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'))" />
197196
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
197+
<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'))" />
198198
</Target>
199199
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
200200
</Project>

‎src/GitVersionCore.Tests/Mocks/MockBranch.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
public class MockBranch : Branch, ICollection<Commit>
77
{
8-
public MockBranch(string name)
8+
public MockBranch(string friendlyName)
99
{
10-
this.name = name;
11-
canonicalName = name;
10+
this.friendlyName = friendlyName;
11+
this.canonicalName = friendlyName;
1212
}
13-
public MockBranch(string name, string canonicalName)
13+
public MockBranch(string friendlyName, string canonicalName)
1414
{
15-
this.name = name;
15+
this.friendlyName = friendlyName;
1616
this.canonicalName = canonicalName;
1717
}
1818

@@ -21,9 +21,9 @@ public MockBranch()
2121

2222
}
2323
MockCommitLog commits = new MockCommitLog();
24-
string name;
24+
string friendlyName;
2525
string canonicalName;
26-
public override string FriendlyName { get { return name; } }
26+
public override string FriendlyName { get { return friendlyName; } }
2727
public override ICommitLog Commits { get { return commits; } }
2828
public override Commit Tip { get { return commits.First(); } }
2929
public override bool IsTracking { get { return true; } }
@@ -35,7 +35,7 @@ public override string CanonicalName
3535

3636
public override int GetHashCode()
3737
{
38-
return name.GetHashCode();
38+
return this.friendlyName.GetHashCode();
3939
}
4040

4141
public override bool Equals(object obj)

‎src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public override IEnumerator<Branch> GetEnumerator()
1111
return Branches.GetEnumerator();
1212
}
1313

14-
public override Branch this[string name]
14+
public override Branch this[string friendlyName]
1515
{
16-
get { return Branches.FirstOrDefault(x => x.FriendlyName == name); }
16+
get { return Branches.FirstOrDefault(x => x.FriendlyName == friendlyName); }
1717
}
1818

1919
public void Add(Branch item)

‎src/GitVersionCore.Tests/Mocks/MockRepository.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)
9797
throw new NotImplementedException();
9898
}
9999

100-
public Dictionary<string, GitObject> LookupResults { get; set; }
101-
102100
public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false)
103101
{
104102
throw new NotImplementedException();

‎src/GitVersionCore.Tests/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-0.23.0.0" newVersion="0.23.0.0" />
12+
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>
1115
</configuration>

‎src/GitVersionCore.Tests/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<packages>
33
<package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
44
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
5-
<package id="GitTools.Core" version="1.0.0" targetFramework="net45" />
6-
<package id="GitTools.Testing" version="1.1.0" targetFramework="net45" />
7-
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net45" />
8-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
5+
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
6+
<package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
7+
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
8+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
99
<package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
1010
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
11-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
11+
<package id="NUnit" version="3.2.1" targetFramework="net45" />
1212
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
1313
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
1414
<package id="TestStack.ConventionTests" version="3.0.0" targetFramework="net45" />

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 8 additions & 7 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>
@@ -38,16 +38,16 @@
3838
<DocumentationFile>bin\Release\GitVersionCore.xml</DocumentationFile>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\GitTools.Core.1.0.0\lib\net4\GitTools.Core.dll</HintPath>
41+
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
4646
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.4.0\Lib\JetBrains.Annotations.dll</HintPath>
4747
<Private>False</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="System" />
@@ -171,6 +171,7 @@
171171
<EmbeddedResource Include="VersionAssemblyInfoResources\VersionAssemblyInfo.fs" />
172172
</ItemGroup>
173173
<ItemGroup>
174+
<None Include="app.config" />
174175
<None Include="NugetAssets\GitVersion.nuspec">
175176
<SubType>Designer</SubType>
176177
</None>
@@ -183,8 +184,8 @@
183184
<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>
184185
</PropertyGroup>
185186
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
186-
<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'))" />
187187
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
188+
<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'))" />
188189
</Target>
189190
<PropertyGroup>
190191
<PostBuildEvent>
@@ -198,7 +199,7 @@
198199
</Target>
199200
<Target Name="AfterBuild" DependsOnTargets="Clean">
200201
<!-- NugetRefBuild -->
201-
<MakeDir Directories="$(SolutionDir)NuGetRefBuild" />
202+
<MakeDir Directories="$(SolutionDir)NuGetRefBuild\lib\Net45" />
202203
<Copy SourceFiles="$(OutputPath)GitVersionCore.dll" DestinationFolder="$(BuildDir)NuGetRefBuild\lib\Net45" />
203204
<Copy SourceFiles="$(OutputPath)GitVersionCore.pdb" DestinationFolder="$(BuildDir)NuGetRefBuild\lib\Net45" Condition="Exists('$(OutputPath)GitVersionCore.pdb')" />
204205
<Copy SourceFiles="$(OutputPath)GitVersionCore.dll.mdb" DestinationFolder="$(BuildDir)NuGetRefBuild\lib\Net45" Condition="Exists('$(OutputPath)GitVersionCore.dll.mdb')" />

‎src/GitVersionCore/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/GitVersionCore/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<packages>
33
<package id="Caseless.Fody" version="1.4.1" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
5-
<package id="GitTools.Core" version="1.0.0" targetFramework="net40" />
5+
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
66
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
7-
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net40" />
8-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net40" />
7+
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
8+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />
99
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />
1010
<package id="Visualize.Fody" version="0.4.5.0" targetFramework="net40" developmentDependency="true" />
1111
<package id="YamlDotNet" version="3.8.0" targetFramework="net40" />

0 commit comments

Comments
 (0)