Merge pull request #1 from Baune8D/pull-test

Upload to codecov through AppVeyor to support pull requests

Author: Morten Larsen

.gitignore

@@ -1,5 +1,6 @@
-# Coverage Report folder
+# Coverage Report
 coverage
+coverage.xml
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

README.md

@@ -1,5 +1,5 @@
 # ExpressionCache
-[![Build status](https://ci.appveyor.com/api/projects/status/qmxfk6hhua5ev2cn?svg=true)](https://ci.appveyor.com/project/Baune8D/expressioncache)
+[![Build status](https://ci.appveyor.com/api/projects/status/0abskdimkpe1m558?svg=true)](https://ci.appveyor.com/project/Baune8D/expressioncache)
 [![codecov](https://codecov.io/gh/Baune8D/expressioncache/branch/master/graph/badge.svg)](https://codecov.io/gh/Baune8D/expressioncache)
 
 NuGet feed: [https://www.myget.org/F/baunegaard/api/v3/index.json](https://www.myget.org/F/baunegaard/api/v3/index.json)

appveyor.yml

@@ -8,23 +8,26 @@ branches:
 image: Visual Studio 2017
 
 environment:
-  CODECOV_TOKEN:
-    secure: I7bieXWtobeo2d40BMek/GSjy5Z0Wihr1dZ+G8qujzKpGyzxxaR7zzPrWteRfkSK
   MYGET_API_KEY:
     secure: 78qy8e6pKfJlQV7RAG5tJOWegzXpjASkUs3aFdVBoPYA5gi6+mWdjbuAmNa5OQPe
 
+cache:
+  - tools -> tools\packages.config
+
 assembly_info:
   patch: false
 
 configuration:
   - Release
 
-before_build:
-  - cmd: git remote set-url origin https://github.com/Baune8D/expressioncache.git
-
 build_script:
   - ps: .\build.ps1
 
+after_build:
+  - "SET PATH=C:\\Python36;C:\\Python36\\Scripts;%PATH%"
+  - pip install codecov
+  - codecov -f "coverage.xml" -X gcov
+
 test: off
 
 deploy: off

build.cake

@@ -1,10 +1,7 @@
 #tool "nuget:?package=GitVersion.CommandLine&prerelease"
 #tool "nuget:?package=OpenCover"
-#tool "nuget:?package=Codecov"
 #tool "nuget:?package=ReportGenerator"
 
-#addin "nuget:?package=Cake.Codecov"
-
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 //////////////////////////////////////////////////////////////////////
@@ -17,7 +14,7 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 var solutionFile = "./ExpressionCache.sln";
-var coverageResult = "./TestResult.xml";
+var coverageResult = "./coverage.xml";
 
 string[] coverageFilters = 
 {
@@ -109,11 +106,6 @@ Task("Test")
 		},
 		coverageResult, settings);
 	}
-
-	if (AppVeyor.IsRunningOnAppVeyor)
-	{
-		Codecov(coverageResult, EnvironmentVariable("CODECOV_TOKEN"));
-	}
 });
 
 Task("Coverage-Report")

test/ExpressionCache.Core.Tests/ExpressionCacheBaseTests.cs

@@ -7,8 +7,7 @@
 
 namespace ExpressionCache.Core.Tests
 {
-    [Collection("HelperCollection")]
-    public class ExpressionCacheBaseTests
+    public class ExpressionCacheBaseTests : IClassFixture<TestFunctionsFixture>
     {
         private readonly TestFunctionsFixture _testFunctions;
 

test/ExpressionCache.Core.Tests/ExpressionResultTests.cs

@@ -6,8 +6,7 @@
 
 namespace ExpressionCache.Core.Tests
 {
-    [Collection("HelperCollection")]
-    public class ExpressionResultTests
+    public class ExpressionResultTests : IClassFixture<TestFunctionsFixture>
     {
         private readonly TestFunctionsFixture _testFunctions;
 

test/ExpressionCache.Core.Tests/TestHelpers/HelperCollection.cs

@@ -18,7 +18,6 @@ public class DistributedCacheServiceTests : IClassFixture<TestFunctionsFixture>
         private readonly MemoryDistributedCache _memoryDistributedCache;
         private readonly IDistributedCacheService _distributedCacheService;
 
-        private const string Key = "TestKey";
         private const string Value = "TestValue";
 
         public DistributedCacheServiceTests(TestFunctionsFixture testFunctions)