Merge pull request #8 from alhardy/dev

1.1.0 Release
AppMetrics · Jun 7, 2017 · b0dd328 · b0dd328
2 parents e07f2c0 + a8680f7
commit b0dd328
Show file tree

Hide file tree

Showing 28 changed files with 1,103 additions and 416 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,14 @@ notifications:
       - [email protected]
 
 language: csharp
-# dotnet: 1.0.0-preview2-003131
+dotnet: 1.0.4
 os:
-  - osx
+#  - osx
   - linux
+before_script:
+  - chmod a+x ./build.sh
 script:
-  - ./build_travis.sh
+  - ./build.sh
 
 # .NET CLI require Ubuntu 14.04
 sudo: required
@@ -24,11 +26,11 @@ addons:
     - libunwind8
 
 # .NET CLI require OSX 10.10
-osx_image: xcode7.1
-before_install:  
-  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
+# osx_image: xcode7.1
+# before_install:  
+#  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
 
-mono:  
+mono: 
   - 4.6.0
 
 cache:

diff --git a/AppMetrics.Extensions.Elasticsearch.sln b/AppMetrics.Extensions.Elasticsearch.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.12
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D805782-756E-4C98-B22E-F502BEE95318}"
 EndProject
@@ -49,6 +49,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandbox", "sandbox", "{39DF
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Elasticsearch.Sandbox", "sandbox\App.Metrics.Elasticsearch.Sandbox\App.Metrics.Elasticsearch.Sandbox.csproj", "{2A91A603-9707-48E1-9BC9-9CDFC519ADD6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6A8C1BAE-B40B-4F12-8C04-8CE911330532}"
+	ProjectSection(SolutionItems) = preProject
+		build\common.props = build\common.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Formatters.ElasticSearch", "src\App.Metrics.Formatters.ElasticSearch\App.Metrics.Formatters.ElasticSearch.csproj", "{79110628-27BA-476B-B4DE-93B09EC815A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.Formatting.ElasticSearch", "src\App.Metrics.Formatting.ElasticSearch\App.Metrics.Formatting.ElasticSearch.csproj", "{3A02E3DC-B24A-4260-9F58-F30F3E239411}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +72,14 @@ Global
 		{2A91A603-9707-48E1-9BC9-9CDFC519ADD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A91A603-9707-48E1-9BC9-9CDFC519ADD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A91A603-9707-48E1-9BC9-9CDFC519ADD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79110628-27BA-476B-B4DE-93B09EC815A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79110628-27BA-476B-B4DE-93B09EC815A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79110628-27BA-476B-B4DE-93B09EC815A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79110628-27BA-476B-B4DE-93B09EC815A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A02E3DC-B24A-4260-9F58-F30F3E239411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A02E3DC-B24A-4260-9F58-F30F3E239411}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A02E3DC-B24A-4260-9F58-F30F3E239411}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A02E3DC-B24A-4260-9F58-F30F3E239411}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -74,5 +91,8 @@ Global
 		{2427CA3A-1DF8-4755-9288-B9B4EC2DCF39} = {31A4DDB1-952E-4EED-96EF-29C669279A86}
 		{0E4FD8C9-9113-43E6-A0DB-C8DB1E89DF3B} = {2427CA3A-1DF8-4755-9288-B9B4EC2DCF39}
 		{2A91A603-9707-48E1-9BC9-9CDFC519ADD6} = {39DF701E-9AB2-47DE-96C4-DCCE641F8449}
+		{6A8C1BAE-B40B-4F12-8C04-8CE911330532} = {31A4DDB1-952E-4EED-96EF-29C669279A86}
+		{79110628-27BA-476B-B4DE-93B09EC815A0} = {2D805782-756E-4C98-B22E-F502BEE95318}
+		{3A02E3DC-B24A-4260-9F58-F30F3E239411} = {2D805782-756E-4C98-B22E-F502BEE95318}
 	EndGlobalSection
 EndGlobal
diff --git a/README.md b/README.md
@@ -1,38 +1,43 @@
-# App Metrics Elasticsearch Extensions
+# App Metrics Elasticsearch Extensions <img src="http://app-metrics.io/logo.png" alt="App Metrics" width="50px"/> 
+[![Official Site](https://img.shields.io/badge/site-appmetrics-blue.svg?style=flat-square)](http://app-metrics.io/reporting/elasticsearch.html) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square)](https://opensource.org/licenses/Apache-2.0)
 
-[![Official Site](https://img.shields.io/badge/site-appmetrics-blue.svg)](https://alhardy.github.io/app-metrics-docs/getting-started/intro.html) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Coverage Status](https://coveralls.io/repos/github/alhardy/AppMetrics.Extensions.Elasticsearch/badge.svg?branch=master)](https://coveralls.io/github/alhardy/AppMetrics.Extension.Elasticsearch?branch=master)
+## What is it?
+
+The repo contains Elasticsearch extension packages to [App Metrics](https://github.com/alhardy/AppMetrics).
 
-|AppVeyor|Travis|
-|:--------:|:--------:|
-|[![Build status](https://ci.appveyor.com/api/projects/status/cp8297646ddrj1r3?svg=true)](https://ci.appveyor.com/project/alhardy/appmetrics-extensions-elasticsearch/branch/master)|[![Build status](https://travis-ci.org/alhardy/AppMetrics.Extensions.Elasticsearch.svg?branch=master)](https://travis-ci.org/alhardy/AppMetrics.Extensions.Elasticsearch?branch=master)|
+## Latest Builds, Packages & Repo Stats
 
-|Package|Dev Release|PreRelease|Latest Release|
+|Branch|AppVeyor|Travis|Coverage|
 |------|:--------:|:--------:|:--------:|
-|App.Metrics.Extensions.Reporting.Elasticsearch|[![MyGet Status](https://img.shields.io/myget/alhardy/v/App.Metrics.Extensions.Reporting.Elasticsearch.svg)](https://www.myget.org/feed/alhardy/package/nuget/App.Metrics.Extensions.Reporting.Elasticsearch)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Extensions.Reporting.Elasticsearch.svg)](https://www.nuget.org/packages/App.Metrics.Extensions.Reporting.Elasticsearch/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Extensions.Reporting.Elasticsearch.svg)](https://www.nuget.org/packages/App.Metrics.Extensions.Reporting.Elasticsearch/)
+|dev|[![AppVeyor](https://img.shields.io/appveyor/ci/alhardy/appmetrics-extensions-elasticsearch/dev.svg?style=flat-square&label=appveyor%20build)](https://ci.appveyor.com/project/alhardy/appmetrics-extensions-elasticsearch/branch/dev)|[![Travis](https://img.shields.io/travis/alhardy/AppMetrics.Extensions.Elasticsearch/dev.svg?style=flat-square&label=travis%20build)](https://travis-ci.org/alhardy/AppMetrics.Extensions.Elasticsearch)|[![Coveralls](https://img.shields.io/coveralls/alhardy/AppMetrics.Extensions.Elasticsearch/dev.svg?style=flat-square)](https://coveralls.io/github/alhardy/AppMetrics.Extensions.Elasticsearch?branch=dev)
+|master|[![AppVeyor](https://img.shields.io/appveyor/ci/alhardy/appmetrics-extensions-elasticsearch/master.svg?style=flat-square&label=appveyor%20build)](https://ci.appveyor.com/project/alhardy/appmetrics-extensions-elasticsearch/branch/master)| [![Travis](https://img.shields.io/travis/alhardy/AppMetrics.Extensions.Elasticsearch/master.svg?style=flat-square&label=travis%20build)](https://travis-ci.org/alhardy/AppMetrics.Extensions.Elasticsearch)| [![Coveralls](https://img.shields.io/coveralls/alhardy/AppMetrics.Extensions.Elasticsearch/master.svg?style=flat-square)](https://coveralls.io/github/alhardy/AppMetrics.Extensions.Elasticsearch?branch=master)|
 
-## What is it?
+|Package|Dev Release|PreRelease|Latest Release|
+|------|:--------:|:--------:|:--------:|
+|App.Metrics.Extensions.Reporting.Elasticsearch|[![MyGet Status](https://img.shields.io/myget/alhardy/v/App.Metrics.Extensions.Reporting.Elasticsearch.svg?style=flat-square)](https://www.myget.org/feed/alhardy/package/nuget/App.Metrics.Extensions.Reporting.Elasticsearch)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Extensions.Reporting.Elasticsearch.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Extensions.Reporting.Elasticsearch/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Extensions.Reporting.Elasticsearch.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Extensions.Reporting.Elasticsearch/)
+|App.Metrics.Formatters.ElasticSearch|[![MyGet Status](https://img.shields.io/myget/alhardy/v/App.Metrics.Formatters.ElasticSearch.svg?style=flat-square)](https://www.myget.org/feed/alhardy/package/nuget/App.Metrics.Formatters.ElasticSearch)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Formatters.ElasticSearch.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Formatters.ElasticSearch/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Formatters.ElasticSearch.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Formatters.ElasticSearch/)
+|App.Metrics.Formatting.ElasticSearch|[![MyGet Status](https://img.shields.io/myget/alhardy/v/App.Metrics.Formatting.ElasticSearch.svg?style=flat-square)](https://www.myget.org/feed/alhardy/package/nuget/App.Metrics.Formatting.ElasticSearch)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.Formatting.ElasticSearch.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Formatting.ElasticSearch/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.Formatting.ElasticSearch.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.Formatting.ElasticSearch/)
 
-The repo contains Elasticsearch extension packages to [App Metrics](https://github.com/alhardy/AppMetrics).
 
 #### Grafana/Elasticsearch Web Monitoring
 
-![Grafana/InfluxDB Generic Web Dashboard Demo](https://github.com/alhardy/AppMetrics.DocFx/blob/master/images/generic_grafana_dashboard_demo.gif)
+![Grafana/Elasticsearch Generic Web Dashboard Demo](https://github.com/alhardy/AppMetrics.DocFx/blob/master/images/generic_grafana_dashboard_demo.gif)
 
-> Grab the dashboard [here](https://github.com/alhardy/AppMetrics.Extensions.Elasticsearch/blob/master/visualization/grafana-dashboards/App.Metrics.Sandbox-Elasticsearch-GenericWeb.json)
+> Grab the dashboard [here](https://grafana.com/dashboards/2140)
 
 #### Grafana/Elasticsearch OAuth2 Client Web Monitoring
 
-![Grafana/InfluxDB Generic OAuth2 Web Dashboard Demo](https://github.com/alhardy/AppMetrics.DocFx/blob/master/images/generic_grafana_oauth2_dashboard_demo.gif)
+![Grafana/Elasticsearch Generic OAuth2 Web Dashboard Demo](https://github.com/alhardy/AppMetrics.DocFx/blob/master/images/generic_grafana_oauth2_dashboard_demo.gif)
 
-> Grab the dashboard [here](https://github.com/alhardy/AppMetrics.Extensions.Elasticsearch/blob/master/visualization/grafana-dashboards/App.Metrics.Sandbox-Elasticsearch-GenericWebOAuth2.json)
+> Grab the dashboard [here](https://grafana.com/dashboards/2143)
 
 ### Grafana/Elasticsearch Web Application Setup
 
 - Download and run [Elasticsearch](https://www.elastic.co/downloads/elasticsearch).
 - Create a new [ES Index and metric field mappings](https://github.com/alhardy/AppMetrics.Extensions.Elasticsearch/blob/master/visualization/App.Metrics.Sandbox-Elasticsearch-IndexAndMappingSetup.json). *Keep note of this for configuring the Elasticsearch reporter in your web application and configuring the Elasticsearch Datasource in Grafana*
-- Download and install [Grafana](https://grafana.com/grafana/download), then create a new [Elasticsearch Datasource](http://docs.grafana.org/features/datasources/influxdb/)  pointing to the Index just created and import App.Metrics [web dashboard](https://github.com/alhardy/AppMetrics.Extensions.Elasticsearch/blob/master/visualization/grafana-dashboards/App.Metrics.Sandbox-Elasticsearch-GenericWeb.json)
+- Download and install [Grafana](https://grafana.com/grafana/download), then create a new [Elasticsearch Datasource](http://docs.grafana.org/features/datasources/elasticsearch/)  pointing to the Index just created and [import](http://docs.grafana.org/reference/export_import/#importing-a-dashboard) App.Metrics [web dashboard](https://github.com/alhardy/AppMetrics.Extensions.Elasticsearch/blob/master/visualization/grafana-dashboards/App.Metrics.Sandbox-Elasticsearch-GenericWeb.json)
 - Drop in the `App.Metrics.Extensions.Mvc` and `App.Metrics.Extensions.Reporting.Elasticsearch` nuget packages into your web application. 
-- Add [App.Metrics configuration](https://alhardy.github.io/app-metrics-docs/getting-started/fundamentals/middleware-configuration.html) to the `Startup.cs` of your web application, including the [InfluxDB reporter configuration](https://alhardy.github.io/app-metrics-docs/getting-started/reporting/index.html#influxdb-reporter). *You might want to check out the [Sandbox](https://github.com/alhardy/AppMetrics/tree/1.1.0-alpha/sandbox/App.Metrics.Sandbox) or [Sample](https://github.com/alhardy/AppMetrics.Samples) projects if you get stuck*
+- Add [App.Metrics configuration](https://alhardy.github.io/app-metrics-docs/getting-started/fundamentals/middleware-configuration.html) to the `Startup.cs` of your web application, including the [Elasticsearch reporter configuration](http://app-metrics.io/reporting/elasticsearch.html). *You might want to check out the [Sandbox](https://github.com/alhardy/AppMetrics.Extensions.Elasticsearch/tree/dev/sandbox/App.Metrics.Elasticsearch.Sandbox) or [Sample](https://github.com/alhardy/AppMetrics.Samples) projects if you get stuck*
 - Run your app and Grafana at visit `http://localhost:3000`
 
 ## How to build
@@ -106,4 +111,4 @@ See the [contribution guidlines](https://github.com/alhardy/AppMetrics/blob/mast
 
 ## License
 
-This library is release under Apache 2.0 License ( see LICENSE ) Copyright (c) 2016 Allan Hardy
+This library is release under Apache 2.0 License ( see LICENSE ) Copyright (c) 2016 Allan Hardy
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 version: 1.0.{build}
 image: Visual Studio 2017
 environment:
-  PreReleaseSuffix: stable
+  PreReleaseSuffix: alpha
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   COVERALLS_REPO_TOKEN:
@@ -12,7 +12,7 @@ environment:
   GitOwner:
     secure: n6W5JZ7Q/xfZC7b2k3+ORA==
   GitPassword:
-    secure: G1CZ0EzJTYjH60jzYYaitkieeslue7VdeeVW4vYS+msXQ9gSCf7KstBKEbXdI+W2
+    secure: fHangGPAk14u3V1eP3kg5EdekQoKdOsKC0F/A1mvh9IODHCZ92FGjfWb0U2aQ8bu
 build_script:
 - ps: .\build.ps1 -Target AppVeyor
 test: off

diff --git a/build.cake b/build.cake
@@ -9,6 +9,7 @@
 #tool "nuget:?package=JetBrains.ReSharper.CommandLineTools"
 #tool "nuget:?package=coveralls.io"
 #tool "nuget:?package=gitreleasemanager"
+#tool "nuget:?package=ReportGenerator"
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -20,24 +21,24 @@ var coverWith					= HasArgument("CoverWith") ? Argument<string>("CoverWith") :
                                   EnvironmentVariable("CoverWith") != null ? EnvironmentVariable("CoverWith") : "OpenCover"; // None, DotCover, OpenCover
 var skipReSharperCodeInspect    = Argument("SkipCodeInspect", false) || !IsRunningOnWindows();
 var preReleaseSuffix            = HasArgument("PreReleaseSuffix") ? Argument<string>("PreReleaseSuffix") :
-	                              (AppVeyor.IsRunningOnAppVeyor && EnvironmentVariable("PreReleaseSuffix") == null) ? null :
+	                              (AppVeyor.IsRunningOnAppVeyor && EnvironmentVariable("PreReleaseSuffix") == null || AppVeyor.Environment.Repository.Tag.IsTag) ? null :
                                   EnvironmentVariable("PreReleaseSuffix") != null ? EnvironmentVariable("PreReleaseSuffix") : "ci";
 var buildNumber                 = HasArgument("BuildNumber") ? Argument<int>("BuildNumber") :
                                   AppVeyor.IsRunningOnAppVeyor ? AppVeyor.Environment.Build.Number :
                                   TravisCI.IsRunningOnTravisCI ? TravisCI.Environment.Build.BuildNumber :
                                   EnvironmentVariable("BuildNumber") != null ? int.Parse(EnvironmentVariable("BuildNumber")) : 0;
 var gitUser						= HasArgument("GitUser") ? Argument<string>("GitUser") : EnvironmentVariable("GitUser");
 var gitPassword					= HasArgument("GitPassword") ? Argument<string>("GitPassword") : EnvironmentVariable("GitPassword");
+var skipHtmlCoverageReport		= Argument("SkipHtmlCoverageReport", true) || !IsRunningOnWindows();
 
 //////////////////////////////////////////////////////////////////////
 // DEFINE FILES & DIRECTORIES
 //////////////////////////////////////////////////////////////////////
-var packDirs                    = new [] { Directory("./src/App.Metrics.Extensions.Reporting.ElasticSearch") };
+var packDirs                    = new [] { Directory("./src/App.Metrics.Extensions.Reporting.ElasticSearch"), Directory("./src/App.Metrics.Formatters.ElasticSearch"), Directory("./src/App.Metrics.Formatting.ElasticSearch") };
 var artifactsDir                = (DirectoryPath) Directory("./artifacts");
 var testResultsDir              = (DirectoryPath) artifactsDir.Combine("test-results");
 var coverageResultsDir          = (DirectoryPath) artifactsDir.Combine("coverage");
 var reSharperReportsDir         = (DirectoryPath) artifactsDir.Combine("resharper-reports");
-var testCoverageOutputFilePath  = coverageResultsDir.CombineWithFilePath("coverage.xml");
 var testOCoverageOutputFilePath = coverageResultsDir.CombineWithFilePath("openCoverCoverage.xml");
 var htmlCoverageReport			= coverageResultsDir.FullPath + "/coverage.html";
 var mergedCoverageSnapshots		= coverageResultsDir.FullPath + "/coverage.dcvr";
@@ -58,6 +59,17 @@ var openCoverExcludeFile        = "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs";
 var coverIncludeFilter			= "+:App.Metrics*";
 var coverExcludeFilter			= "-:*.Facts";
 var excludeFromCoverage			= "*.AppMetricsExcludeFromCodeCoverage*";
+string versionSuffix			= null;
+
+if (!string.IsNullOrEmpty(preReleaseSuffix))
+{
+	versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
+}
+else if (AppVeyor.IsRunningOnAppVeyor && !AppVeyor.Environment.Repository.Tag.IsTag)
+{
+	versionSuffix = buildNumber.ToString("D4");
+}
+
 
 //////////////////////////////////////////////////////////////////////
 // TASKS
@@ -115,7 +127,14 @@ Task("Build")
     .IsDependentOn("Restore")
     .Does(() =>
 {	
-	var settings = new DotNetCoreBuildSettings  { Configuration = configuration };
+	var settings = new DotNetCoreBuildSettings  { Configuration = configuration, VersionSuffix = versionSuffix };
+
+	Context.Information("Building using preReleaseSuffix: " + preReleaseSuffix);
+	Context.Information("Building using versionSuffix: " + versionSuffix);
+
+	// Workaround to fixing pre-release version package references - https://github.com/NuGet/Home/issues/4337
+	settings.ArgumentCustomization = args=>args.Append("/t:Restore /p:RestoreSources=https://api.nuget.org/v3/index.json;https://www.myget.org/F/alhardy/api/v3/index.json;");
+
 
 	if (IsRunningOnWindows())
 	{
@@ -164,13 +183,6 @@ Task("Pack")
 	}
 
 	Context.Information("Packing using preReleaseSuffix: " + preReleaseSuffix);
-
-    string versionSuffix = null;
-    if (!string.IsNullOrEmpty(preReleaseSuffix))
-    {
-        versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
-    }
-
 	Context.Information("Packing using versionSuffix: " + versionSuffix);
 
     var settings = new DotNetCorePackSettings
@@ -231,7 +243,7 @@ Task("RunTests")
 });
 
 Task("HtmlCoverageReport")    
-    .WithCriteria(() => FileExists(testCoverageOutputFilePath) && coverWith != "None" && IsRunningOnWindows())    
+    .WithCriteria(() => IsRunningOnWindows() && FileExists(testOCoverageOutputFilePath) && coverWith != "None" && !skipHtmlCoverageReport)    
     .IsDependentOn("RunTests")
     .Does(() => 
 {
@@ -246,7 +258,7 @@ Task("HtmlCoverageReport")
 	}
 	else if (coverWith == "OpenCover")
 	{
-		ReportGenerator(testCoverageOutputFilePath, coverageResultsDir);
+		ReportGenerator(testOCoverageOutputFilePath, coverageResultsDir);
 	}
 });
 
@@ -406,7 +418,7 @@ Task("AppVeyor")
     .IsDependentOn("Pack")
 	.IsDependentOn("HtmlCoverageReport")
 	.IsDependentOn("RunInspectCode")	
-    	.IsDependentOn("PublishCoverage")
+    .IsDependentOn("PublishCoverage")
 	.IsDependentOn("ReleaseNotes");
 
 //////////////////////////////////////////////////////////////////////