Update nuget packages

Tyrrrz · Mar 31, 2018 · a734e11 · a734e11
1 parent ce3edfb
commit a734e11
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/OsuHelper/OsuHelper.csproj b/OsuHelper/OsuHelper.csproj
@@ -65,10 +65,10 @@
       <HintPath>..\packages\NAudio.1.8.4\lib\net35\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Onova, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Onova.2.0.0\lib\net46\Onova.dll</HintPath>
+    <Reference Include="Onova, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Onova.2.1.0\lib\net46\Onova.dll</HintPath>
     </Reference>
     <Reference Include="Polly, Version=5.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Polly.5.8.0\lib\net45\Polly.dll</HintPath>

diff --git a/OsuHelper/Services/IUpdateService.cs b/OsuHelper/Services/IUpdateService.cs
@@ -9,6 +9,6 @@ public interface IUpdateService
 
         Task<Version> CheckPrepareUpdateAsync();
 
-        Task FinalizeUpdateAsync();
+        void FinalizeUpdate();
     }
 }
diff --git a/OsuHelper/Services/UpdateService.cs b/OsuHelper/Services/UpdateService.cs
@@ -39,12 +39,13 @@ public async Task<Version> CheckPrepareUpdateAsync()
                 return null;
 
             // Prepare the update
-            await _manager.PrepareUpdateAsync(check.LastVersion);
+            if (!_manager.IsUpdatePrepared(check.LastVersion))
+                await _manager.PrepareUpdateAsync(check.LastVersion);
 
             return _updateVersion = check.LastVersion;
         }
 
-        public async Task FinalizeUpdateAsync()
+        public void FinalizeUpdate()
         {
             // Check if an update is pending
             if (_updateVersion == null)
@@ -55,7 +56,7 @@ public async Task FinalizeUpdateAsync()
                 return;
 
             // Launch the updater
-            await _manager.LaunchUpdaterAsync(_updateVersion, NeedRestart);
+            _manager.LaunchUpdater(_updateVersion, NeedRestart);
             _updateFinalized = true;
         }
     }

diff --git a/OsuHelper/ViewModels/MainViewModel.cs b/OsuHelper/ViewModels/MainViewModel.cs
@@ -112,13 +112,13 @@ private async void ViewLoaded()
             }
         }
 
-        private async void ViewClosed()
+        private void ViewClosed()
         {
             // Save settings
             _settingsService.Save();
 
             // Finalize updates if available
-            await _updateService.FinalizeUpdateAsync();
+            _updateService.FinalizeUpdate();
         }
 
         private void ShowSettings()

diff --git a/OsuHelper/packages.config b/OsuHelper/packages.config
@@ -5,8 +5,8 @@
   <package id="MaterialDesignThemes" version="2.4.0.1044" targetFramework="net46" />
   <package id="MvvmLightLibs" version="5.4.1" targetFramework="net46" />
   <package id="NAudio" version="1.8.4" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net45" />
-  <package id="Onova" version="2.0.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
+  <package id="Onova" version="2.1.0" targetFramework="net46" />
   <package id="Polly" version="5.8.0" targetFramework="net45" />
   <package id="Tyrrrz.Extensions" version="1.5.0" targetFramework="net45" />
   <package id="Tyrrrz.Settings" version="1.3.2" targetFramework="net45" />