From 2891006d892c9e418cd04c5ea9524c21f408a442 Mon Sep 17 00:00:00 2001 From: Jakob Date: Wed, 19 Jan 2022 16:24:35 +0100 Subject: [PATCH] update dependencies, remove selfupdater as described in #23 --- EnvyUpdate/App.config | 2 +- EnvyUpdate/EnvyUpdate.csproj | 25 ++++++++++++------------- EnvyUpdate/MainWindow.xaml.cs | 4 ---- EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++-- EnvyUpdate/Util.cs | 14 -------------- EnvyUpdate/packages.config | 11 +++++------ README.md | 3 ++- 7 files changed, 22 insertions(+), 41 deletions(-) diff --git a/EnvyUpdate/App.config b/EnvyUpdate/App.config index b505ff8..8dde225 100644 --- a/EnvyUpdate/App.config +++ b/EnvyUpdate/App.config @@ -11,7 +11,7 @@ - + diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj index 85f90d3..d4b1588 100644 --- a/EnvyUpdate/EnvyUpdate.csproj +++ b/EnvyUpdate/EnvyUpdate.csproj @@ -80,17 +80,14 @@ ..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net472\Hardcodet.NotifyIcon.Wpf.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Notifications.Wpf.0.1.1\lib\net461\Notifications.Wpf.dll - - ..\packages\Onova.2.6.2\lib\net461\Onova.dll - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -104,15 +101,15 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll + + ..\packages\System.Text.Json.6.0.1\lib\net461\System.Text.Json.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -236,7 +233,9 @@ - + + - + + \ No newline at end of file diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs index c21d341..24086ca 100644 --- a/EnvyUpdate/MainWindow.xaml.cs +++ b/EnvyUpdate/MainWindow.xaml.cs @@ -112,10 +112,6 @@ namespace EnvyUpdate private async void Load() { - //Check if updater disabled - if (!File.Exists(Path.Combine(GlobalVars.exepath, "disable_updater.envy"))) - await Util.DoUpdateAsync(); - int psid = 0; int pfid = 0; int osid = 0; diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs index beeaaff..576ddb8 100644 --- a/EnvyUpdate/Properties/AssemblyInfo.cs +++ b/EnvyUpdate/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // 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("2.11")] -[assembly: AssemblyFileVersion("2.11")] +[assembly: AssemblyVersion("2.12")] +[assembly: AssemblyFileVersion("2.12")] diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs index 43e5dd0..52dc444 100644 --- a/EnvyUpdate/Util.cs +++ b/EnvyUpdate/Util.cs @@ -1,7 +1,5 @@ using IWshRuntimeLibrary; using Microsoft.Win32; -using Onova; -using Onova.Services; using System; using System.Diagnostics; using System.IO; @@ -387,17 +385,5 @@ namespace EnvyUpdate return 1; } - - public static async Task DoUpdateAsync() - { - using (var httpc = new System.Net.Http.HttpClient()) - { - using (var manager = new UpdateManager(new WebPackageResolver(httpc, "https://dev.jakobsenkl.pw/envyupdate/versions.txt"), new ZipPackageExtractor())) - { - // Check for new version and, if available, perform full update and restart - await manager.CheckPerformUpdateAsync(); - } - } - } } } \ No newline at end of file diff --git a/EnvyUpdate/packages.config b/EnvyUpdate/packages.config index c31fc18..7c39521 100644 --- a/EnvyUpdate/packages.config +++ b/EnvyUpdate/packages.config @@ -1,18 +1,17 @@  - + - + - - - - + + + \ No newline at end of file diff --git a/README.md b/README.md index 0d16302..ca5ca97 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed. +The application itself does not update itself. If you notice any bugs or issues, be sure to check for a new version on GitHub! + Or install using [scoop](https://scoop.sh) by running ``` scoop bucket add fyr77 https://github.com/fyr77/fyr77-scoop @@ -51,5 +53,4 @@ EnvyUpdate is not a replacement for any of these tools. I will still try to impl * wpf-notifyicon (for showing an icon in the system tray): [CPOL](https://github.com/hardcodet/wpf-notifyicon/blob/master/LICENSE) * Notifications.Wpf: [MIT](https://github.com/Federerer/Notifications.Wpf/blob/master/LICENSE) * Resource Embedder: [MIT](https://github.com/MarcStan/resource-embedder/blob/master/LICENSE) -* Onova: [LGPL v3](https://github.com/Tyrrrz/Onova/blob/master/License.txt) * Icon made by Freepik from www.flaticon.com \ No newline at end of file