diff --git a/Wabbajack/View Models/MainWindowVM.cs b/Wabbajack/View Models/MainWindowVM.cs index 5f56ad04..e98d1963 100644 --- a/Wabbajack/View Models/MainWindowVM.cs +++ b/Wabbajack/View Models/MainWindowVM.cs @@ -1,5 +1,4 @@ -using AutoUpdaterDotNET; -using DynamicData; +using DynamicData; using DynamicData.Binding; using ReactiveUI; using ReactiveUI.Fody.Helpers; @@ -142,21 +141,6 @@ namespace Wabbajack execute: () => NavigateTo(SettingsPane.Value)); OpenTerminalCommand = ReactiveCommand.Create(() => OpenTerminal()); - - // Latch onto update events and update GUI - AutoUpdater.CheckForUpdateEvent += (args) => - { - UpdateAvailable = args?.IsUpdateAvailable ?? false; - }; - - // Trigger a query for updates soon after starting - Observable.Return(Unit.Default) - .Delay(TimeSpan.FromSeconds(3)) - .ObserveOnGuiThread() - .Subscribe(_ => - { - AutoUpdater.Start(@"https://www.wabbajack.org/current-version.xml"); - }); } private void OpenTerminal() diff --git a/Wabbajack/View Models/ModeSelectionVM.cs b/Wabbajack/View Models/ModeSelectionVM.cs index 1a19fb6c..6ce1838f 100644 --- a/Wabbajack/View Models/ModeSelectionVM.cs +++ b/Wabbajack/View Models/ModeSelectionVM.cs @@ -1,5 +1,4 @@ -using AutoUpdaterDotNET; -using ReactiveUI; +using ReactiveUI; using ReactiveUI.Fody.Helpers; using System; using System.IO; @@ -38,24 +37,6 @@ namespace Wabbajack CompileCommand = ReactiveCommand.Create(() => mainVM.NavigateTo(mainVM.Compiler.Value)); BrowseCommand = ReactiveCommand.Create(() => mainVM.NavigateTo(mainVM.Gallery.Value)); - - UpdateCommand = ReactiveCommand.Create( - canExecute: mainVM.WhenAny(x => x.UpdateAvailable) - .ObserveOnGuiThread(), - execute: () => - { - try - { - if (AutoUpdater.DownloadUpdate()) - { - mainVM.ShutdownApplication(); - } - } - catch (Exception exception) - { - Utils.Error(exception, "Could not download update."); - } - }); } } } diff --git a/Wabbajack/Views/ModeSelectionView.xaml b/Wabbajack/Views/ModeSelectionView.xaml index 337b1a88..65847454 100644 --- a/Wabbajack/Views/ModeSelectionView.xaml +++ b/Wabbajack/Views/ModeSelectionView.xaml @@ -34,25 +34,6 @@ - diff --git a/Wabbajack/Views/ModeSelectionView.xaml.cs b/Wabbajack/Views/ModeSelectionView.xaml.cs index 32139e40..58dbd712 100644 --- a/Wabbajack/Views/ModeSelectionView.xaml.cs +++ b/Wabbajack/Views/ModeSelectionView.xaml.cs @@ -37,15 +37,6 @@ namespace Wabbajack this.WhenAny(x => x.ViewModel.CompileCommand) .BindToStrict(this, x => x.CompileButton.Command) .DisposeWith(dispose); - - this.WhenAny(x => x.ViewModel.UpdateCommand) - .BindToStrict(this, x => x.UpdateAvailableButton.Command) - .DisposeWith(dispose); - this.WhenAny(x => x.ViewModel.UpdateCommand.CanExecute) - .Switch() - .Select(x => x ? Visibility.Visible : Visibility.Collapsed) - .BindToStrict(this, x => x.UpdateAvailableButton.Visibility) - .DisposeWith(dispose); }); } } diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index d9750654..cb10efdd 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -50,7 +50,6 @@ -