Merge branch 'feature/mono-support'

Author: JakeGinnivan

.gitignore

@@ -87,10 +87,11 @@ GitVersion.sln.ide/
 Packages/
 build/
 site/
+/TestResult.xml
 
 ################
 # Project Rider
 ################
 
 .idea
-*.sln.iml
+*.sln.iml

.travis.yml

@@ -0,0 +1,10 @@
+language: csharp
+solution: src/GitVersion.sln
+sudo: true
+install:
+  - sudo nuget update -self
+  - nuget restore src/GitVersion.sln
+  - nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./src/packages
+script:
+  - xbuild "./src/GitVersion.sln" /property:Configuration="Debug" /verbosity:detailed
+  - 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

@@ -30,7 +30,7 @@ build_script:
   - cmd: appveyor PushArtifact "build\GitVersionTfsTaskBuild\gittools.gitversion-%GitVersion_SemVer%.vsix"
 
 test_script:
-  - 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
+  - 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"
 
 cache:
   - 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

@@ -13,6 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionCore.Tests", "Git
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EFFC5D6-88D0-49D9-BB53-E1B7EB49DD45}"
 	ProjectSection(SolutionItems) = preProject
+		..\.travis.yml = ..\.travis.yml
 		..\appveyor.yml = ..\appveyor.yml
 		..\BREAKING CHANGES.md = ..\BREAKING CHANGES.md
 		..\Build.cmd = ..\Build.cmd

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.137\build\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -42,16 +42,16 @@
       <HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.0.0\lib\net45\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GitTools.Testing, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Testing.1.1.0\lib\net4\GitTools.Testing.dll</HintPath>
+    <Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Testing.1.1.1-beta0001\lib\net4\GitTools.Testing.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
+    <Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
@@ -66,9 +66,9 @@
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
@@ -193,8 +193,8 @@
     <PropertyGroup>
       <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>
     </PropertyGroup>
-    <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'))" />
     <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'))" />
+    <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'))" />
   </Target>
   <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
 </Project>

src/GitVersionCore.Tests/Mocks/MockBranch.cs

@@ -5,14 +5,14 @@
 
 public class MockBranch : Branch, ICollection<Commit>
 {
-    public MockBranch(string name)
+    public MockBranch(string friendlyName)
     {
-        this.name = name;
-        canonicalName = name;
+        this.friendlyName = friendlyName;
+        this.canonicalName = friendlyName;
     }
-    public MockBranch(string name, string canonicalName)
+    public MockBranch(string friendlyName, string canonicalName)
     {
-        this.name = name;
+        this.friendlyName = friendlyName;
         this.canonicalName = canonicalName;
     }
 
@@ -21,9 +21,9 @@ public MockBranch()
 
     }
     MockCommitLog commits = new MockCommitLog();
-    string name;
+    string friendlyName;
     string canonicalName;
-    public override string FriendlyName { get { return name; } }
+    public override string FriendlyName { get { return friendlyName; } }
     public override ICommitLog Commits { get { return commits; } }
     public override Commit Tip { get { return commits.First(); } }
     public override bool IsTracking { get { return true; } }
@@ -35,7 +35,7 @@ public override string CanonicalName
 
     public override int GetHashCode()
     {
-        return name.GetHashCode();
+        return this.friendlyName.GetHashCode();
     }
 
     public override bool Equals(object obj)

src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs

@@ -11,9 +11,9 @@ public override IEnumerator<Branch> GetEnumerator()
         return Branches.GetEnumerator();
     }
 
-    public override Branch this[string name]
+    public override Branch this[string friendlyName]
     {
-        get { return Branches.FirstOrDefault(x => x.FriendlyName == name); }
+        get { return Branches.FirstOrDefault(x => x.FriendlyName == friendlyName); }
     }
 
     public void Add(Branch item)

src/GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -97,8 +97,6 @@ public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)
         throw new NotImplementedException();
     }
 
-    public Dictionary<string, GitObject> LookupResults { get; set; }
-
     public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false)
     {
         throw new NotImplementedException();

src/GitVersionCore.Tests/app.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.23.0.0" newVersion="0.23.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

src/GitVersionCore.Tests/packages.config

@@ -2,13 +2,13 @@
 <packages>
   <package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
   <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.0.0" targetFramework="net45" />
-  <package id="GitTools.Testing" version="1.1.0" targetFramework="net45" />
-  <package id="LibGit2Sharp" version="0.22.0" targetFramework="net45" />
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
+  <package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
+  <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
   <package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="3.2.1" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
   <package id="Shouldly" version="2.7.0" targetFramework="net45" />
   <package id="TestStack.ConventionTests" version="3.0.0" targetFramework="net45" />