Merge pull request #4 from arturcic/feature/netstandard

Fix travis build
GitTools · May 27, 2018 · 4a5356b · 4a5356b
2 parents a376842 + 835493e
commit 4a5356b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,8 @@
 language: csharp
 sudo: required
 dist: trusty
-dotnet: 2.1.103
+dotnet: 2.1.105
 mono:
-  - 5.2.0
-  - 5.4.1
-  - 5.4.0
   - latest
 os:
   - linux
@@ -14,10 +11,6 @@ before_install:
   - git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags 
 script:
   - ./build.sh -v Diagnostic
-cache:
-  directories:
-    - src/packages
-    - tools
 env:
   global:
     - DOTNET_CLI_TELEMETRY_OPTOUT: 1

diff --git a/build.cake b/build.cake
@@ -23,7 +23,7 @@ string buildDir = "./build/";
 void Build(string configuration, string nugetVersion, string semVersion, string version, string preReleaseTag)
 {
 
-    DotNetBuild("./src/GitVersion.sln", settings =>
+    MSBuild("./src/GitVersion.sln", settings =>
 	{
 	 settings.SetConfiguration(configuration)
         .SetVerbosity(Verbosity.Minimal)
@@ -142,8 +142,9 @@ Task("Run-Tests")
 {	
      var settings = new DotNetCoreTestSettings
      {
-         Configuration = configuration,
-		 NoBuild = true,		
+        Configuration = configuration,
+        NoBuild = true,
+        Filter = "TestCategory!=NoMono"		
      };
 
      DotNetCoreTest("./src/GitVersionCore.Tests/GitVersionCore.Tests.csproj", settings);
@@ -474,8 +475,6 @@ Task("Upload-AppVeyor-Artifacts")
 	Error(exception.Dump());
 });
 
-
-
 Task("Travis")
   .IsDependentOn("Run-Tests");
 

diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -41,7 +41,7 @@
     <PackageReference Include="NSubstitute" Version="1.10.0.0" />
     <PackageReference Include="NUnit" Version="3.9.0" />
     <packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
-    <PackageReference Include="Shouldly" Version="2.8.3" />
+    <PackageReference Include="Shouldly" Version="3.0.0" />
     <PackageReference Include="TestStack.ConventionTests" Version="3.0.0" />
     <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />  
   </ItemGroup>

diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="NSubstitute" Version="1.10.0"></PackageReference>
     <PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
     <packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
-    <PackageReference Include="Shouldly" Version="2.7.0"></PackageReference>
+    <PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net461'">

diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -51,7 +51,7 @@
     <PackageReference Include="NUnit" Version="3.9.0"></PackageReference>
     <packagereference Include="NUnit3TestAdapter" Version="3.9.0"></packagereference>
     <PackageReference Include="ObjectApproval" Version="1.3.0"></PackageReference>
-    <PackageReference Include="Shouldly" Version="2.7.0"></PackageReference>
+    <PackageReference Include="Shouldly" Version="3.0.0"></PackageReference>
     <PackageReference Include="System.Reflection.Metadata" Version="1.4.2"></PackageReference>
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1"></PackageReference>
   </ItemGroup>

diff --git a/tools/packages.config b/tools/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-	 <package id="Cake" version="0.26.1" />
-	 <package id="Cake.CoreCLR" version="0.26.1" />
+	 <package id="Cake" version="0.27.2" />
+	 <package id="Cake.CoreCLR" version="0.27.2" />
 </packages>