Cache packages.

GuOrg · Jan 28, 2017 · a33035e · a33035e
1 parent 6fdb0db
commit a33035e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/Gu.Reactive.Demo/AsyncCommandsViewModel.cs b/Gu.Reactive.Demo/AsyncCommandsViewModel.cs
@@ -10,13 +10,16 @@
 
     public sealed class AsyncCommandsViewModel : INotifyPropertyChanged, IDisposable
     {
-        private int delay = 500;
+        private readonly Condition canExecuteCondition;
 
+        private int delay = 500;
         private int count;
+        private bool canExecute;
         private bool disposed;
 
         public AsyncCommandsViewModel()
         {
+            this.canExecuteCondition = new Condition(this.ObservePropertyChanged(x => x.CanExecute), () => this.CanExecute);
             this.AsyncCommand = new AsyncCommand(this.SimpleTask);
             this.AsyncCancelableCommand = new AsyncCommand(this.CancelableTask);
             this.AsyncParameterCommand = new AsyncCommand<string>(this.ParameterTask);
@@ -55,6 +58,25 @@ private set
             }
         }
 
+        public bool CanExecute
+        {
+            get
+            {
+                return this.canExecute;
+            }
+
+            set
+            {
+                if (value.Equals(this.canExecute))
+                {
+                    return;
+                }
+
+                this.canExecute = value;
+                this.OnPropertyChanged();
+            }
+        }
+
         public int Delay
         {
             get
@@ -87,6 +109,7 @@ public void Dispose()
             this.AsyncParameterCommand.Dispose();
             this.AsyncCancelableParameterCommand.Dispose();
             this.AsyncThrowCommand.Dispose();
+            this.canExecuteCondition?.Dispose();
         }
 
         private async Task SimpleTask()

diff --git a/Gu.Reactive.Demo/CommandsViewModel.cs b/Gu.Reactive.Demo/CommandsViewModel.cs
@@ -10,7 +10,7 @@
 
     public sealed class CommandsViewModel : INotifyPropertyChanged, IDisposable
     {
-        private readonly Condition condition;
+        private readonly Condition canExecuteCondition;
 
         private string executed;
         private bool canExecute;
@@ -29,9 +29,9 @@ public CommandsViewModel()
             this.ObservingRelayCommand = new ObservingRelayCommand(() => this.Executed = "ObservingRelayCommand", () => this.CanExecute, this.ObservePropertyChanged(x => x.CanExecute));
             this.ObservingRelayCommandWithParameter = new ObservingRelayCommand<string>(x => this.Executed = "ObservingRelayCommandWithParameter: " + x, x => this.CanExecute, this.ObservePropertyChanged(x => x.CanExecute));
 
-            this.condition = new Condition(this.ObservePropertyChanged(x => x.CanExecute), () => this.CanExecute);
-            this.ConditionRelayCommand = new ConditionRelayCommand(() => this.Executed = "ConditionRelayCommand", this.condition);
-            this.ConditionRelayCommandWithParameter = new ConditionRelayCommand<string>(x => this.Executed = "ConditionRelayCommandWithParameter: " + x, this.condition);
+            this.canExecuteCondition = new Condition(this.ObservePropertyChanged(x => x.CanExecute), () => this.CanExecute);
+            this.ConditionRelayCommand = new ConditionRelayCommand(() => this.Executed = "ConditionRelayCommand", this.canExecuteCondition);
+            this.ConditionRelayCommandWithParameter = new ConditionRelayCommand<string>(x => this.Executed = "ConditionRelayCommandWithParameter: " + x, this.canExecuteCondition);
             this.RaiseCanExecuteCommand = new RelayCommand(this.RaiseCanExecute);
             this.RaiseCanExecuteOnOtherThread = new RelayCommand(() => Task.Run(() => this.RaiseCanExecute()));
             this.DelayedToggleCanExecute = new RelayCommand(async () =>
@@ -119,7 +119,7 @@ public void Dispose()
             this.ObservingRelayCommandWithParameter.Dispose();
             this.ConditionRelayCommand.Dispose();
             this.ConditionRelayCommandWithParameter.Dispose();
-            this.condition.Dispose();
+            this.canExecuteCondition.Dispose();
         }
 
         [NotifyPropertyChangedInvocator]

diff --git a/Gu.Reactive.sln b/Gu.Reactive.sln
@@ -1,9 +1,11 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{E9C570CF-F85E-4A34-B54B-86B6801E9B19}"
 	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
 		paket.dependencies = paket.dependencies
 		paket.lock = paket.lock
 		.paket\paket.targets = .paket\paket.targets

diff --git a/Gu.Wpf.Reactive.UiTests/AsyncCommandsWindowTests.cs b/Gu.Wpf.Reactive.UiTests/AsyncCommandsWindowTests.cs
@@ -1,7 +1,5 @@
 namespace Gu.Wpf.Reactive.UiTests
 {
-    using System.Threading.Tasks;
-
     using FlaUI.Core.AutomationElements;
     using FlaUI.Core.AutomationElements.Infrastructure;
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,6 @@
 version: 1.0.{build}
 configuration: Release
 platform: Any CPU
+cache: packages -> paket.lock
 build:
   verbosity: minimal