fix task canceled exceptions with CoTask used in command, CallMethodA…

…ction and EventAggregator
tibel · Aug 26, 2014 · 6ab2d30 · 6ab2d30
1 parent 45bc81d
commit 6ab2d30
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/nuget/Caliburn.Light.nuspec b/nuget/Caliburn.Light.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Caliburn.Light</id>
     <title>Caliburn.Light</title>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
     <authors>Thomas Ibel</authors>
     <description>The magic-free Caliburn.Light, a powerful framework designed for building applications across all XAML platforms.</description>
     <language>en-US</language>
@@ -12,8 +12,7 @@
     <iconUrl>https://github.com/tibel/Caliburn.Light/raw/master/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <releaseNotes>
-- async CanClose handling (ICloseGuard and ICloseStrategy)
-- propagate exceptions from async methods
+Bugfixes
     </releaseNotes>
     <copyright>Copyright Thomas Ibel 2014</copyright>
     <tags>Caliburn MVVM WPF WP8 Win8 WinRT Screen Coroutine EventAggregator Behavior Model-View-ViewModel Presentation UI ViewModel Phone IoC Validation Command Async</tags>

diff --git a/src/Caliburn.Core/Action/DelegateCommand.cs b/src/Caliburn.Core/Action/DelegateCommand.cs
@@ -128,7 +128,7 @@ public void Execute(object parameter)
 
             var coTask = returnValue as ICoTask;
             if (coTask != null)
-                returnValue = coTask.ExecuteAsync(context);
+                returnValue = coTask.OverrideCancel().ExecuteAsync(context);
 
             var task = returnValue as Task;
             if (task != null)

diff --git a/src/Caliburn.Core/EventAggregator/EventAggregator.cs b/src/Caliburn.Core/EventAggregator/EventAggregator.cs
@@ -186,7 +186,7 @@ public void Invoke(object message)
                         Target = target,
                     };
 
-                    returnValue = coTask.ExecuteAsync(context);
+                    returnValue = coTask.OverrideCancel().ExecuteAsync(context);
                 }
 
                 var task = returnValue as Task;

diff --git a/src/Caliburn.Xaml/Behaviors/CallMethodAction.cs b/src/Caliburn.Xaml/Behaviors/CallMethodAction.cs
@@ -247,7 +247,7 @@ protected override void Invoke(object parameter)
 
             var coTask = returnValue as ICoTask;
             if (coTask != null)
-                returnValue = coTask.ExecuteAsync(context);
+                returnValue = coTask.OverrideCancel().ExecuteAsync(context);
 
             var task = returnValue as Task;
             if (task != null)

diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -15,4 +15,4 @@
 #endif
 
 [assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]