WinGui: Move to Caliburn Micro 4.0 (RC). This removes the Framework 4 dependant 3.2 version.

28 files changed, 80 insertions, 65 deletions

diff --git a/win/CS/HandBrakeWPF/App.xaml.cs b/win/CS/HandBrakeWPF/App.xaml.cs
index 471b5412c..ee1e5d504 100644
--- a/win/CS/HandBrakeWPF/App.xaml.cs
+++ b/win/CS/HandBrakeWPF/App.xaml.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF
     using System.IO;

     using System.Linq;

     using System.Threading;

+    using System.Threading.Tasks;

     using System.Windows;

     using System.Windows.Controls;

 

@@ -203,17 +204,23 @@ namespace HandBrakeWPF
         /// </param>

         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)

         {

-            Caliburn.Micro.Execute.OnUIThreadAsync(() => {

-                if (e.ExceptionObject.GetType() == typeof(FileNotFoundException))

+            Task t = new Task(

+                () =>

                 {

-                    GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.8", (Exception)e.ExceptionObject);

-                    this.ShowError(exception);

-                }

-                else

-                {

-                    this.ShowError(e.ExceptionObject);

-                }

-            });

+                    if (e.ExceptionObject.GetType() == typeof(FileNotFoundException))

+                    {

+                        GeneralApplicationException exception = new GeneralApplicationException(

+                            "A file appears to be missing.",

+                            "Try re-installing Microsoft .NET Framework 4.8",

+                            (Exception)e.ExceptionObject);

+                        this.ShowError(exception);

+                    }

+                    else

+                    {

+                        this.ShowError(e.ExceptionObject);

+                    }

+                });

+            Execute.OnUIThreadAsync(() => t);

         }

 

         /// <summary>

@@ -290,7 +297,7 @@ namespace HandBrakeWPF
 

                     try

                     {

-                        windowManager.ShowDialog(errorView);

+                        windowManager.ShowDialogAsync(errorView);

                     }

                     catch (Exception)

                     {

diff --git a/win/CS/HandBrakeWPF/Behaviours/DoubleClickFileBehaviours.cs b/win/CS/HandBrakeWPF/Behaviours/DoubleClickFileBehaviours.cs
index d7358e117..5f96937c9 100644
--- a/win/CS/HandBrakeWPF/Behaviours/DoubleClickFileBehaviours.cs
+++ b/win/CS/HandBrakeWPF/Behaviours/DoubleClickFileBehaviours.cs
@@ -12,11 +12,10 @@ namespace HandBrakeWPF.Behaviours
     using System;
     using System.Diagnostics;
     using System.IO;
-    using System.Net;
     using System.Windows;
     using System.Windows.Controls;
-    using System.Windows.Forms.VisualStyles;
-    using System.Windows.Interactivity;
+
+    using Microsoft.Xaml.Behaviors;
 
     public class DoubleClickFileBehaviours : Behavior<TextBox>
     {
diff --git a/win/CS/HandBrakeWPF/Commands/InputBindingTrigger.cs b/win/CS/HandBrakeWPF/Commands/InputBindingTrigger.cs
index 9b1ed197c..fa6d8da5f 100644
--- a/win/CS/HandBrakeWPF/Commands/InputBindingTrigger.cs
+++ b/win/CS/HandBrakeWPF/Commands/InputBindingTrigger.cs
@@ -13,7 +13,8 @@ namespace HandBrakeWPF.Commands
     using System.Diagnostics;

     using System.Windows;

     using System.Windows.Input;

-    using System.Windows.Interactivity;

+

+    using Microsoft.Xaml.Behaviors;

 

     /// <summary>

     /// The input binding trigger.

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 7d83de326..ca5f0747a 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -41,7 +41,7 @@
   </ItemGroup>

 

   <ItemGroup>

-    <PackageReference Include="Caliburn.Micro" Version="3.2.0" />

+    <PackageReference Include="Caliburn.Micro" Version="4.0.136-rc" />

     <PackageReference Include="gong-wpf-dragdrop" Version="2.3.2" />

     <PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />

     <PackageReference Include="System.Management" Version="5.0.0" />

diff --git a/win/CS/HandBrakeWPF/Services/ErrorService.cs b/win/CS/HandBrakeWPF/Services/ErrorService.cs
index 21c04cd58..4a0118387 100644
--- a/win/CS/HandBrakeWPF/Services/ErrorService.cs
+++ b/win/CS/HandBrakeWPF/Services/ErrorService.cs
@@ -42,7 +42,7 @@ namespace HandBrakeWPF.Services
                 errorViewModel.ErrorMessage = message;

                 errorViewModel.Solution = solution;

                 errorViewModel.Details = details;

-                windowManager.ShowDialog(errorViewModel);

+                windowManager.ShowDialogAsync(errorViewModel);

             }

         }

 

@@ -68,7 +68,7 @@ namespace HandBrakeWPF.Services
                 errorViewModel.ErrorMessage = message;

                 errorViewModel.Solution = solution;

                 errorViewModel.Details = exception.ToString();

-                windowManager.ShowDialog(errorViewModel);

+                windowManager.ShowDialogAsync(errorViewModel);

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
index 2eba7b38c..7fa70aa8d 100644
--- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
+++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
@@ -138,7 +138,7 @@ namespace HandBrakeWPF.Services
                     () =>

                     {

                         titleSpecificView.SetAction((WhenDone)this.userSettingService.GetUserSetting<int>(UserSettingConstants.WhenCompleteAction));

-                        this.windowManager.ShowDialog(titleSpecificView);

+                        this.windowManager.ShowDialogAsync(titleSpecificView);

                         isCancelled = titleSpecificView.IsCancelled;

                     });

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index 79a3de526..05afe134c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -51,7 +51,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void Close()

         {

-            this.TryClose();

+            this.TryCloseAsync();

         }

     }

 }

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index fd6c8bdb3..fca980ca7 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -248,7 +248,7 @@ namespace HandBrakeWPF.ViewModels
         public void EditAudioDefaults()

         {

             this.audioDefaultsViewModel.ResetApplied();

-            this.windowManager.ShowDialog(this.audioDefaultsViewModel);

+            this.windowManager.ShowDialogAsync(this.audioDefaultsViewModel);

             if (audioDefaultsViewModel.IsApplied)

             {

                 this.Preset.AudioTrackBehaviours = this.audioDefaultsViewModel.AudioBehaviours.Clone();

@@ -275,7 +275,7 @@ namespace HandBrakeWPF.ViewModels
 

         public void Close()

         {

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         private void SetSelectedPictureSettingsResLimitMode()

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 286fc9179..9371e1f0f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -224,7 +224,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void ShowAudioDefaults()

         {

-            if (this.windowManager.ShowDialog(this.AudioDefaultsViewModel) == true)

+            if (this.windowManager.ShowDialogAsync(this.AudioDefaultsViewModel).Result == true)

             {

                 this.OnTabStatusChanged(null);

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
index a6d3ae2c7..5c20adf1d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
@@ -97,7 +97,7 @@ namespace HandBrakeWPF.ViewModels
             this.IsCancelled = true;

             timer.Stop();

             this.Ticks = 0;

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         /// <summary>

@@ -108,7 +108,7 @@ namespace HandBrakeWPF.ViewModels
             this.IsCancelled = false;

             timer.Stop();

             this.Ticks = 0;

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         /// <summary>

@@ -146,7 +146,7 @@ namespace HandBrakeWPF.ViewModels
             {

                 timer.Stop();

                 this.Ticks = 0;

-                this.TryClose();

+                this.TryCloseAsync();

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs
index 20c0458c6..6b235a2a3 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs
@@ -88,7 +88,7 @@ namespace HandBrakeWPF.ViewModels
         {

             try

             {

-                this.TryClose();

+                this.TryCloseAsync();

             }

             catch (Exception e)

             {

diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 52693f67b..62c43adf5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -10,12 +10,13 @@
 namespace HandBrakeWPF.ViewModels

 {

     using System;

-    using System.Collections.Generic;

     using System.ComponentModel;

     using System.Diagnostics;

     using System.IO;

     using System.Linq;

     using System.Text;

+    using System.Threading;

+    using System.Threading.Tasks;

 

     using Caliburn.Micro;

 

@@ -96,17 +97,17 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-        protected override void OnActivate()

+        protected override Task OnActivateAsync(CancellationToken cancellationToken)

         {

             this.logInstanceManager.NewLogInstanceRegistered += this.LogInstanceManager_NewLogInstanceRegistered;

             this.queueService.QueueChanged += this.QueueService_QueueChanged;

 

             this.CollectLogFiles(null);

-            

-            base.OnActivate();

+

+            return base.OnActivateAsync(cancellationToken);

         }

 

-        protected override void OnDeactivate(bool close)

+        protected override Task OnDeactivateAsync(bool close, CancellationToken cancellationToken)

         {

             if (this.logService != null)

             {

@@ -118,7 +119,7 @@ namespace HandBrakeWPF.ViewModels
             this.logInstanceManager.NewLogInstanceRegistered -= this.LogInstanceManager_NewLogInstanceRegistered;

             this.queueService.QueueChanged -= this.QueueService_QueueChanged;

 

-            base.OnDeactivate(close);

+            return base.OnDeactivateAsync(close, cancellationToken);

         }

 

         protected virtual void OnLogMessageReceived(LogEventArgs e)

@@ -222,13 +223,15 @@ namespace HandBrakeWPF.ViewModels
         {

             if (this.lastReadIndex < e.Log.MessageIndex)

             {

-                Execute.OnUIThreadAsync(() =>

+                Execute.OnUIThreadAsync(

+                    () => new Task(

+                        () =>

                         {

                             this.lastReadIndex = e.Log.MessageIndex;

                             this.log.AppendLine(e.Log.Content);

                             this.OnLogMessageReceived(e);

                             this.NotifyOfPropertyChange(() => this.ActivityLog);

-                        });

+                        }));

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 9e2515eb2..798c2fa0a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -923,7 +923,7 @@ namespace HandBrakeWPF.ViewModels
             else

             {

                 ILogViewModel logvm = IoC.Get<ILogViewModel>();

-                this.windowManager.ShowWindow(logvm);

+                this.windowManager.ShowWindowAsync(logvm);

             }

         }

 

@@ -941,7 +941,7 @@ namespace HandBrakeWPF.ViewModels
             }

             else

             {

-                this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());

+                this.windowManager.ShowWindowAsync(IoC.Get<IQueueViewModel>());

             }

         }

 

@@ -951,7 +951,7 @@ namespace HandBrakeWPF.ViewModels
             {

                 this.StaticPreviewViewModel.IsOpen = true;

                 this.StaticPreviewViewModel.UpdatePreviewFrame(this.CurrentTask, this.ScannedSource);

-                this.windowManager.ShowWindow(this.StaticPreviewViewModel);

+                this.windowManager.ShowWindowAsync(this.StaticPreviewViewModel);

             }

             else if (this.StaticPreviewViewModel.IsOpen)

             {

@@ -966,7 +966,7 @@ namespace HandBrakeWPF.ViewModels
             {

                 this.PresetManagerViewModel.IsOpen = true;

                 this.PresetManagerViewModel.SetupWindow(() => this.NotifyOfPropertyChange(() => this.PresetsCategories));

-                this.windowManager.ShowWindow(this.PresetManagerViewModel);

+                this.windowManager.ShowWindowAsync(this.PresetManagerViewModel);

             }

             else if (this.PresetManagerViewModel.IsOpen)

             {

@@ -1186,7 +1186,7 @@ namespace HandBrakeWPF.ViewModels
             }

             else

             {

-                this.windowManager.ShowWindow(viewModel);

+                this.windowManager.ShowWindowAsync(viewModel);

             }

         }

 

@@ -1524,7 +1524,7 @@ namespace HandBrakeWPF.ViewModels
         {

             IAddPresetViewModel presetViewModel = IoC.Get<IAddPresetViewModel>();

             presetViewModel.Setup(this.CurrentTask, this.SelectedTitle, this.AudioViewModel.AudioBehaviours, this.SubtitleViewModel.SubtitleBehaviours);

-            this.windowManager.ShowDialog(presetViewModel);

+            this.windowManager.ShowDialogAsync(presetViewModel);

 

             this.NotifyOfPropertyChange(() => this.PresetsCategories);

         }

@@ -1576,7 +1576,7 @@ namespace HandBrakeWPF.ViewModels
 

             IManagePresetViewModel presetViewModel = IoC.Get<IManagePresetViewModel>();

             presetViewModel.Setup(this.selectedPreset);

-            this.windowManager.ShowDialog(presetViewModel);

+            this.windowManager.ShowDialogAsync(presetViewModel);

             Preset preset = presetViewModel.Preset;

 

             this.NotifyOfPropertyChange(() => this.PresetsCategories);

diff --git a/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs
index 42b9f4bab..f41c9821e 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs
@@ -115,7 +115,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>
         public void Close()
         {
-            this.TryClose();
+            this.TryCloseAsync();
         }
     }
 }
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 941381156..479f7db1c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -15,6 +15,8 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;

     using System.IO;

     using System.Linq;

+    using System.Threading;

+    using System.Threading.Tasks;

     using System.Windows;

     using System.Windows.Media;

 

@@ -1291,10 +1293,10 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-        protected override void OnActivate()

+        protected override Task OnActivateAsync(CancellationToken cancellationToken)

         {

             this.OnLoad();

-            base.OnActivate();

+            return base.OnActivateAsync(cancellationToken);

         }

 

         private void Save()

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 2d28fc9a5..0f2cc4461 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -676,7 +676,7 @@ namespace HandBrakeWPF.ViewModels
             {

                 this.StaticPreviewViewModel.IsOpen = true;

                 this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task, this.scannedSource);

-                this.windowManager.ShowWindow(this.StaticPreviewViewModel);

+                this.windowManager.ShowWindowAsync(this.StaticPreviewViewModel);

             }

             else if (this.StaticPreviewViewModel.IsOpen)

             {

diff --git a/win/CS/HandBrakeWPF/ViewModels/PresetManagerViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PresetManagerViewModel.cs
index b34409bad..a0392ad30 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PresetManagerViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PresetManagerViewModel.cs
@@ -390,7 +390,7 @@ namespace HandBrakeWPF.ViewModels
             audioDefaultsViewModel.ResetApplied();
             audioDefaultsViewModel.Setup(this.selectedPreset, this.selectedPreset.Task);
 
-            this.windowManager.ShowDialog(audioDefaultsViewModel);
+            this.windowManager.ShowDialogAsync(audioDefaultsViewModel);
             if (audioDefaultsViewModel.IsApplied)
             {
                 this.SelectedPreset.AudioTrackBehaviours = audioDefaultsViewModel.AudioBehaviours.Clone();
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
index 82d6458cf..2509206b6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
@@ -226,7 +226,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void Close()

         {

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 549b23304..751003b65 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -16,6 +16,8 @@ namespace HandBrakeWPF.ViewModels
     using System.Diagnostics;

     using System.IO;

     using System.Linq;

+    using System.Threading;

+    using System.Threading.Tasks;

     using System.Windows;

 

     using Caliburn.Micro;

@@ -192,7 +194,7 @@ namespace HandBrakeWPF.ViewModels
 

         public void Close()

         {

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         public override void OnLoad()

@@ -510,15 +512,15 @@ namespace HandBrakeWPF.ViewModels
 

         public void Activate()

         {

-           this.OnActivate();

+           this.OnActivateAsync(CancellationToken.None);

         }

 

         public void Deactivate()

         {

-           this.OnDeactivate(false);

+           this.OnDeactivateAsync(false, CancellationToken.None);

         }

 

-        protected override void OnActivate()

+        protected override Task OnActivateAsync(CancellationToken cancellationToken)

         {

             this.Load();

 

@@ -529,17 +531,17 @@ namespace HandBrakeWPF.ViewModels
 

             this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);

 

-            base.OnActivate();

+            return base.OnActivateAsync(cancellationToken);

         }

 

-        protected override void OnDeactivate(bool close)

+        protected override Task OnDeactivateAsync(bool close, CancellationToken cancellationToken)

         {

             this.queueProcessor.QueueCompleted -= this.QueueProcessor_QueueCompleted;

             this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;

             this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;

             this.queueProcessor.QueuePaused -= this.QueueProcessor_QueuePaused;

 

-            base.OnDeactivate(close);

+            return base.OnDeactivateAsync(close, cancellationToken);

         }

 

         private void OpenDirectory(string directory)

diff --git a/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs
index 836a7b0aa..9a0ba82dc 100644
--- a/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs
@@ -66,7 +66,7 @@ namespace HandBrakeWPF.ViewModels
         public void Cancel()

         {

             this.selectedTitle = null;

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         /// <summary>

@@ -74,7 +74,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public void Open()

         {

-            this.TryClose();

+            this.TryCloseAsync();

         }

 

         #endregion

diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
index f977057ab..c052d97ac 100644
--- a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
@@ -9,7 +9,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
              d:DesignHeight="500"
              d:DesignWidth="800"
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index d0e317073..13a238ea6 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -6,7 +6,7 @@
              xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"

              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

              xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"

-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"

              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs
index 13a58403a..2861c5b62 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs
@@ -11,6 +11,7 @@ namespace HandBrakeWPF.Views
 {

     using System;

     using System.Diagnostics;

+    using System.Threading.Tasks;

     using System.Windows;

     using System.Windows.Controls;

 

@@ -92,7 +93,7 @@ namespace HandBrakeWPF.Views
 

                     if (this.AutoScroll.IsChecked)

                     {

-                        delayProcessor.PerformTask(() => Execute.OnUIThreadAsync(() => this.logText.ScrollToEnd()), 100);

+                        delayProcessor.PerformTask(() => Execute.OnUIThreadAsync(() => new Task(() => this.logText.ScrollToEnd())), 100);

                     }

                 }

             }

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 35e25bdec..3a10ca8e7 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -5,7 +5,7 @@
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

              xmlns:cal="http://www.caliburnproject.org"

-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"

              xmlns:commands="clr-namespace:HandBrakeWPF.Commands"

              xmlns:loc="clr-namespace:HandBrakeWPF.Services.Presets.Model"

              xmlns:behaviours="clr-namespace:HandBrakeWPF.Behaviours"

diff --git a/win/CS/HandBrakeWPF/Views/PresetManagerView.xaml b/win/CS/HandBrakeWPF/Views/PresetManagerView.xaml
index 9fb2f7ef0..1f3366a0e 100644
--- a/win/CS/HandBrakeWPF/Views/PresetManagerView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PresetManagerView.xaml
@@ -5,7 +5,7 @@
         xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
         xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
         xmlns:loc="clr-namespace:HandBrakeWPF.Services.Presets.Model"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:commands="clr-namespace:HandBrakeWPF.Commands"
         xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
         xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture"
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 53039bd1f..a34c21212 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -5,7 +5,7 @@
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

         xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"

-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"

         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

         xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"

         xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index dfa3f6f24..c37d7890d 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

         xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"

         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"

         xmlns:cal="http://www.caliburnproject.org"

         Title="{Data:Binding Path=MainViewModel.WindowTitle}"

         Width="1018"

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index cbd67bb6f..a4bc05890 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -5,7 +5,7 @@
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

              xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"

-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"

+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"

              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"