diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (NET35)/Properties/AssemblyInfo.Net35.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (NET35)/Properties/AssemblyInfo.Net35.cs index 0313cb5..5fa91b0 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (NET35)/Properties/AssemblyInfo.Net35.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (NET35)/Properties/AssemblyInfo.Net35.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommand.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommand.cs index ddbe5e1..d8a4e36 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommand.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommand.cs @@ -1,5 +1,5 @@ // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommandGeneric.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommandGeneric.cs index 4882b69..9038983 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommandGeneric.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Command/RelayCommandGeneric.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/DesignerPlatformLibrary.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/DesignerPlatformLibrary.cs index d0483a1..4285747 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/DesignerPlatformLibrary.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/DesignerPlatformLibrary.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/Empty.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/Empty.cs index 4e26f25..70973e8 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/Empty.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/Empty.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/FeatureDetection.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/FeatureDetection.cs index 8d418b0..ed04baa 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/FeatureDetection.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/FeatureDetection.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObject.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObject.cs index fb3e4e9..365685b 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObject.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObject.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObjectAndResult.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObjectAndResult.cs index 6013293..bc7b2d6 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObjectAndResult.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/IExecuteWithObjectAndResult.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2012-2015 +// Copyright © GalaSoft Laurent Bugnion 2012-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakAction.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakAction.cs index 0acd08c..f5e503a 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakAction.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakAction.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakActionGeneric.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakActionGeneric.cs index cc8cb18..746c0b9 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakActionGeneric.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakActionGeneric.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFunc.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFunc.cs index 33b8da2..90e0246 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFunc.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFunc.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2012-2015 +// Copyright © GalaSoft Laurent Bugnion 2012-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFuncGeneric.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFuncGeneric.cs index 369dd95..6990d89 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFuncGeneric.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Helpers/WeakFuncGeneric.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2012-2015 +// Copyright © GalaSoft Laurent Bugnion 2012-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ICleanup.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ICleanup.cs index c031844..724ecb8 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ICleanup.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ICleanup.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/License.txt b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/License.txt index 3bcdf4a..be676d0 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/License.txt +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/License.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2015 Laurent Bugnion (GalaSoft), laurent@galasoft.ch +Copyright (c) 2009-2016 Laurent Bugnion (GalaSoft), laurent@galasoft.ch Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/DialogMessage.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/DialogMessage.cs index 42ae74f..c57c0b6 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/DialogMessage.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/DialogMessage.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/GenericMessage.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/GenericMessage.cs index ec9ce63..a9f6685 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/GenericMessage.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/GenericMessage.cs @@ -1,6 +1,6 @@ // ************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/IMessenger.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/IMessenger.cs index 4a39c74..eed09af 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/IMessenger.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/IMessenger.cs @@ -1,6 +1,6 @@ // ************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/MessageBase.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/MessageBase.cs index 68de58a..2ca23a9 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/MessageBase.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/MessageBase.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/Messenger.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/Messenger.cs index e6416ac..8b2fcfa 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/Messenger.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/Messenger.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessage.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessage.cs index aadd57f..206dcd5 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessage.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessage.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageAction.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageAction.cs index 6e87a5f..887aed2 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageAction.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageAction.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageActionGeneric.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageActionGeneric.cs index 9f6efdb..b0eda11 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageActionGeneric.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageActionGeneric.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageGeneric.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageGeneric.cs index fd10abc..a84d800 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageGeneric.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageGeneric.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageWithCallback.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageWithCallback.cs index 6a56989..22229d6 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageWithCallback.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/NotificationMessageWithCallback.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessage.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessage.cs index 6b18824..d1c361a 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessage.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessage.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessageBase.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessageBase.cs index 6752893..d0465cd 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessageBase.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Messaging/PropertyChangedMessageBase.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ObservableObject.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ObservableObject.cs index 8b8fe2c..ba51f0e 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ObservableObject.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ObservableObject.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2011-2015 +// Copyright © GalaSoft Laurent Bugnion 2011-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Properties/AssemblyInfo.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Properties/AssemblyInfo.cs index cea1fe4..a97743e 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Properties/AssemblyInfo.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("GalaSoft Laurent Bugnion @ http://www.galasoft.ch")] [assembly: AssemblyProduct("GalaSoft.MvvmLight")] -[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2015")] +[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ViewModelBase.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ViewModelBase.cs index 169a71d..c3f4b0d 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ViewModelBase.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/ViewModelBase.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/IDialogService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/IDialogService.cs index d5b8832..75e210f 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/IDialogService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/IDialogService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/INavigationService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/INavigationService.cs index db1601b..4c320fd 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/INavigationService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (PCL)/Views/INavigationService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/ISimpleIoc.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/ISimpleIoc.cs index a6f0c19..a1aca0d 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/ISimpleIoc.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/ISimpleIoc.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2011-2015 +// Copyright © GalaSoft Laurent Bugnion 2011-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/PreferredConstructor.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/PreferredConstructor.cs index f0f0e7f..70dd4c0 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/PreferredConstructor.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/PreferredConstructor.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2011-2015 +// Copyright © GalaSoft Laurent Bugnion 2011-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/SimpleIoc.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/SimpleIoc.cs index be636bd..41df017 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/SimpleIoc.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Ioc/SimpleIoc.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2011-2015 +// Copyright © GalaSoft Laurent Bugnion 2011-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Properties/AssemblyInfo.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Properties/AssemblyInfo.cs index dc1eeee..178fe7c 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Properties/AssemblyInfo.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Extras (PCL)/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("GalaSoft Laurent Bugnion @ http://www.galasoft.ch")] [assembly: AssemblyProduct("GalaSoft.MvvmLight.Extras")] -[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2015")] +[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Binding.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Binding.cs index bddd5b6..5fdbf5c 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Binding.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Binding.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGeneric.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGeneric.cs index 2324461..79770f3 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGeneric.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGeneric.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -1326,14 +1326,13 @@ namespace GalaSoft.MvvmLight.Helpers { private readonly WeakReference _bindingReference; private readonly bool _updateFromSourceToTarget; - private readonly WeakReference _instanceReference; + /// + /// Gets a reference to the instance that this listener listens to. + /// public WeakReference InstanceReference { - get - { - return _instanceReference; - } + get; } public PropertyChangedEventListener( @@ -1343,7 +1342,7 @@ namespace GalaSoft.MvvmLight.Helpers { _updateFromSourceToTarget = updateFromSourceToTarget; _bindingReference = new WeakReference(binding); - _instanceReference = new WeakReference(instance); + InstanceReference = new WeakReference(instance); } public bool ReceiveWeakEvent(Type managerType, object sender, EventArgs e) diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGenericAndroid.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGenericAndroid.cs index c0230da..5befc2e 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGenericAndroid.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingGenericAndroid.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingMode.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingMode.cs index a95841a..54babc1 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingMode.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/BindingMode.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Extensions.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Extensions.cs index 812d9c0..e4f0672 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Extensions.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/Extensions.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -55,6 +55,9 @@ namespace GalaSoft.MvvmLight.Helpers /// if the PropertyChanged event is raised by the source, the target property will be updated. TwoWay means that the source /// property will also be updated if the target raises the PropertyChanged event. Default means OneWay if only the source /// implements INPC, and TwoWay if both the source and the target implement INPC. + /// The value to use when the binding is unable to return a value. This can happen if one of the + /// items on the Path (except the source property itself) is null, or if the Converter throws an exception. + /// The value used when the source property is null (or equals to default(TSource)). /// The new Binding instance. public static Binding SetBinding( this object source, @@ -90,6 +93,9 @@ namespace GalaSoft.MvvmLight.Helpers /// if the PropertyChanged event is raised by the source, the target property will be updated. TwoWay means that the source /// property will also be updated if the target raises the PropertyChanged event. Default means OneWay if only the source /// implements INPC, and TwoWay if both the source and the target implement INPC. + /// The value to use when the binding is unable to return a value. This can happen if one of the + /// items on the Path (except the source property itself) is null, or if the Converter throws an exception. + /// The value used when the source property is null (or equals to default(TSource)). /// The type of the bound property. /// The created binding instance. public static Binding SetBinding( @@ -131,6 +137,9 @@ namespace GalaSoft.MvvmLight.Helpers /// if the PropertyChanged event is raised by the source, the target property will be updated. TwoWay means that the source /// property will also be updated if the target raises the PropertyChanged event. Default means OneWay if only the source /// implements INPC, and TwoWay if both the source and the target implement INPC. + /// The value to use when the binding is unable to return a value. This can happen if one of the + /// items on the Path (except the source property itself) is null, or if the Converter throws an exception. + /// The value used when the source property is null (or equals to default(TSource)). /// The new Binding instance. public static Binding SetBinding( this object source, @@ -172,6 +181,9 @@ namespace GalaSoft.MvvmLight.Helpers /// if the PropertyChanged event is raised by the source, the target property will be updated. TwoWay means that the source /// property will also be updated if the target raises the PropertyChanged event. Default means OneWay if only the source /// implements INPC, and TwoWay if both the source and the target implement INPC. + /// The value to use when the binding is unable to return a value. This can happen if one of the + /// items on the Path (except the source property itself) is null, or if the Converter throws an exception. + /// The value used when the source property is null (or equals to default(TSource)). /// The new Binding instance. public static Binding SetBinding( this object source, @@ -212,6 +224,9 @@ namespace GalaSoft.MvvmLight.Helpers /// if the PropertyChanged event is raised by the source, the target property will be updated. TwoWay means that the source /// property will also be updated if the target raises the PropertyChanged event. Default means OneWay if only the source /// implements INPC, and TwoWay if both the source and the target implement INPC. + /// The value to use when the binding is unable to return a value. This can happen if one of the + /// items on the Path (except the source property itself) is null, or if the Converter throws an exception. + /// The value used when the source property is null (or equals to default(TSource)). /// The new Binding instance. public static Binding SetBinding( this object source, diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/IWeakEventListener.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/IWeakEventListener.cs index 86dd97d..5a78bbe 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/IWeakEventListener.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/IWeakEventListener.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/ObservableAdapter.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/ObservableAdapter.cs index f640bb1..8d76521 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/ObservableAdapter.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/ObservableAdapter.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/PropertyChangedEventManager.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/PropertyChangedEventManager.cs index fb0b825..07e0567 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/PropertyChangedEventManager.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/PropertyChangedEventManager.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/UpdateSourceTriggerMode.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/UpdateSourceTriggerMode.cs index 0048232..652a7d2 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/UpdateSourceTriggerMode.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Helpers/UpdateSourceTriggerMode.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Threading/DispatcherHelper.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Threading/DispatcherHelper.cs index feed35f..497339d 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Threading/DispatcherHelper.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Threading/DispatcherHelper.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/ActivityBase.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/ActivityBase.cs index 0dd8feb..c08eeb1 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/ActivityBase.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/ActivityBase.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -13,7 +13,6 @@ // // **************************************************************************** -using System; using Android.App; namespace GalaSoft.MvvmLight.Views diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/DialogService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/DialogService.cs index f7c19c0..aa22c2f 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/DialogService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/DialogService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/NavigationService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/NavigationService.cs index a342190..5752232 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/NavigationService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (Android)/Views/NavigationService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/EventToCommand.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/EventToCommand.cs index 23f6a20..0ad8967 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/EventToCommand.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/EventToCommand.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/IEventArgsConverter.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/IEventArgsConverter.cs index 9dc16c5..41267e8 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/IEventArgsConverter.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Command/IEventArgsConverter.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Properties/AssemblyInfo.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Properties/AssemblyInfo.cs index 3558ea0..81c2d65 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Properties/AssemblyInfo.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -30,7 +30,7 @@ using System.Windows.Markup; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("GalaSoft Laurent Bugnion @ http://www.galasoft.ch")] [assembly: AssemblyProduct("GalaSoft.MvvmLight.Platform")] -[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2015")] +[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Threading/DispatcherHelper.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Threading/DispatcherHelper.cs index 2de7827..17536f8 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Threading/DispatcherHelper.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (NET45)/Threading/DispatcherHelper.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/DialogService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/DialogService.cs index 3cb7cfb..9bac9ed 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/DialogService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/DialogService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/NavigationService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/NavigationService.cs index 3a6d52d..a7abac6 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/NavigationService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WIN81)/Views/NavigationService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/DialogService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/DialogService.cs index cf7984d..6bbe2da 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/DialogService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/DialogService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/NavigationService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/NavigationService.cs index 4ecaba0..c99ec60 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/NavigationService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (WPSL81)/Views/NavigationService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/BindingGenericApple.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/BindingGenericApple.cs index d8ede80..bc42e92 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/BindingGenericApple.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/BindingGenericApple.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/ObservableTableViewController.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/ObservableTableViewController.cs index 611767f..dc94bec 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/ObservableTableViewController.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Helpers/ObservableTableViewController.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Threading/DispatcherHelper.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Threading/DispatcherHelper.cs index 55b2338..6814262 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Threading/DispatcherHelper.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Threading/DispatcherHelper.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/DialogService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/DialogService.cs index a805a2d..53e2c19 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/DialogService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/DialogService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion @@ -207,11 +207,8 @@ namespace GalaSoft.MvvmLight.Views title, message, null, - buttonCancelText, - new[] - { - buttonConfirmText - }); + buttonCancelText, + buttonConfirmText); av.Dismissed += (s, e) => { diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/NavigationService.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/NavigationService.cs index 75d33b9..653bf7f 100644 --- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/NavigationService.cs +++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (iOS)/Views/NavigationService.cs @@ -1,6 +1,6 @@ // **************************************************************************** // -// Copyright © GalaSoft Laurent Bugnion 2009-2015 +// Copyright © GalaSoft Laurent Bugnion 2009-2016 // // **************************************************************************** // Laurent Bugnion diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingDeepPathTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingDeepPathTest.cs index 5a0ecee..83eafce 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingDeepPathTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingDeepPathTest.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using GalaSoft.MvvmLight.Helpers; using GalaSoft.MvvmLight.Test.ViewModel; using NUnit.Framework; @@ -9,6 +10,8 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class BindingDeepPathTest { + private Helpers.Binding _binding; + public TestViewModel VmSource { get; @@ -21,69 +24,6 @@ namespace GalaSoft.MvvmLight.Test.Binding private set; } - [Test] - public void BindingDeepPath_DeepSourceSetPath_NoError() - { - VmSource = new TestViewModel - { - Nested = new TestViewModel - { - Nested = new TestViewModel - { - Model = new TestModel - { - MyProperty = "Initial value" - } - } - } - }; - - VmTarget = new TestViewModel(); - - var binding = new Helpers.Binding( - VmSource, - () => VmSource.Nested.Nested.Model.MyProperty, - VmTarget, - () => VmTarget.TargetProperty); - - Assert.AreEqual(VmSource.Nested.Nested.Model.MyProperty, VmTarget.TargetProperty); - var newValue = DateTime.Now.Ticks.ToString(); - VmSource.Nested.Nested.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Nested.Nested.Model.MyProperty, VmTarget.TargetProperty); - } - - [Test] - public void BindingDeepPath_DeepSourceExistingPathGraduallySettingPath_NoError() - { - VmSource = new TestViewModel(); - VmTarget = new TestViewModel(); - - const string fallback = "This is the fallback"; - const string targetNull = "Target is null"; - - var binding = new Helpers.Binding( - VmSource, - () => VmSource.Nested.Nested.Model.MyProperty, - VmTarget, - () => VmTarget.TargetProperty, - fallbackValue: fallback, - targetNullValue: targetNull); - - Assert.AreEqual(fallback, VmTarget.TargetProperty); - VmSource.Nested = new TestViewModel(); - Assert.AreEqual(fallback, VmTarget.TargetProperty); - VmSource.Nested.Nested = new TestViewModel(); - Assert.AreEqual(fallback, VmTarget.TargetProperty); - VmSource.Nested.Nested.Model = new TestModel(); - Assert.AreEqual(targetNull, VmTarget.TargetProperty); - var initialValue = "Initial value"; - VmSource.Nested.Nested.Model.MyProperty = initialValue; - Assert.AreEqual(initialValue, VmTarget.TargetProperty); - var newValue = DateTime.Now.Ticks.ToString(); - VmSource.Nested.Nested.Model.MyProperty = newValue; - Assert.AreEqual(newValue, VmTarget.TargetProperty); - } - [Test] public void BindingDeepPath_DeepSourceExistingPathChangingObjects_NoError() { @@ -103,7 +43,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Nested.Nested.Model.MyProperty, VmTarget, @@ -156,67 +96,68 @@ namespace GalaSoft.MvvmLight.Test.Binding Assert.AreEqual(value5, VmTarget.TargetProperty); } - + [Test] - public void BindingDeepPath_DeepTargetSetPath_NoError() + public void BindingDeepPath_DeepSourceExistingPathGraduallySettingPath_NoError() { - VmTarget = new TestViewModel + VmSource = new TestViewModel(); + VmTarget = new TestViewModel(); + + const string fallback = "This is the fallback"; + const string targetNull = "Target is null"; + + _binding = new Binding( + VmSource, + () => VmSource.Nested.Nested.Model.MyProperty, + VmTarget, + () => VmTarget.TargetProperty, + fallbackValue: fallback, + targetNullValue: targetNull); + + Assert.AreEqual(fallback, VmTarget.TargetProperty); + VmSource.Nested = new TestViewModel(); + Assert.AreEqual(fallback, VmTarget.TargetProperty); + VmSource.Nested.Nested = new TestViewModel(); + Assert.AreEqual(fallback, VmTarget.TargetProperty); + VmSource.Nested.Nested.Model = new TestModel(); + Assert.AreEqual(targetNull, VmTarget.TargetProperty); + var initialValue = "Initial value"; + VmSource.Nested.Nested.Model.MyProperty = initialValue; + Assert.AreEqual(initialValue, VmTarget.TargetProperty); + var newValue = DateTime.Now.Ticks.ToString(); + VmSource.Nested.Nested.Model.MyProperty = newValue; + Assert.AreEqual(newValue, VmTarget.TargetProperty); + } + + [Test] + public void BindingDeepPath_DeepSourceSetPath_NoError() + { + VmSource = new TestViewModel { Nested = new TestViewModel { Nested = new TestViewModel { - Nested = new TestViewModel() + Model = new TestModel + { + MyProperty = "Initial value" + } } } }; - VmSource = new TestViewModel - { - Model = new TestModel - { - MyProperty = "Initial value" - } - }; - - var binding = new Helpers.Binding( - VmSource, - () => VmSource.Model.MyProperty, - VmTarget, - () => VmTarget.Nested.Nested.Nested.TargetProperty); - - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.Nested.Nested.Nested.TargetProperty); - var newValue = DateTime.Now.Ticks.ToString(); - VmSource.Model.MyProperty = newValue; - Assert.AreEqual(newValue, VmTarget.Nested.Nested.Nested.TargetProperty); - } - - [Test] - public void BindingDeepPath_DeepTargetExistingPathGraduallySettingPath_NoError() - { - VmSource = new TestViewModel - { - Model = new TestModel - { - MyProperty = "Initial value" - } - }; - VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, - () => VmSource.Model.MyProperty, + () => VmSource.Nested.Nested.Model.MyProperty, VmTarget, - () => VmTarget.Nested.Nested.Nested.TargetProperty); + () => VmTarget.TargetProperty); - VmTarget.Nested = new TestViewModel(); - VmTarget.Nested.Nested = new TestViewModel(); - VmTarget.Nested.Nested.Nested = new TestViewModel(); - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.Nested.Nested.Nested.TargetProperty); + Assert.AreEqual(VmSource.Nested.Nested.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); - VmSource.Model.MyProperty = newValue; - Assert.AreEqual(newValue, VmTarget.Nested.Nested.Nested.TargetProperty); + VmSource.Nested.Nested.Model.MyProperty = newValue; + Assert.AreEqual(VmSource.Nested.Nested.Model.MyProperty, VmTarget.TargetProperty); } [Test] @@ -241,7 +182,7 @@ namespace GalaSoft.MvvmLight.Test.Binding } }; - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, VmTarget, @@ -273,5 +214,72 @@ namespace GalaSoft.MvvmLight.Test.Binding Assert.AreEqual(newValue, VmTarget.Nested.Nested.Nested.TargetProperty); } + + [Test] + public void BindingDeepPath_DeepTargetExistingPathGraduallySettingPath_NoError() + { + VmSource = new TestViewModel + { + Model = new TestModel + { + MyProperty = "Initial value" + } + }; + + VmTarget = new TestViewModel(); + + _binding = new Binding( + VmSource, + () => VmSource.Model.MyProperty, + VmTarget, + () => VmTarget.Nested.Nested.Nested.TargetProperty); + + VmTarget.Nested = new TestViewModel + { + Nested = new TestViewModel + { + Nested = new TestViewModel() + } + }; + + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.Nested.Nested.Nested.TargetProperty); + var newValue = DateTime.Now.Ticks.ToString(); + VmSource.Model.MyProperty = newValue; + Assert.AreEqual(newValue, VmTarget.Nested.Nested.Nested.TargetProperty); + } + + [Test] + public void BindingDeepPath_DeepTargetSetPath_NoError() + { + VmTarget = new TestViewModel + { + Nested = new TestViewModel + { + Nested = new TestViewModel + { + Nested = new TestViewModel() + } + } + }; + + VmSource = new TestViewModel + { + Model = new TestModel + { + MyProperty = "Initial value" + } + }; + + _binding = new Binding( + VmSource, + () => VmSource.Model.MyProperty, + VmTarget, + () => VmTarget.Nested.Nested.Nested.TargetProperty); + + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.Nested.Nested.Nested.TargetProperty); + var newValue = DateTime.Now.Ticks.ToString(); + VmSource.Model.MyProperty = newValue; + Assert.AreEqual(newValue, VmTarget.Nested.Nested.Nested.TargetProperty); + } } } \ No newline at end of file diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceControlTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceControlTest.cs index 3ca13a6..c5d091c 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceControlTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceControlTest.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; using GalaSoft.MvvmLight.Helpers; -using GalaSoft.MvvmLight.Test.Controls; using GalaSoft.MvvmLight.Test.ViewModel; using NUnit.Framework; @@ -9,6 +8,7 @@ using NUnit.Framework; using Android.App; using Android.Widget; #elif __IOS__ +using GalaSoft.MvvmLight.Test.Controls; #endif namespace GalaSoft.MvvmLight.Test.Binding @@ -17,6 +17,8 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class BindingSourceControlTest { + private Helpers.Binding _binding; + #if ANDROID public EditText _source; private EditText _sourcePrivate; @@ -66,7 +68,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( Source, () => Source.Text, VmTarget, @@ -89,7 +91,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( SourcePrivate, () => SourcePrivate.Text, VmTarget, @@ -112,7 +114,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( _source, () => _source.Text, VmTarget, @@ -135,7 +137,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( _sourcePrivate, () => _sourcePrivate.Text, VmTarget, @@ -158,7 +160,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( source, () => source.Text, VmTarget, @@ -181,7 +183,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => Source.Text, () => VmTarget.TargetProperty); @@ -202,7 +204,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => SourcePrivate.Text, () => VmTarget.TargetProperty); @@ -223,7 +225,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => _source.Text, () => VmTarget.TargetProperty); @@ -244,7 +246,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => _sourcePrivate.Text, () => VmTarget.TargetProperty); diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceTest.cs index f1dfa91..6e6dac7 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingSourceTest.cs @@ -11,6 +11,7 @@ namespace GalaSoft.MvvmLight.Test.Binding public class BindingSourceTest { public TestViewModel _vmSource; + private Helpers.Binding _binding; private TestViewModel _vmSourcePrivate; public TestViewModel VmSource @@ -19,22 +20,22 @@ namespace GalaSoft.MvvmLight.Test.Binding private set; } + public TestViewModel VmTarget + { + get; + private set; + } + private TestViewModel VmSourcePrivate { get; set; } - public TestViewModel VmTarget - { - get; - private set; - } - [Test] - public void BindingSource_NewBindingWithPublicProperty_NoError() + public void BindingSource_NewBindingWithPrivateField_NoError() { - VmSource = new TestViewModel + _vmSourcePrivate = new TestViewModel { Model = new TestModel { @@ -44,16 +45,16 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( - VmSource, - () => VmSource.Model.MyProperty, + _binding = new Binding( + _vmSourcePrivate, + () => _vmSourcePrivate.Model.MyProperty, VmTarget, () => VmTarget.TargetProperty); - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); - VmSource.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + _vmSourcePrivate.Model.MyProperty = newValue; + Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); } [Test] @@ -71,7 +72,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var vmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty, vmTarget, @@ -94,7 +95,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - binding = new Helpers.Binding( + _binding = new Binding( VmSourcePrivate, () => VmSourcePrivate.Model.MyProperty, VmTarget, @@ -119,7 +120,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( _vmSource, () => _vmSource.Model.MyProperty, VmTarget, @@ -132,9 +133,9 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void BindingSource_NewBindingWithPrivateField_NoError() + public void BindingSource_NewBindingWithPublicProperty_NoError() { - _vmSourcePrivate = new TestViewModel + VmSource = new TestViewModel { Model = new TestModel { @@ -144,16 +145,16 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( - _vmSourcePrivate, - () => _vmSourcePrivate.Model.MyProperty, + _binding = new Binding( + VmSource, + () => VmSource.Model.MyProperty, VmTarget, () => VmTarget.TargetProperty); - Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); - _vmSourcePrivate.Model.MyProperty = newValue; - Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); + VmSource.Model.MyProperty = newValue; + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); } [Test] @@ -169,7 +170,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty, VmTarget, @@ -182,9 +183,9 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void BindingSource_SetBindingWithPublicProperty_NoError() + public void BindingSource_SetBindingWithPrivateField_NoError() { - VmSource = new TestViewModel + _vmSourcePrivate = new TestViewModel { Model = new TestModel { @@ -194,14 +195,14 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( - () => VmSource.Model.MyProperty, + _binding = this.SetBinding( + () => _vmSourcePrivate.Model.MyProperty, () => VmTarget.TargetProperty); - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); - VmSource.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + _vmSourcePrivate.Model.MyProperty = newValue; + Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); } [Test] @@ -217,7 +218,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSourcePrivate.Model.MyProperty, () => VmTarget.TargetProperty); @@ -240,7 +241,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => _vmSource.Model.MyProperty, () => VmTarget.TargetProperty); @@ -251,9 +252,9 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void BindingSource_SetBindingWithPrivateField_NoError() + public void BindingSource_SetBindingWithPublicProperty_NoError() { - _vmSourcePrivate = new TestViewModel + VmSource = new TestViewModel { Model = new TestModel { @@ -263,14 +264,14 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTarget = new TestViewModel(); - var binding = this.SetBinding( - () => _vmSourcePrivate.Model.MyProperty, + _binding = this.SetBinding( + () => VmSource.Model.MyProperty, () => VmTarget.TargetProperty); - Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); - _vmSourcePrivate.Model.MyProperty = newValue; - Assert.AreEqual(_vmSourcePrivate.Model.MyProperty, VmTarget.TargetProperty); + VmSource.Model.MyProperty = newValue; + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); } } } \ No newline at end of file diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetControlTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetControlTest.cs index d281d23..304b84e 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetControlTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetControlTest.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; using GalaSoft.MvvmLight.Helpers; -using GalaSoft.MvvmLight.Test.Controls; using GalaSoft.MvvmLight.Test.ViewModel; using NUnit.Framework; @@ -9,6 +8,7 @@ using NUnit.Framework; using Android.App; using Android.Widget; #elif __IOS__ +using GalaSoft.MvvmLight.Test.Controls; #endif namespace GalaSoft.MvvmLight.Test.Binding @@ -17,6 +17,8 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class BindingTargetControlTest { + private Helpers.Binding _binding; + #if ANDROID public EditText _target; private EditText _targetPrivate; @@ -72,7 +74,7 @@ namespace GalaSoft.MvvmLight.Test.Binding Target = new UITextViewEx(); #endif - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, Target, @@ -101,7 +103,7 @@ namespace GalaSoft.MvvmLight.Test.Binding TargetPrivate = new UITextViewEx(); #endif - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, TargetPrivate, @@ -130,7 +132,7 @@ namespace GalaSoft.MvvmLight.Test.Binding _target = new UITextViewEx(); #endif - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, _target, @@ -159,7 +161,7 @@ namespace GalaSoft.MvvmLight.Test.Binding _targetPrivate = new UITextViewEx(); #endif - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, _targetPrivate, @@ -188,7 +190,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var target = new UITextViewEx(); #endif - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, target, @@ -217,7 +219,7 @@ namespace GalaSoft.MvvmLight.Test.Binding Target = new UITextViewEx(); #endif - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, () => Target.Text); @@ -244,7 +246,7 @@ namespace GalaSoft.MvvmLight.Test.Binding TargetPrivate = new UITextViewEx(); #endif - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, () => TargetPrivate.Text); @@ -271,7 +273,7 @@ namespace GalaSoft.MvvmLight.Test.Binding _target = new UITextViewEx(); #endif - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, () => _target.Text); @@ -298,7 +300,7 @@ namespace GalaSoft.MvvmLight.Test.Binding _targetPrivate = new UITextViewEx(); #endif - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, () => _targetPrivate.Text); diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetTest.cs index d4147f6..2002939 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTargetTest.cs @@ -11,6 +11,7 @@ namespace GalaSoft.MvvmLight.Test.Binding public class BindingTargetTest { public TestViewModel _vmTarget; + private Helpers.Binding _binding; private TestViewModel _vmTargetPrivate; public TestViewModel VmSource @@ -19,20 +20,20 @@ namespace GalaSoft.MvvmLight.Test.Binding private set; } + public TestViewModel VmTarget + { + get; + private set; + } + private TestViewModel VmTargetPrivate { get; set; } - public TestViewModel VmTarget - { - get; - private set; - } - [Test] - public void BindingTarget_NewBindingWithPublicProperty_NoError() + public void BindingTarget_NewBindingWithPrivateField_NoError() { VmSource = new TestViewModel { @@ -42,18 +43,18 @@ namespace GalaSoft.MvvmLight.Test.Binding } }; - VmTarget = new TestViewModel(); + _vmTargetPrivate = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, - VmTarget, - () => VmTarget.TargetProperty); + _vmTargetPrivate, + () => _vmTargetPrivate.TargetProperty); - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); VmSource.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); } [Test] @@ -69,7 +70,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTargetPrivate = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, VmTargetPrivate, @@ -94,7 +95,7 @@ namespace GalaSoft.MvvmLight.Test.Binding _vmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, _vmTarget, @@ -107,7 +108,7 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void BindingTarget_NewBindingWithPrivateField_NoError() + public void BindingTarget_NewBindingWithPublicProperty_NoError() { VmSource = new TestViewModel { @@ -117,18 +118,18 @@ namespace GalaSoft.MvvmLight.Test.Binding } }; - _vmTargetPrivate = new TestViewModel(); + VmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, - _vmTargetPrivate, - () => _vmTargetPrivate.TargetProperty); + VmTarget, + () => VmTarget.TargetProperty); - Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); VmSource.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); } [Test] @@ -144,7 +145,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var vmTarget = new TestViewModel(); - var binding = new Helpers.Binding( + _binding = new Binding( VmSource, () => VmSource.Model.MyProperty, vmTarget, @@ -157,7 +158,7 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void BindingTarget_SetBindingWithPublicProperty_NoError() + public void BindingTarget_SetBindingWithPrivateField_NoError() { VmSource = new TestViewModel { @@ -167,16 +168,16 @@ namespace GalaSoft.MvvmLight.Test.Binding } }; - VmTarget = new TestViewModel(); + _vmTargetPrivate = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, - () => VmTarget.TargetProperty); + () => _vmTargetPrivate.TargetProperty); - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); VmSource.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); } [Test] @@ -192,7 +193,7 @@ namespace GalaSoft.MvvmLight.Test.Binding VmTargetPrivate = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, () => VmTargetPrivate.TargetProperty); @@ -215,7 +216,7 @@ namespace GalaSoft.MvvmLight.Test.Binding _vmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, () => _vmTarget.TargetProperty); @@ -226,7 +227,7 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void BindingTarget_SetBindingWithPrivateField_NoError() + public void BindingTarget_SetBindingWithPublicProperty_NoError() { VmSource = new TestViewModel { @@ -236,16 +237,16 @@ namespace GalaSoft.MvvmLight.Test.Binding } }; - _vmTargetPrivate = new TestViewModel(); + VmTarget = new TestViewModel(); - var binding = this.SetBinding( + _binding = this.SetBinding( () => VmSource.Model.MyProperty, - () => _vmTargetPrivate.TargetProperty); + () => VmTarget.TargetProperty); - Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); var newValue = DateTime.Now.Ticks.ToString(); VmSource.Model.MyProperty = newValue; - Assert.AreEqual(VmSource.Model.MyProperty, _vmTargetPrivate.TargetProperty); + Assert.AreEqual(VmSource.Model.MyProperty, VmTarget.TargetProperty); } } } \ No newline at end of file diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTest.cs index 1423b7a..7880147 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/BindingTest.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; using GalaSoft.MvvmLight.Helpers; -using GalaSoft.MvvmLight.Test.Controls; using GalaSoft.MvvmLight.Test.ViewModel; using NUnit.Framework; @@ -9,6 +8,7 @@ using NUnit.Framework; using Android.App; using Android.Widget; #elif __IOS__ +using GalaSoft.MvvmLight.Test.Controls; using UIKit; #endif @@ -97,7 +97,9 @@ namespace GalaSoft.MvvmLight.Test.Binding } [Test] - public void Binding_MultipleLevelsOfNullWithConverter_ShouldCallConverterWithNullThenTargetNullValueButNotFallbackValue() + public void + Binding_MultipleLevelsOfNullWithConverter_ShouldCallConverterWithNullThenTargetNullValueButNotFallbackValue( + ) { var vmSource = new TestViewModel(); var vmTarget = new TestViewModel(); diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ConverterTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ConverterTest.cs index b69fe34..772a81a 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ConverterTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ConverterTest.cs @@ -2,7 +2,6 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Globalization; using GalaSoft.MvvmLight.Helpers; -using GalaSoft.MvvmLight.Test.Controls; using GalaSoft.MvvmLight.Test.ViewModel; using NUnit.Framework; @@ -10,6 +9,7 @@ using NUnit.Framework; using Android.App; using Android.Widget; #elif __IOS__ +using GalaSoft.MvvmLight.Test.Controls; using UIKit; #endif @@ -19,6 +19,8 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ConverterTest { + private Helpers.Binding _binding; + public TestViewModel Vm { get; @@ -117,7 +119,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var vmTarget = new TestViewModel(); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty, vmTarget, @@ -196,7 +198,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var vmTarget = new TestViewModel(); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty, vmTarget, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventImplicitTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventImplicitTest.cs index cf66f18..9559924 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventImplicitTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventImplicitTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventImplicitTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithObserveEvent_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -60,7 +62,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -79,7 +81,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -99,7 +101,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -123,7 +125,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -147,7 +149,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -170,7 +172,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -190,7 +192,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -214,7 +216,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -243,7 +245,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -268,7 +270,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -293,7 +295,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -323,7 +325,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -353,7 +355,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -381,7 +383,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventLostFocusTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventLostFocusTest.cs index 22b5f5c..ebfd023 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventLostFocusTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventLostFocusTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventLostFocusTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithObserveEvent_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -38,7 +40,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -62,7 +64,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -82,7 +84,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -106,7 +108,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -134,7 +136,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -158,7 +160,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -185,7 +187,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -219,7 +221,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -245,7 +247,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -275,7 +277,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -313,7 +315,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -347,7 +349,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -377,7 +379,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNoArgumentTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNoArgumentTest.cs index 495b61f..a3466f3 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNoArgumentTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNoArgumentTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventNoArgumentTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithObserveEvent_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -38,7 +40,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -62,7 +64,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -82,7 +84,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -103,7 +105,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -128,7 +130,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -149,7 +151,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -206,7 +208,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -232,7 +234,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -259,7 +261,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -291,7 +293,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -322,7 +324,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -351,7 +353,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNonDefaultEventTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNonDefaultEventTest.cs index b09217a..19712eb 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNonDefaultEventTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventNonDefaultEventTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventNonDefaultEventTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromEditTextToEditTextWithObserveEvent_BindingGetsUpdated() { var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -41,7 +43,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventPropertyChangedTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventPropertyChangedTest.cs index 3796f52..f7a43a7 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventPropertyChangedTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventPropertyChangedTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventPropertyChangedTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithObserveEvent_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -38,7 +40,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -62,7 +64,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -82,7 +84,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -103,7 +105,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -128,7 +130,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -149,7 +151,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -206,7 +208,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -232,7 +234,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -259,7 +261,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -291,7 +293,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -322,7 +324,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -351,7 +353,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventTest.cs index 1c14b0c..6c1555d 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/ObserveEventTest.cs @@ -13,13 +13,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithObserveEvent_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -39,7 +41,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -63,7 +65,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -83,7 +85,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -104,7 +106,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -129,7 +131,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -154,7 +156,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -177,7 +179,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -197,7 +199,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -223,7 +225,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -254,7 +256,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -280,7 +282,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -307,7 +309,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -339,7 +341,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -370,7 +372,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -399,7 +401,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/SetCommandTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/SetCommandTest.cs index 12e2a17..a022bca 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/SetCommandTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/SetCommandTest.cs @@ -13,6 +13,8 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class SetCommandTest { + private Helpers.Binding _binding; + [Test] public void SetCommand_OnButtonExWithSimpleValue_NoError() { @@ -97,14 +99,14 @@ namespace GalaSoft.MvvmLight.Test.Binding var button = new Button(Application.Context); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); button.SetCommand( "Click", vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); button.PerformClick(); @@ -133,13 +135,13 @@ namespace GalaSoft.MvvmLight.Test.Binding var button = new Button(Application.Context); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); button.SetCommand( vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); button.PerformClick(); @@ -237,14 +239,14 @@ namespace GalaSoft.MvvmLight.Test.Binding var checkBox = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); checkBox.SetCommand( "CheckedChange", vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); checkBox.PerformClick(); @@ -273,13 +275,13 @@ namespace GalaSoft.MvvmLight.Test.Binding var checkBox = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); checkBox.SetCommand( vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); checkBox.PerformClick(); diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerImplicitTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerImplicitTest.cs index 121e3ed..1141ce0 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerImplicitTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerImplicitTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerImplicitTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -60,7 +62,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -79,7 +81,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -99,7 +101,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -123,7 +125,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -147,7 +149,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -170,7 +172,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -190,7 +192,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -214,7 +216,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -243,7 +245,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -268,7 +270,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -293,7 +295,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -323,7 +325,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -353,7 +355,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -381,7 +383,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerLostFocusTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerLostFocusTest.cs index ca156e6..23b2b59 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerLostFocusTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerLostFocusTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerLostFocusTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -38,7 +40,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -62,7 +64,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -82,7 +84,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -106,7 +108,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -134,7 +136,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -158,7 +160,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -185,7 +187,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -219,7 +221,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -245,7 +247,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -275,7 +277,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -313,7 +315,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -347,7 +349,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -377,7 +379,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNoArgumentTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNoArgumentTest.cs index 9d48231..232ad2d 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNoArgumentTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNoArgumentTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerNoArgumentTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -38,7 +40,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -62,7 +64,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -82,7 +84,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -103,7 +105,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -128,7 +130,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -149,7 +151,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -206,7 +208,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -232,7 +234,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -259,7 +261,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -291,7 +293,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -322,7 +324,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -351,7 +353,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNonDefaultEventTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNonDefaultEventTest.cs index 48337d9..26a1125 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNonDefaultEventTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerNonDefaultEventTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerNonDefaultEventTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromEditTextToEditTextWithUpdateTrigger_BindingGetsUpdated() { var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -41,7 +43,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerPropertyChangedTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerPropertyChangedTest.cs index ed0d1f5..107e851 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerPropertyChangedTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerPropertyChangedTest.cs @@ -12,13 +12,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerPropertyChangedTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -38,7 +40,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -62,7 +64,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -82,7 +84,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -103,7 +105,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -128,7 +130,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -149,7 +151,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -206,7 +208,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -232,7 +234,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -259,7 +261,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -291,7 +293,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -322,7 +324,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -351,7 +353,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerTest.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerTest.cs index eac2fd2..cd89342 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerTest.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Binding/UpdateTriggerTest.cs @@ -13,13 +13,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -39,7 +41,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -63,7 +65,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -83,7 +85,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -104,7 +106,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -129,7 +131,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -154,7 +156,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -177,7 +179,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -197,7 +199,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, control2, @@ -223,7 +225,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control2, () => control2.Checked, control1, @@ -254,7 +256,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Checked, vm, @@ -280,7 +282,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -307,7 +309,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); var control2 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -339,7 +341,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -370,7 +372,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new CheckBox(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -399,7 +401,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new EditText(Application.Context); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/MainActivity.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/MainActivity.cs index fe26833..ccecfe8 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/MainActivity.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/MainActivity.cs @@ -19,5 +19,4 @@ namespace GalaSoft.MvvmLight.Test base.OnCreate(bundle); } } -} - +} \ No newline at end of file diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Properties/AssemblyInfo.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Properties/AssemblyInfo.cs index 02d928b..5cbdcd0 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Properties/AssemblyInfo.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using Android.App; // 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("UnitTestApp1")] +[assembly: AssemblyTitle("GalaSoft.MvvmLight.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnitTestApp1")] -[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyCompany("GalaSoft Laurent Bugnion @ http://www.galasoft.ch")] +[assembly: AssemblyProduct("GalaSoft.MvvmLight.Test")] +[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] @@ -26,5 +26,4 @@ using Android.App; // 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")] +[assembly: AssemblyVersion("5.3.0.*")] diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountModel.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountModel.cs index ebe2dd5..5cb318b 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountModel.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountModel.cs @@ -1,5 +1,3 @@ -using System; - namespace GalaSoft.MvvmLight.Test.ViewModel { public class AccountModel : ObservableObject diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountViewModel.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountViewModel.cs index a203ac3..9c86cbb 100644 --- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountViewModel.cs +++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/ViewModel/AccountViewModel.cs @@ -1,6 +1,4 @@ -using System; - -namespace GalaSoft.MvvmLight.Test.ViewModel +namespace GalaSoft.MvvmLight.Test.ViewModel { public class AccountViewModel : ViewModelBase { diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventImplicitTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventImplicitTest.cs index 3cb82b4..17cfa97 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventImplicitTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventImplicitTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventImplicitTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -36,7 +38,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -59,7 +61,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -78,7 +80,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -98,7 +100,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -122,7 +124,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -146,7 +148,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -169,7 +171,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -189,7 +191,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -213,7 +215,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -242,7 +244,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -267,7 +269,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -292,7 +294,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -322,7 +324,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -352,7 +354,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -380,7 +382,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventNoArgumentTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventNoArgumentTest.cs index e93c7c4..d9e6dee 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventNoArgumentTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventNoArgumentTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventNoArgumentTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -61,7 +63,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -81,7 +83,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -102,7 +104,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -127,7 +129,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -152,7 +154,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -195,7 +197,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -221,7 +223,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -252,7 +254,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -278,7 +280,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -305,7 +307,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -337,7 +339,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -368,7 +370,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -397,7 +399,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventPropertyChangedTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventPropertyChangedTest.cs index 85faf33..b5c034c 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventPropertyChangedTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventPropertyChangedTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventPropertyChangedTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -61,7 +63,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -81,7 +83,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -102,7 +104,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -127,7 +129,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -152,7 +154,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -195,7 +197,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -221,7 +223,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -252,7 +254,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -278,7 +280,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -305,7 +307,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -337,7 +339,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -368,7 +370,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -397,7 +399,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventTest.cs index e6dc981..6aacd2b 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/ObserveEventTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class ObserveEventTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -61,7 +63,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -81,7 +83,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -102,7 +104,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -127,7 +129,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -152,7 +154,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -195,7 +197,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -221,7 +223,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -252,7 +254,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -278,7 +280,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -305,7 +307,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -337,7 +339,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -368,7 +370,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -397,7 +399,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/SetCommandTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/SetCommandTest.cs index b27194b..277f406 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/SetCommandTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/SetCommandTest.cs @@ -11,6 +11,8 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class SetCommandTest { + private Helpers.Binding _binding; + [Test] public void SetCommand_OnBarButtonNoValue_NoError() { @@ -60,14 +62,14 @@ namespace GalaSoft.MvvmLight.Test.Binding var control = new UIBarButtonItemEx(); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); control.SetCommand( "Clicked", vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); control.PerformEvent(); @@ -96,13 +98,13 @@ namespace GalaSoft.MvvmLight.Test.Binding var control = new UIBarButtonItemEx(); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); control.SetCommand( vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); control.PerformEvent(); @@ -198,14 +200,14 @@ namespace GalaSoft.MvvmLight.Test.Binding var control = new UIButtonEx(); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); control.SetCommand( "TouchUpInside", vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); control.PerformEvent(); @@ -234,13 +236,13 @@ namespace GalaSoft.MvvmLight.Test.Binding var control = new UIButtonEx(); - var binding = new Binding( + _binding = new Binding( vmSource, () => vmSource.Model.MyProperty); control.SetCommand( vmTarget.SetPropertyCommand, - binding); + _binding); Assert.IsNull(vmTarget.TargetProperty); control.PerformEvent(); @@ -346,174 +348,5 @@ namespace GalaSoft.MvvmLight.Test.Binding control.PerformEvent(); Assert.AreEqual(TestViewModel.ValueForCommand, castedCommand.Parameter); } - - // () => vmSource.Model.MyProperty); - // vmSource, - - // var binding = new Binding( - - // var checkBox = new CheckBox(Application.Context); - - // var vmTarget = new TestViewModel(); - // }; - // } - // MyProperty = value - // { - // Model = new TestModel - // { - - // var vmSource = new TestViewModel - // var value = DateTime.Now.Ticks.ToString(); - // { - // public void SetCommand_OnCheckBoxWithBinding_ParameterShouldUpdate() - - // [Test] - - // checkBox.SetCommand( - // "CheckedChange", - // vmTarget.SetPropertyCommand, - // binding); - - // Assert.IsNull(vmTarget.TargetProperty); - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - - // value += "Test"; - // vmSource.Model.MyProperty = value; - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - // } - - // [Test] - // public void SetCommand_OnCheckBoxWithBindingNoEventName_ParameterShouldUpdate() - // { - // var value = DateTime.Now.Ticks.ToString(); - - // var vmSource = new TestViewModel - // { - // Model = new TestModel - // { - // MyProperty = value - // } - // }; - - // var vmTarget = new TestViewModel(); - - // var checkBox = new CheckBox(Application.Context); - - // var binding = new Binding( - // vmSource, - // () => vmSource.Model.MyProperty); - - // checkBox.SetCommand( - // vmTarget.SetPropertyCommand, - // binding); - - // Assert.IsNull(vmTarget.TargetProperty); - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - - // value += "Test"; - // vmSource.Model.MyProperty = value; - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - // } - - // [Test] - // public void SetCommand_OnCheckBoxWithSimpleValue_NoError() - // { - // var value = DateTime.Now.Ticks.ToString(); - // var vmTarget = new TestViewModel(); - - // var checkBox = new CheckBox(Application.Context); - - // checkBox.SetCommand( - // "CheckedChange", - // vmTarget.SetPropertyCommand, - // value); - - // Assert.IsNull(vmTarget.TargetProperty); - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - // } - - // [Test] - // public void SetCommand_OnCheckBoxWithSimpleValueNoEventName_ClickEventShouldBeUsed() - // { - // var value = DateTime.Now.Ticks.ToString(); - // var vmTarget = new TestViewModel(); - - // var checkBox = new CheckBox(Application.Context); - - // checkBox.SetCommand( - // vmTarget.SetPropertyCommand, - // value); - - // Assert.IsNull(vmTarget.TargetProperty); - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - // } - - // [Test] - // public void SetCommand_OnCheckBoxNoValue_NoError() - // { - // var value = DateTime.Now.Ticks.ToString(); - // var vmTarget = new TestViewModel(); - // vmTarget.Configure(value); - - // var checkBox = new CheckBox(Application.Context); - - // checkBox.SetCommand("CheckedChange", vmTarget.SetPropertyWithoutValueCommand); - - // Assert.IsNull(vmTarget.TargetProperty); - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - // } - - // [Test] - // public void SetCommand_OnCheckBoxNoValueNoEventName_ClickEventShouldBeUsed() - // { - // var value = DateTime.Now.Ticks.ToString(); - // var vmTarget = new TestViewModel(); - // vmTarget.Configure(value); - - // var checkBox = new CheckBox(Application.Context); - - // checkBox.SetCommand(vmTarget.SetPropertyWithoutValueCommand); - - // Assert.IsNull(vmTarget.TargetProperty); - // checkBox.PerformClick(); - // Assert.AreEqual(value, vmTarget.TargetProperty); - // } - - // [Test] - // public void SetCommand_WithICommandOnCheckBoxNoValue_NoError() - // { - // var vmTarget = new TestViewModel(); - // var checkBox = new CheckBox(Application.Context); - - // checkBox.SetCommand("CheckedChange", vmTarget.TestCommandImpl); - - // var castedCommand = (CommandImpl)vmTarget.TestCommandImpl; - - // Assert.IsNull(castedCommand.Parameter); - // checkBox.PerformClick(); - // Assert.AreEqual(TestViewModel.ValueForCommand, castedCommand.Parameter); - // } - - // [Test] - // public void SetCommand_WithICommandOnCheckBoxNoValueNoEventName_ClickEventShouldBeUsed() - // { - // var vmTarget = new TestViewModel(); - // var checkBox = new CheckBox(Application.Context); - - // checkBox.SetCommand(vmTarget.TestCommandImpl); - - // var castedCommand = (CommandImpl)vmTarget.TestCommandImpl; - - // Assert.IsNull(castedCommand.Parameter); - // checkBox.PerformClick(); - // Assert.AreEqual(TestViewModel.ValueForCommand, castedCommand.Parameter); - // } } } \ No newline at end of file diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerImplicitTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerImplicitTest.cs index efc35f3..3c12646 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerImplicitTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerImplicitTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerImplicitTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -36,7 +38,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -59,7 +61,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -78,7 +80,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -98,7 +100,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -122,7 +124,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -146,7 +148,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -169,7 +171,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -189,7 +191,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -213,7 +215,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -242,7 +244,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -267,7 +269,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -292,7 +294,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -322,7 +324,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -352,7 +354,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -380,7 +382,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerNoArgumentTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerNoArgumentTest.cs index 6abeb2c..54db979 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerNoArgumentTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerNoArgumentTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerNoArgumentTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -61,7 +63,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -81,7 +83,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -102,7 +104,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -127,7 +129,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -152,7 +154,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -195,7 +197,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -221,7 +223,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -252,7 +254,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -278,7 +280,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -305,7 +307,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -337,7 +339,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -368,7 +370,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -397,7 +399,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerPropertyChangedTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerPropertyChangedTest.cs index 70f24d8..f29130f 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerPropertyChangedTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerPropertyChangedTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerPropertyChangedTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -61,7 +63,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -81,7 +83,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -102,7 +104,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -127,7 +129,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -152,7 +154,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -195,7 +197,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -221,7 +223,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -252,7 +254,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -278,7 +280,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -305,7 +307,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -337,7 +339,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -368,7 +370,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -397,7 +399,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerTest.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerTest.cs index d237eda..c42873d 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerTest.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Binding/UpdateTriggerTest.cs @@ -11,13 +11,15 @@ namespace GalaSoft.MvvmLight.Test.Binding [SuppressMessage("ReSharper", "InconsistentNaming")] public class UpdateTriggerTest { + private Helpers.Binding _binding; + [Test] public void Binding_OneWayFromCheckBoxToCheckBoxWithUpdateTrigger_BindingGetsUpdated() { var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -37,7 +39,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -61,7 +63,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -81,7 +83,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -102,7 +104,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -127,7 +129,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -152,7 +154,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -175,7 +177,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -195,7 +197,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, control2, @@ -221,7 +223,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control2, () => control2.On, control1, @@ -252,7 +254,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.On, vm, @@ -278,7 +280,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -305,7 +307,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); var control2 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, control2, @@ -337,7 +339,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( control1, () => control1.Text, vm, @@ -368,7 +370,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UISwitchEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, @@ -397,7 +399,7 @@ namespace GalaSoft.MvvmLight.Test.Binding var control1 = new UITextViewEx(); - var binding = new Binding( + _binding = new Binding( vm, () => vm.Model.MyProperty, control1, diff --git a/GalaSoft.MvvmLight/Tests/AppleTestApp/Properties/AssemblyInfo.cs b/GalaSoft.MvvmLight/Tests/AppleTestApp/Properties/AssemblyInfo.cs index 2d37f08..d147cc7 100644 --- a/GalaSoft.MvvmLight/Tests/AppleTestApp/Properties/AssemblyInfo.cs +++ b/GalaSoft.MvvmLight/Tests/AppleTestApp/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("AppleTestApp")] +[assembly: AssemblyTitle("GalaSoft.MvvmLight.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AppleTestApp")] -[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyCompany("GalaSoft Laurent Bugnion @ http://www.galasoft.ch")] +[assembly: AssemblyProduct("GalaSoft.MvvmLight.Test")] +[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,4 @@ using System.Runtime.InteropServices; // 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")] +[assembly: AssemblyVersion("5.3.0.*")] diff --git a/GalaSoft.MvvmLight/Tests/PCL/GalaSoft.MvvmLight.Test (PNET45)/Properties/AssemblyInfo.cs b/GalaSoft.MvvmLight/Tests/PCL/GalaSoft.MvvmLight.Test (PNET45)/Properties/AssemblyInfo.cs index cc9146f..17339a1 100644 --- a/GalaSoft.MvvmLight/Tests/PCL/GalaSoft.MvvmLight.Test (PNET45)/Properties/AssemblyInfo.cs +++ b/GalaSoft.MvvmLight/Tests/PCL/GalaSoft.MvvmLight.Test (PNET45)/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("GalaSoft Laurent Bugnion @ http://www.galasoft.ch")] [assembly: AssemblyProduct("GalaSoft.MvvmLight.Test")] -[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2015")] +[assembly: AssemblyCopyright("Copyright © GalaSoft Laurent Bugnion 2009-2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -28,4 +28,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("5.0.2.*")] +[assembly: AssemblyVersion("5.3.0.*")]