diff --git a/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj b/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj index 4f5de2c..b2107fe 100644 --- a/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj +++ b/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj @@ -71,13 +71,13 @@ ..\packages\ExifLibNet.1.1.18\lib\netstandard1.3\ExifLibrary.dll - ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.dll + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll - ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Extras.dll + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll - ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Platform.dll + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll @@ -85,8 +85,8 @@ ..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll - - ..\packages\PropertyChanged.Fody.2.5.9\lib\net452\PropertyChanged.dll + + ..\packages\PropertyChanged.Fody.2.5.10\lib\net452\PropertyChanged.dll ..\packages\SixLabors.Core.1.0.0-dev000066\lib\netstandard1.1\SixLabors.Core.dll @@ -218,8 +218,7 @@ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - ..\packages\MvvmLightLibs.5.4.1\lib\net45\System.Windows.Interactivity.dll - True + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll @@ -326,9 +325,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/DeveImageOptimizerWPF/ViewModel/ViewModelLocator.cs b/DeveImageOptimizerWPF/ViewModel/ViewModelLocator.cs index 649da8f..e59fa22 100644 --- a/DeveImageOptimizerWPF/ViewModel/ViewModelLocator.cs +++ b/DeveImageOptimizerWPF/ViewModel/ViewModelLocator.cs @@ -45,21 +45,9 @@ public ViewModelLocator() SimpleIoc.Default.Register(); } - public MainViewModel Main - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } + public MainViewModel Main => ServiceLocator.Current.GetInstance(); - public SettingsViewModel Settings - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } + public SettingsViewModel Settings => ServiceLocator.Current.GetInstance(); public static void Cleanup() { diff --git a/DeveImageOptimizerWPF/packages.config b/DeveImageOptimizerWPF/packages.config index 258ffb8..ea04f3c 100644 --- a/DeveImageOptimizerWPF/packages.config +++ b/DeveImageOptimizerWPF/packages.config @@ -4,16 +4,16 @@ - + - + - - + + - +