diff --git a/.nuget/packages.config b/.nuget/packages.config
index eb41749c..61eda557 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/MVVM.CEFGlue.sln b/MVVM.CEFGlue.sln
index a62e9bb6..66301ece 100644
--- a/MVVM.CEFGlue.sln
+++ b/MVVM.CEFGlue.sln
@@ -52,6 +52,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVM.Awesomium", "MVVM.Awes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVM_Awesonium_UI", "MVVM_Awesonium_UI\MVVM_Awesonium_UI.csproj", "{723A4723-FAE8-4B50-B061-A4C599F4722E}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVVM.Component.Test", "MVVM.Component.Test\MVVM.Component.Test.csproj", "{371234C6-4903-4F7D-8283-C0F8DBEF8755}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -290,6 +292,17 @@ Global
{723A4723-FAE8-4B50-B061-A4C599F4722E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{723A4723-FAE8-4B50-B061-A4C599F4722E}.Release|x86.ActiveCfg = Release|x86
{723A4723-FAE8-4B50-B061-A4C599F4722E}.Release|x86.Build.0 = Release|x86
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Debug|x86.ActiveCfg = Debug|x86
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Debug|x86.Build.0 = Debug|x86
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Release|Any CPU.Build.0 = Release|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -309,6 +322,7 @@ Global
{84916CEB-FEF3-4A42-B1A0-7B43F3D88CCB} = {B3321797-0DAA-40DF-ADD3-13AC511028EF}
{E35B9010-5429-4FFE-A788-E9C40E743E9C} = {6F066820-11A1-4533-A8CF-C7E43891D2BD}
{723A4723-FAE8-4B50-B061-A4C599F4722E} = {0F0F34BE-CD06-4C13-967D-BB0760617486}
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755} = {B3321797-0DAA-40DF-ADD3-13AC511028EF}
EndGlobalSection
GlobalSection(CodealikeProperties) = postSolution
SolutionGuid = 21ee2d50-c4fe-49f3-a899-1dc535d57fcf
diff --git a/MVVM.Component.Test/MVVM.Component.Test.csproj b/MVVM.Component.Test/MVVM.Component.Test.csproj
new file mode 100644
index 00000000..83b92376
--- /dev/null
+++ b/MVVM.Component.Test/MVVM.Component.Test.csproj
@@ -0,0 +1,94 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {371234C6-4903-4F7D-8283-C0F8DBEF8755}
+ Library
+ Properties
+ MVVM.Component.Test
+ MVVM.Component.Test
+ v4.5
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+ ..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.dll
+
+
+ ..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.Core.dll
+
+
+ ..\packages\NSubstitute.1.9.2.0\lib\net45\NSubstitute.dll
+
+
+
+
+
+
+
+
+
+ ..\packages\xunit.1.9.2\lib\net20\xunit.dll
+
+
+
+
+
+
+
+
+ Designer
+
+
+
+
+ {26203c44-279d-4bfe-b17a-f6ada8d240ed}
+ MVVM.Component
+
+
+
+
+
\ No newline at end of file
diff --git a/MVVM.Component.Test/Properties/AssemblyInfo.cs b/MVVM.Component.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..d61f8c93
--- /dev/null
+++ b/MVVM.Component.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MVVM.Component.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MVVM.Component.Test")]
+[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("487c5802-213c-423c-b84a-1620cbbb21c2")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tests/MVVM.Component/TaskHelperTest.cs b/MVVM.Component.Test/RelaySimpleCommandTest.cs
similarity index 86%
rename from Tests/MVVM.Component/TaskHelperTest.cs
rename to MVVM.Component.Test/RelaySimpleCommandTest.cs
index 1a2bcfa5..280f6359 100644
--- a/Tests/MVVM.Component/TaskHelperTest.cs
+++ b/MVVM.Component.Test/RelaySimpleCommandTest.cs
@@ -2,12 +2,12 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using NSubstitute;
using Xunit;
using FluentAssertions;
using System.Threading.Tasks;
+using NSubstitute;
-namespace MVVM.Cef.Glue.Test
+namespace MVVM.Component.Test
{
public class RelaySimpleCommandTest
{
@@ -49,6 +49,20 @@ public void RelayResultCommandShouldCallFunctionGeneric()
res.Should().Be(122);
}
+ [Fact]
+ public void RelayResultCommandCreate_CreateCommandThatCallFunctionGeneric()
+ {
+ var function = Substitute.For>();
+ var arg = new object();
+ function.Invoke(arg).Returns(122);
+ var target = RelayResultCommand.Create(function);
+
+ var res = target.Execute(arg).Result;
+
+ function.Received(1).Invoke(arg);
+ res.Should().Be(122);
+ }
+
[Fact]
public void RelayResultCommandShouldHandleExceptionFunctionGeneric()
{
diff --git a/MVVM.Component.Test/packages.config b/MVVM.Component.Test/packages.config
new file mode 100644
index 00000000..34222817
--- /dev/null
+++ b/MVVM.Component.Test/packages.config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MVVM.Component/Infra/TaskHelper.cs b/MVVM.Component/Infra/TaskHelper.cs
deleted file mode 100644
index aab50d79..00000000
--- a/MVVM.Component/Infra/TaskHelper.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MVVM.Component.Infra
-{
- public static class TaskHelper
- {
- public static async Task