Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Commit 22dd24d

Browse files
JakeGinnivanJakeGinnivan
committed
Merge pull request #2 from asbjornu/feature/mono-support
Mono support
2 parents 1fae87f + 15624a0 commit 22dd24d

File tree

8 files changed

+26
-16
lines changed

8 files changed

+26
-16
lines changed

‎.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/GitTools.Testing.sln
3+
sudo: false
4+
install:
5+
# - sudo nuget update -self
6+
- nuget restore src/GitTools.Testing.sln
7+
- nuget install xunit.runner.console -Version 2.1.0 -OutputDirectory ./src/packages
8+
script:
9+
- xbuild ./src/GitTools.Testing.sln /property:Configuration="Debug" /verbosity:detailed
10+
- mono --debug --runtime=v4.0.30319 ./src/packages/xunit.runner.console.2.1.0/tools/xunit.console.exe ./src/GitTools.Testing.Tests/bin/Debug/GitTools.Testing.Tests.dll

‎src/GitTools.Testing.Tests/GitTools.Testing.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>GitTools.Testing.Tests</RootNamespace>
1212
<AssemblyName>GitTools.Testing.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<NuGetPackageImportStamp>
1616
</NuGetPackageImportStamp>

‎src/GitTools.Testing.Tests/packages.config

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
4-
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
5-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
6-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
7-
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
3+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
4+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
5+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
6+
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
87
</packages>

‎src/GitTools.Testing.sln

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
4+
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".configs", ".configs", "{EB4A8A14-F0E1-424C-84C2-8FF29E4B62FA}"
77
ProjectSection(SolutionItems) = preProject
8+
..\.travis.yml = ..\.travis.yml
89
..\appveyor.yml = ..\appveyor.yml
910
GitTools.Testing.nuspec = GitTools.Testing.nuspec
1011
..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml

‎src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void SetupRepo(Action<IRepository> initialMasterAction)
3434
{
3535
var randomFile = Path.Combine(Repository.Info.WorkingDirectory, Guid.NewGuid().ToString());
3636
File.WriteAllText(randomFile, string.Empty);
37-
Repository.Stage(randomFile);
37+
Commands.Stage(Repository, randomFile);
3838

3939
initialMasterAction(Repository);
4040

‎src/GitTools.Testing/GitTestExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static Commit CreateFileAndCommit(this IRepository repository, string rel
4646
var contents = Guid.NewGuid().ToString().PadRight(totalWidth, '.');
4747
File.WriteAllText(randomFile, contents);
4848

49-
repository.Stage(randomFile);
49+
Commands.Stage(repository, randomFile);
5050

5151
return repository.Commit(string.Format("Test Commit for file '{0}' - {1}", relativeFileName, commitMessage),
5252
Generate.SignatureNow(), Generate.SignatureNow());

‎src/GitTools.Testing/GitTools.Testing.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.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>
@@ -26,7 +26,7 @@
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
<DocumentationFile>bin\GitTools.Testing.xml</DocumentationFile>
29-
<NoWarn>1591</NoWarn>
29+
<NoWarn>1591,414</NoWarn>
3030
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3131
<Prefer32Bit>false</Prefer32Bit>
3232
</PropertyGroup>
@@ -43,8 +43,8 @@
4343
<Prefer32Bit>false</Prefer32Bit>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
47-
<HintPath>..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
46+
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
47+
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="System" />
@@ -80,7 +80,7 @@
8080
<PropertyGroup>
8181
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
8282
</PropertyGroup>
83-
<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'))" />
83+
<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'))" />
8484
</Target>
8585
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8686
Other similar extension points exist, see Microsoft.Common.targets.

‎src/GitTools.Testing/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net40" />
4-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net40" />
3+
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
4+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />
55
<package id="LibLog" version="4.2.5" targetFramework="net40" developmentDependency="true" />
66
</packages>

0 commit comments

Comments
 (0)