diff --git a/ReactiveUI.Winforms.Samples.Bindings/ReactiveUI.Winforms.Samples.Bindings.csproj b/ReactiveUI.Winforms.Samples.Bindings/ReactiveUI.Winforms.Samples.Bindings.csproj index 366f4e4..18e444a 100644 --- a/ReactiveUI.Winforms.Samples.Bindings/ReactiveUI.Winforms.Samples.Bindings.csproj +++ b/ReactiveUI.Winforms.Samples.Bindings/ReactiveUI.Winforms.Samples.Bindings.csproj @@ -35,22 +35,28 @@ ReactiveUI.Winforms.Samples.Bindings.Program + + ..\packages\DynamicData.7.1.1\lib\net461\DynamicData.dll + - - ..\packages\ReactiveUI.8.0.1\lib\net461\ReactiveUI.dll + + ..\packages\ReactiveUI.13.1.1\lib\net461\ReactiveUI.dll - - ..\packages\ReactiveUI.WinForms.8.0.1\lib\net461\ReactiveUI.Winforms.dll + + ..\packages\ReactiveUI.WinForms.13.1.1\lib\net461\ReactiveUI.Winforms.dll - - ..\packages\Splat.4.0.0\lib\net461\Splat.dll + + ..\packages\Splat.10.0.1\lib\net461\Splat.dll ..\packages\System.Drawing.Primitives.4.3.0\lib\net45\System.Drawing.Primitives.dll + + ..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll + ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll @@ -66,6 +72,15 @@ ..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + diff --git a/ReactiveUI.Winforms.Samples.Bindings/packages.config b/ReactiveUI.Winforms.Samples.Bindings/packages.config index 60139cd..a60181c 100644 --- a/ReactiveUI.Winforms.Samples.Bindings/packages.config +++ b/ReactiveUI.Winforms.Samples.Bindings/packages.config @@ -1,13 +1,18 @@  - - - + + + + - + + + + + \ No newline at end of file diff --git a/ReactiveUI.Winforms.Samples.Commands/App.config b/ReactiveUI.Winforms.Samples.Commands/App.config index 7fa5b2d..f4454b9 100644 --- a/ReactiveUI.Winforms.Samples.Commands/App.config +++ b/ReactiveUI.Winforms.Samples.Commands/App.config @@ -7,7 +7,15 @@ - + + + + + + + + + diff --git a/ReactiveUI.Winforms.Samples.Commands/ReactiveUI.Winforms.Samples.Commands.csproj b/ReactiveUI.Winforms.Samples.Commands/ReactiveUI.Winforms.Samples.Commands.csproj index 50d65f5..fd5e578 100644 --- a/ReactiveUI.Winforms.Samples.Commands/ReactiveUI.Winforms.Samples.Commands.csproj +++ b/ReactiveUI.Winforms.Samples.Commands/ReactiveUI.Winforms.Samples.Commands.csproj @@ -35,36 +35,51 @@ ReactiveUI.Winforms.Samples.Commands.Program + + ..\packages\DynamicData.7.1.1\lib\net461\DynamicData.dll + - - ..\packages\ReactiveUI.8.0.1\lib\net461\ReactiveUI.dll + + ..\packages\ReactiveUI.13.1.1\lib\net461\ReactiveUI.dll - - ..\packages\ReactiveUI.WinForms.8.0.1\lib\net461\ReactiveUI.Winforms.dll + + ..\packages\ReactiveUI.WinForms.13.1.1\lib\net461\ReactiveUI.Winforms.dll - - ..\packages\Splat.4.0.0\lib\net461\Splat.dll + + ..\packages\Splat.10.0.1\lib\net461\Splat.dll ..\packages\System.Drawing.Primitives.4.3.0\lib\net45\System.Drawing.Primitives.dll - - ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll + + ..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll + + + ..\packages\System.Reactive.Core.5.0.0\lib\netstandard2.0\System.Reactive.Core.dll - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll + + ..\packages\System.Reactive.Interfaces.5.0.0\lib\netstandard2.0\System.Reactive.Interfaces.dll - - ..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll + + ..\packages\System.Reactive.Linq.5.0.0\lib\netstandard2.0\System.Reactive.Linq.dll - - ..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll + + ..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll ..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + diff --git a/ReactiveUI.Winforms.Samples.Commands/ViewModels/MainViewModel.cs b/ReactiveUI.Winforms.Samples.Commands/ViewModels/MainViewModel.cs index 4eacca1..60a2529 100644 --- a/ReactiveUI.Winforms.Samples.Commands/ViewModels/MainViewModel.cs +++ b/ReactiveUI.Winforms.Samples.Commands/ViewModels/MainViewModel.cs @@ -1,4 +1,5 @@ -using System.Reactive.Linq; +using System.Reactive; +using System.Reactive.Linq; using System.Windows; namespace ReactiveUI.Winforms.Samples.Commands.ViewModels @@ -33,9 +34,9 @@ public string WithCanExecuteParameter set => this.RaiseAndSetIfChanged(ref _withCanExecuteParameter, value); } - public ReactiveCommand ParameterlessCommand { get; } - public ReactiveCommand WithParameterCommand { get; } - public ReactiveCommand WithCanExecuteCommand { get; } + public ReactiveCommand ParameterlessCommand { get; } + public ReactiveCommand WithParameterCommand { get; } + public ReactiveCommand WithCanExecuteCommand { get; } private void Parameterless() { diff --git a/ReactiveUI.Winforms.Samples.Commands/packages.config b/ReactiveUI.Winforms.Samples.Commands/packages.config index 60139cd..9570c7f 100644 --- a/ReactiveUI.Winforms.Samples.Commands/packages.config +++ b/ReactiveUI.Winforms.Samples.Commands/packages.config @@ -1,13 +1,18 @@  - - - + + + + - - - - - + + + + + + + + + \ No newline at end of file diff --git a/ReactiveUI.Winforms.Samples.Routing/App.config b/ReactiveUI.Winforms.Samples.Routing/App.config index 7fa5b2d..3ea340e 100644 --- a/ReactiveUI.Winforms.Samples.Routing/App.config +++ b/ReactiveUI.Winforms.Samples.Routing/App.config @@ -7,7 +7,11 @@ - + + + + + diff --git a/ReactiveUI.Winforms.Samples.Routing/ReactiveUI.Winforms.Samples.Routing.csproj b/ReactiveUI.Winforms.Samples.Routing/ReactiveUI.Winforms.Samples.Routing.csproj index c30f786..83ad1dd 100644 --- a/ReactiveUI.Winforms.Samples.Routing/ReactiveUI.Winforms.Samples.Routing.csproj +++ b/ReactiveUI.Winforms.Samples.Routing/ReactiveUI.Winforms.Samples.Routing.csproj @@ -35,16 +35,19 @@ ReactiveUI.Winforms.Samples.Routing.Program + + ..\packages\DynamicData.7.1.1\lib\net461\DynamicData.dll + - - ..\packages\ReactiveUI.8.0.1\lib\net461\ReactiveUI.dll + + ..\packages\ReactiveUI.13.1.1\lib\net461\ReactiveUI.dll - - ..\packages\ReactiveUI.WinForms.8.0.1\lib\net461\ReactiveUI.Winforms.dll + + ..\packages\ReactiveUI.WinForms.13.1.1\lib\net461\ReactiveUI.Winforms.dll - - ..\packages\Splat.4.0.0\lib\net461\Splat.dll + + ..\packages\Splat.10.0.1\lib\net461\Splat.dll @@ -52,21 +55,33 @@ ..\packages\System.Drawing.Primitives.4.3.0\lib\net45\System.Drawing.Primitives.dll - - ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll + + ..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll + + + ..\packages\System.Reactive.Core.5.0.0\lib\netstandard2.0\System.Reactive.Core.dll - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll + + ..\packages\System.Reactive.Interfaces.5.0.0\lib\netstandard2.0\System.Reactive.Interfaces.dll - - ..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll + + ..\packages\System.Reactive.Linq.5.0.0\lib\netstandard2.0\System.Reactive.Linq.dll - - ..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll + + ..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll ..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + diff --git a/ReactiveUI.Winforms.Samples.Routing/ViewModels/ShellViewModel.cs b/ReactiveUI.Winforms.Samples.Routing/ViewModels/ShellViewModel.cs index c47bf32..4d71d5f 100644 --- a/ReactiveUI.Winforms.Samples.Routing/ViewModels/ShellViewModel.cs +++ b/ReactiveUI.Winforms.Samples.Routing/ViewModels/ShellViewModel.cs @@ -1,4 +1,5 @@ using System; +using System.Reactive; namespace ReactiveUI.Winforms.Samples.Routing.ViewModels { @@ -32,10 +33,10 @@ public string ApplicationTitle set => this.RaiseAndSetIfChanged(ref _applicationTitle, value); } - public ReactiveCommand ShowHomeCommand { get; } - public ReactiveCommand ShowAboutCommand { get; } - public ReactiveCommand ShowContactCommand { get; } - public ReactiveCommand GoBackCommand { get; } + public ReactiveCommand ShowHomeCommand { get; } + public ReactiveCommand ShowAboutCommand { get; } + public ReactiveCommand ShowContactCommand { get; } + public ReactiveCommand GoBackCommand { get; } private void ShowHome() { diff --git a/ReactiveUI.Winforms.Samples.Routing/packages.config b/ReactiveUI.Winforms.Samples.Routing/packages.config index 60139cd..9570c7f 100644 --- a/ReactiveUI.Winforms.Samples.Routing/packages.config +++ b/ReactiveUI.Winforms.Samples.Routing/packages.config @@ -1,13 +1,18 @@  - - - + + + + - - - - - + + + + + + + + + \ No newline at end of file