Merge branch 'master' into bump-release-version

Author: ghuntley

GitVersion.yml

@@ -1,5 +1,4 @@
 assembly-versioning-scheme: None
-next-version: 7.0.0
 branches:
   master:
     mode: ContinuousDelivery
@@ -12,4 +11,4 @@ branches:
     tag: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
-    track-merge-target: true
+    track-merge-target: true

README.md

@@ -1,6 +1,6 @@
 # ![ReactiveUI Logo](https://i.imgur.com/23kfbS9.png) ReactiveUI
 
-[![Release Version](https://img.shields.io/github/release/reactiveui/reactiveui.svg)](https://github.com/reactiveui/reactiveui/releases)  [![NuGet Stats](https://img.shields.io/nuget/dt/reactiveui-core.svg)](https://www.nuget.org/packages/reactiveui) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/reactiveui/ReactiveUI/issues?utf8=%E2%9C%93&q=label%3Afirst-timers-only+) [![Issue Stats](http://www.issuestats.com/github/reactiveui/reactiveui/badge/issue?style=flat)](http://www.issuestats.com/github/reactiveui/reactiveui) [![Pull Request Stats](http://www.issuestats.com/github/reactiveui/reactiveui/badge/pr?style=flat)](http://www.issuestats.com/github/reactiveui/reactiveui) [![Build status](https://ci.appveyor.com/api/projects/status/nhsndp7v788t6a2m/branch/develop?svg=true)](https://ci.appveyor.com/project/ghuntley/reactiveui/branch/develop)
+[![Release Version](https://img.shields.io/github/release/reactiveui/reactiveui.svg)](https://github.com/reactiveui/reactiveui/releases)  [![NuGet Stats](https://img.shields.io/nuget/v/reactiveui.svg)](https://www.nuget.org/packages/reactiveui) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/reactiveui/ReactiveUI/issues?utf8=%E2%9C%93&q=label%3Afirst-timers-only+) [![Issue Stats](http://www.issuestats.com/github/reactiveui/reactiveui/badge/issue?style=flat)](http://www.issuestats.com/github/reactiveui/reactiveui) [![Pull Request Stats](http://www.issuestats.com/github/reactiveui/reactiveui/badge/pr?style=flat)](http://www.issuestats.com/github/reactiveui/reactiveui) [![Build status](https://ci.appveyor.com/api/projects/status/nhsndp7v788t6a2m/branch/develop?svg=true)](https://ci.appveyor.com/project/ghuntley/reactiveui/branch/develop) [![Coverage Status](https://coveralls.io/repos/github/reactiveui/ReactiveUI/badge.svg?branch=develop)](https://coveralls.io/github/reactiveui/ReactiveUI?branch=develop)
 
 
 [![Follow us on Twitter](https://img.shields.io/badge/twitter-%40reactivexui-020031.svg)](https://twitter.com/reactivexui) [![Visit our website](https://img.shields.io/badge/website-reactiveui.net-020031.svg) ](http://www.reactiveui.net/)
@@ -11,7 +11,7 @@ If you’re already familiar with [functional reactive programming](http://docs.
 
 If you have a question, please see if any discussions in our [GitHub issues](github.com/reactiveui/ReactiveUI/issues) or [Stack Overflow](https://stackoverflow.com/questions/tagged/reactiveui) have already answered it. If not, please [feel free to file your own](https://github.com/reactiveui/ReactiveUI/issues/new)! 
 
-We have our very own [Slack organization](https://reactivex.slack.com/) which contains some of the best user interface/reactive extension developers in the industry. All software engineers, young and old, regardless of experience are welcome to join our campfire but you'll need to send an email to [[email protected]](mailto:[email protected]) with the email address you'd like to be invited, and we'll send you an invite. Sit tight, it's worth it.
+We have our very own [Slack organization](https://reactivex.slack.com/) which contains some of the best user interface/reactive extension developers in the industry. All software engineers, young and old, regardless of experience are welcome to join our campfire but you'll need to send an email to [[email protected]](mailto:[email protected]) with the email address you'd like to be invited, and we'll send you an invite. Sit tight, it's worth it.
 
 # Introduction
 
@@ -50,7 +50,7 @@ public interface ISearchViewModel
 {
     ReactiveList<SearchResults> SearchResults { get; }
     string SearchQuery { get; }	 
-    ReactiveCommand<List<SearchResults>> Search { get; }
+    ReactiveCommand<string, List<SearchResults>> Search { get; }
     ISearchService SearchService { get; }
 }
 ```
@@ -69,9 +69,8 @@ var canSearch = this.WhenAny(x => x.SearchQuery, x => !String.IsNullOrWhiteSpace
 // guarantees that this block will only run exactly once at a time, and
 // that the CanExecute will auto-disable and that property IsExecuting will
 // be set accordingly whilst it is running.
-Search = ReactiveCommand.CreateAsyncTask(canSearch, async _ => {
-    return await searchService.Search(this.SearchQuery);
-});
+Search = ReactiveCommand.CreateFromTask<string, List<SearchResults>>(_ => 
+        searchService.Search(this.SearchQuery), canSearch);
 ```
 
 ### Update the user interface 
@@ -102,12 +101,12 @@ Search.ThrownExceptions
 // of "dead airtime", then automatically invoke the subscribe command.
 this.WhenAnyValue(x => x.SearchQuery)
     .Throttle(TimeSpan.FromSeconds(1), RxApp.MainThreadScheduler)
-    .InvokeCommand(this, x => x.Search);
+    .InvokeCommand(Search);
 ```
 
 # Slack
 
-We have our very own [Slack organization](https://reactivex.slack.com/) which contains some of the best user interface/reactive extension developers in the industry. All software engineers, young and old, regardless of experience are welcome to join our campfire but you'll need to send an email to [[email protected]](mailto:[email protected]) with the Email address you'd like to be invited, and we'll send you an invite. Sit tight, it's worth it.
+We have our very own [Slack organization](https://reactivex.slack.com/) which contains some of the best user interface/reactive extension developers in the industry. All software engineers, young and old, regardless of experience are welcome to join our campfire but you'll need to send an email to [[email protected]](mailto:[email protected]) with the Email address you'd like to be invited, and we'll send you an invite. Sit tight, it's worth it.
 
 # Support
 

appveyor.yml

@@ -7,6 +7,7 @@
   version: 1.0.{build}
   environment:
     ANDROID_HOME: "C:\\android-sdk-windows"
+    COVERALLS_TOKEN: jLYKFVgST432LzbZeyLnLpoteXwQLveBw
     GITHUB_USERNAME:
       secure: 0Q9MvUId56SizmZwCf0cgg==
     GITHUB_TOKEN:
@@ -47,6 +48,7 @@
   version: 1.0.{build}
   environment:
     ANDROID_HOME: "C:\\android-sdk-windows"
+    COVERALLS_TOKEN: jLYKFVgST432LzbZeyLnLpoteXwQLveBw
     NUGET_SOURCE: https://www.myget.org/F/reactiveui/api/v2/package
     NUGET_APIKEY:
       secure: YP/3KxC2ffsuHNaolPXj66JVGzSjON9FcR2S2OEzn9c6SV14oPzUh1ySyeT+G+aA

build.cake

@@ -3,6 +3,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #addin "Cake.FileHelpers"
+#addin "Cake.Coveralls"
 
 //////////////////////////////////////////////////////////////////////
 // TOOLS
@@ -11,6 +12,9 @@
 #tool "GitReleaseManager"
 #tool "GitVersion.CommandLine"
 #tool "GitLink"
+#tool "coveralls.io"
+#tool "OpenCover"
+#tool "ReportGenerator"
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -56,6 +60,7 @@ var buildVersion = gitVersion.FullBuildMetaData;
 
 // Artifacts
 var artifactDirectory = "./artifacts/";
+var testCoverageOutputFile = artifactDirectory + "OpenCover.xml";
 var packageWhitelist = new[] { "ReactiveUI-Testing", "ReactiveUI-Events", "ReactiveUI-Events-XamForms", "ReactiveUI", "ReactiveUI-Core", "ReactiveUI-AndroidSupport", "ReactiveUI-Blend", "ReactiveUI-Winforms", "ReactiveUI-XamForms" };
 
 // Define global marcos.
@@ -282,6 +287,18 @@ Task("UpdateAppVeyorBuildNumber")
     .Does(() =>
 {
     AppVeyor.UpdateBuildVersion(buildVersion);
+
+}).ReportError(exception =>
+{  
+    // When a build starts, the initial identifier is an auto-incremented value supplied by AppVeyor. 
+    // As part of the build script, this version in AppVeyor is changed to be the version obtained from
+    // GitVersion. This identifier is purely cosmetic and is used by the core team to correlate a build
+    // with the pull-request. In some circumstances, such as restarting a failed/cancelled build the
+    // identifier in AppVeyor will be already updated and default behaviour is to throw an
+    // exception/cancel the build when in fact it is safe to swallow.
+    // See https://github.com/reactiveui/ReactiveUI/issues/1262
+
+    Warning("Build with version {0} already exists.", buildVersion);
 });
 
 Task("UpdateAssemblyInfo")
@@ -309,16 +326,51 @@ Task("RunUnitTests")
     .IsDependentOn("BuildReactiveUI")
     .Does(() =>
 {
-    XUnit2("./src/ReactiveUI.Tests/bin/Release/Net45/ReactiveUI.Tests_Net45.dll", new XUnit2Settings {
-        OutputDirectory = artifactDirectory,
-        XmlReportV1 = true,
-        NoAppDomain = true
+    Action<ICakeContext> testAction = tool => {
+
+        tool.XUnit2("./src/ReactiveUI.Tests/bin/Release/Net45/ReactiveUI.Tests_Net45.dll", new XUnit2Settings {
+            OutputDirectory = artifactDirectory,
+            XmlReportV1 = true,
+            NoAppDomain = true
+        });
+    };
+
+    OpenCover(testAction,
+        testCoverageOutputFile,
+        new OpenCoverSettings {
+            ReturnTargetCodeOffset = 0,
+            ArgumentCustomization = args => args.Append("-mergeoutput")
+        }
+        .WithFilter("+[*]* -[*.Testing]* -[*.Tests*]* -[Playground*]* -[ReactiveUI.Events]* -[Splat*]*")
+        .ExcludeByAttribute("*.ExcludeFromCodeCoverage*")
+        .ExcludeByFile("*/*Designer.cs;*/*.g.cs;*/*.g.i.cs;*splat/splat*"));
+
+    ReportGenerator(testCoverageOutputFile, artifactDirectory);
+});
+
+Task("UploadTestCoverage")
+    .WithCriteria(() => !local)
+    .WithCriteria(() => isRepository)
+    .IsDependentOn("RunUnitTests")
+    .Does(() =>
+{
+    // Resolve the API key.
+    var token = EnvironmentVariable("COVERALLS_TOKEN");
+    if (string.IsNullOrEmpty(token))
+    {
+        throw new Exception("The COVERALLS_TOKEN environment variable is not defined.");
+    }
+
+    CoverallsIo(testCoverageOutputFile, new CoverallsIoSettings()
+    {
+        RepoToken = token
     });
 });
 
 Task("Package")
     .IsDependentOn("PackageEvents")
     .IsDependentOn("PackageReactiveUI")
+    .IsDependentOn("UploadTestCoverage")
     .Does (() =>
 {