Updated the rest of the nuget packages

devedse · Sep 16, 2018 · 45ac76b · 45ac76b
1 parent 63c4017
commit 45ac76b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj b/DeveImageOptimizerWPF/DeveImageOptimizerWPF.csproj
@@ -71,22 +71,22 @@
       <HintPath>..\packages\ExifLibNet.1.1.18\lib\netstandard1.3\ExifLibrary.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL">
       <HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="PropertyChanged, Version=2.5.9.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
-      <HintPath>..\packages\PropertyChanged.Fody.2.5.9\lib\net452\PropertyChanged.dll</HintPath>
+    <Reference Include="PropertyChanged, Version=2.5.10.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
+      <HintPath>..\packages\PropertyChanged.Fody.2.5.10\lib\net452\PropertyChanged.dll</HintPath>
     </Reference>
     <Reference Include="SixLabors.Core, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SixLabors.Core.1.0.0-dev000066\lib\netstandard1.1\SixLabors.Core.dll</HintPath>
@@ -218,8 +218,7 @@
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -326,9 +325,9 @@
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.3.1.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.1.4\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\ILRepack.2.0.16\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.2.0.16\build\ILRepack.props'))" />
+    <Error Condition="!Exists('..\packages\Fody.3.2.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.2.3\build\Fody.targets'))" />
   </Target>
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-  <Import Project="..\packages\Fody.3.1.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.4\build\Fody.targets')" />
+  <Import Project="..\packages\Fody.3.2.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.2.3\build\Fody.targets')" />
 </Project>
diff --git a/DeveImageOptimizerWPF/ViewModel/ViewModelLocator.cs b/DeveImageOptimizerWPF/ViewModel/ViewModelLocator.cs
@@ -45,21 +45,9 @@ public ViewModelLocator()
             SimpleIoc.Default.Register<SettingsViewModel>();
         }
 
-        public MainViewModel Main
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<MainViewModel>();
-            }
-        }
+        public MainViewModel Main => ServiceLocator.Current.GetInstance<MainViewModel>();
 
-        public SettingsViewModel Settings
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<SettingsViewModel>();
-            }
-        }
+        public SettingsViewModel Settings => ServiceLocator.Current.GetInstance<SettingsViewModel>();
 
         public static void Cleanup()
         {

diff --git a/DeveImageOptimizerWPF/packages.config b/DeveImageOptimizerWPF/packages.config
@@ -4,16 +4,16 @@
   <package id="DeveImageOptimizer" version="1.0.212" targetFramework="net47" />
   <package id="DeveLibVipsNuget" version="1.0.8" targetFramework="net47" />
   <package id="ExifLibNet" version="1.1.18" targetFramework="net47" />
-  <package id="Fody" version="3.1.4" targetFramework="net47" developmentDependency="true" />
+  <package id="Fody" version="3.2.3" targetFramework="net47" developmentDependency="true" />
   <package id="ILMerge" version="2.14.1208" targetFramework="net47" />
   <package id="ILRepack" version="2.0.16" targetFramework="net47" />
-  <package id="Microsoft.NETCore.Platforms" version="2.1.0" targetFramework="net47" />
+  <package id="Microsoft.NETCore.Platforms" version="2.1.1" targetFramework="net47" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net47" />
-  <package id="MvvmLight" version="5.4.1" targetFramework="net47" />
-  <package id="MvvmLightLibs" version="5.4.1" targetFramework="net47" />
+  <package id="MvvmLight" version="5.4.1.1" targetFramework="net47" />
+  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net47" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net47" />
   <package id="Ookii.Dialogs" version="1.0" targetFramework="net47" />
-  <package id="PropertyChanged.Fody" version="2.5.9" targetFramework="net47" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="2.5.10" targetFramework="net47" developmentDependency="true" />
   <package id="SixLabors.Core" version="1.0.0-dev000066" targetFramework="net47" />
   <package id="SixLabors.ImageSharp" version="1.0.0-dev001874" targetFramework="net47" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net47" />