Adjust project structure

src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs

@@ -7,7 +7,11 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
 using HandyControl.Data;
@@ -43,7 +47,11 @@ namespace HandyControlDemo.ViewModel
         public string ChatString
         {
             get => _chatString;
+#if netle40
+            set => Set(nameof(ChatString), ref _chatString, value);
+#else
             set => Set(ref _chatString, value);
+#endif
         }
 
         public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new ObservableCollection<ChatInfoModel>();

src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
+using GalaSoft.MvvmLight.CommandWpf;       
+#endif
 using HandyControl.Tools.Extension;
 
 namespace HandyControlDemo.ViewModel.Basic
@@ -14,7 +18,11 @@ namespace HandyControlDemo.ViewModel.Basic
         public string Result
         {
             get => _result;
-            set => Set(ref _result, value);
+#if netle40
+            set => Set(nameof(Result), ref _result, value);
+#else
+            set => Set(ref _result, value);  
+#endif
         }
 
         private string _message;
@@ -22,7 +30,11 @@ namespace HandyControlDemo.ViewModel.Basic
         public string Message
         {
             get => _message;
+#if netle40
+            set => Set(nameof(Message), ref _message, value);
+#else
             set => Set(ref _message, value);
+#endif
         }
 
         public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke())).Value;

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 
 namespace HandyControlDemo.ViewModel.Controls
 {
@@ -11,7 +15,11 @@ namespace HandyControlDemo.ViewModel.Controls
         public int Count
         {
             get => _count;
+#if netle40
+            set => Set(nameof(Count), ref _count, value);
+#else
             set => Set(ref _count, value);
+#endif
         }
 
         public RelayCommand CountCmd => new Lazy<RelayCommand>(() =>

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs

@@ -1,7 +1,11 @@
 using System;
-using System.Threading.Tasks;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
+using System.Threading.Tasks;
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using HandyControl.Controls;
 using HandyControl.Tools.Extension;
 using HandyControlDemo.UserControl;
@@ -17,7 +21,11 @@ namespace HandyControlDemo.ViewModel
         public string DialogResult
         {
             get => _dialogResult;
+#if netle40
+            set => Set(nameof(DialogResult), ref _dialogResult, value);
+#else
             set => Set(ref _dialogResult, value);
+#endif
         }
 
         public RelayCommand ShowTextCmd => new Lazy<RelayCommand>(() =>
@@ -28,6 +36,17 @@ namespace HandyControlDemo.ViewModel
             Dialog.Show(new TextDialog());
         }
 
+#if netle40
+        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
+            new RelayCommand(ShowInteractiveDialog)).Value;
+
+        private void ShowInteractiveDialog()
+        {
+            Dialog.Show<InteractiveDialog>()
+                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
+                .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
+        }
+#else
         public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
             new RelayCommand(async () => await ShowInteractiveDialog())).Value;
 
@@ -37,5 +56,6 @@ namespace HandyControlDemo.ViewModel
                 .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
                 .GetResultAsync<string>();
         }
+#endif
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs

@@ -1,5 +1,9 @@
 using System;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Window;

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs

@@ -1,5 +1,9 @@
 using System;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 
 namespace HandyControlDemo.ViewModel

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 using HandyControlDemo.Data;
 
@@ -15,7 +19,11 @@ namespace HandyControlDemo.ViewModel
             get => _contextMenuIsShow;
             set
             {
+#if netle40
+                Set(nameof(ContextMenuIsShow), ref _contextMenuIsShow, value);
+#else
                 Set(ref _contextMenuIsShow, value);
+#endif
                 GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
             }
         }
@@ -25,7 +33,11 @@ namespace HandyControlDemo.ViewModel
         public bool ContextMenuIsBlink
         {
             get => _contextMenuIsBlink;
+#if netle40
+            set => Set(nameof(ContextMenuIsBlink), ref _contextMenuIsBlink, value);
+#else
             set => Set(ref _contextMenuIsBlink, value);
+#endif
         }
 
         private bool _contextContentIsShow;
@@ -35,7 +47,11 @@ namespace HandyControlDemo.ViewModel
             get => _contextContentIsShow;
             set
             {
+#if netle40
+                Set(nameof(ContextContentIsShow), ref _contextContentIsShow, value);
+#else
                 Set(ref _contextContentIsShow, value);
+#endif
                 GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
             }
         }
@@ -45,7 +61,11 @@ namespace HandyControlDemo.ViewModel
         public bool ContextContentIsBlink
         {
             get => _contextContentIsBlink;
+#if netle40
+            set => Set(nameof(ContextContentIsBlink), ref _contextContentIsBlink, value);
+#else
             set => Set(ref _contextContentIsBlink, value);
+#endif
         }
 
         public RelayCommand<object> MouseCmd => new Lazy<RelayCommand<object>>(() =>

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs

@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Data;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
@@ -26,7 +30,11 @@ namespace HandyControlDemo.ViewModel
         public int PageIndex
         {
             get => _pageIndex;
+#if netle40
+            set => Set(nameof(PageIndex), ref _pageIndex, value);
+#else
             set => Set(ref _pageIndex, value);
+#endif
         }
 
         public PaginationDemoViewModel(DataService dataService)

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using GalaSoft.MvvmLight;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 
 namespace HandyControlDemo.ViewModel

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs

@@ -1,7 +1,11 @@
 using System;
 using System.Linq;
 using System.Windows.Controls;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControl.Controls;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;

src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Windows;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+# endif
 using HandyControlDemo.Tools;
 
 namespace HandyControlDemo.ViewModel

src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs

@@ -16,7 +16,11 @@ namespace HandyControlDemo.ViewModel
         public IList<T> DataList
         {
             get => _dataList;
+#if netle40
+            set => Set(nameof(DataList), ref _dataList, value);
+#else
             set => Set(ref _dataList, value);
+#endif       
         }
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs

@@ -8,10 +8,17 @@ namespace HandyControlDemo.ViewModel
     {
         public ContributorsViewModel(DataService dataService)
         {
+#if netle40
+            Task.Factory.StartNew(() =>
+            {
+                DataList = dataService.GetContributorDataList();
+            });
+#else
             Task.Run(() =>
             {
                 DataList = dataService.GetContributorDataList();
             });
+#endif
         }
     }
 }

src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Windows.Controls;
+#if netle40
+using GalaSoft.MvvmLight.Command;
+#else
 using GalaSoft.MvvmLight.CommandWpf;
+#endif
 using GalaSoft.MvvmLight.Messaging;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
@@ -10,7 +14,7 @@ namespace HandyControlDemo.ViewModel
 {
     public class MainViewModel : DemoViewModelBase<DemoDataModel>
     {
-        #region 字段
+#region 字段
 
         /// <summary>
         ///     内容标题
@@ -27,7 +31,7 @@ namespace HandyControlDemo.ViewModel
         /// </summary>
         private ListBoxItem _listBoxItemCurrent;
 
-        #endregion
+#endregion
 
         public MainViewModel(DataService dataService)
         {
@@ -48,7 +52,7 @@ namespace HandyControlDemo.ViewModel
             DataList = dataService.GetDemoDataList();
         }
 
-        #region 属性
+#region 属性
 
         /// <summary>
         ///     子内容
@@ -56,7 +60,11 @@ namespace HandyControlDemo.ViewModel
         public object SubContent
         {
             get => _subContent;
+#if netle40
+            set => Set(nameof(SubContent), ref _subContent, value);
+#else
             set => Set(ref _subContent, value);
+#endif
         }
 
         /// <summary>
@@ -65,7 +73,11 @@ namespace HandyControlDemo.ViewModel
         public object ContentTitle
         {
             get => _contentTitle;
+#if netle40
+            set => Set(nameof(ContentTitle), ref _contentTitle, value);
+#else
             set => Set(ref _contentTitle, value);
+#endif
         }
 
         #endregion
@@ -79,9 +91,9 @@ namespace HandyControlDemo.ViewModel
             new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
                 new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
 
-        #endregion
+#endregion
 
-        #region 方法
+#region 方法
 
         /// <summary>
         ///     切换例子
@@ -108,6 +120,6 @@ namespace HandyControlDemo.ViewModel
             }
         }
 
-        #endregion
+#endregion
     }
 }