From b756d61292ac595c6505537d6ee45a7a690c6b87 Mon Sep 17 00:00:00 2001 From: MelonSpeedruns Date: Fri, 31 Jan 2020 14:21:16 -0500 Subject: [PATCH] WIP 2 on the Updater. Updater.exe won't boot now for some reason... --- Ryujinx.Updater/Program.cs | 2 ++ Ryujinx.Updater/Ryujinx.Updater.csproj | 4 ++-- Ryujinx/Ui/MainWindow.cs | 2 -- Ryujinx/Updater/Parser/UpdateParser.cs | 11 +++++++++-- Ryujinx/Updater/Update.cs | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Ryujinx.Updater/Program.cs b/Ryujinx.Updater/Program.cs index b44b850fed..7b837c4c39 100644 --- a/Ryujinx.Updater/Program.cs +++ b/Ryujinx.Updater/Program.cs @@ -72,6 +72,8 @@ namespace Ryujinx.Updater versionNumber = metaFileData[0]; downloadUrl = metaFileData[1]; + MessageBox.Show(downloadUrl); + using (WebClient client = new WebClient()) { client.DownloadFile(downloadUrl, updateSaveLocation); diff --git a/Ryujinx.Updater/Ryujinx.Updater.csproj b/Ryujinx.Updater/Ryujinx.Updater.csproj index 6db5bdf5ed..932016c6a1 100644 --- a/Ryujinx.Updater/Ryujinx.Updater.csproj +++ b/Ryujinx.Updater/Ryujinx.Updater.csproj @@ -1,10 +1,10 @@  - WinExe + Exe netcoreapp3.0 true - Ryujinx.Updater.Program + Updater Ryujinx.ico diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs index c3a14700db..6601d7b52b 100644 --- a/Ryujinx/Ui/MainWindow.cs +++ b/Ryujinx/Ui/MainWindow.cs @@ -16,8 +16,6 @@ using System.Reflection; using System.Text; using System.Threading; using System.Threading.Tasks; -using Utf8Json; -using Utf8Json.Resolvers; using GUI = Gtk.Builder.ObjectAttribute; diff --git a/Ryujinx/Updater/Parser/UpdateParser.cs b/Ryujinx/Updater/Parser/UpdateParser.cs index cc535e6b58..c86c649e6a 100644 --- a/Ryujinx/Updater/Parser/UpdateParser.cs +++ b/Ryujinx/Updater/Parser/UpdateParser.cs @@ -80,12 +80,19 @@ namespace Ryujinx.Updater.Parser { try { + // Create Meta.json + + List metaFileContents = new List(); + metaFileContents.Add(_buildVer); + metaFileContents.Add(_buildArt); + File.WriteAllLines(Path.Combine(RyuDir, "Meta.json"), metaFileContents); + // Start Updater.exe string updaterPath = Path.Combine(RyuDir, "Updater.exe"); - Process.Start(new ProcessStartInfo(updaterPath) { UseShellExecute = true }); - Application.Quit(); + Process.Start(updaterPath); + } catch (Exception ex) { diff --git a/Ryujinx/Updater/Update.cs b/Ryujinx/Updater/Update.cs index f97d71ed5a..bdccc7831e 100644 --- a/Ryujinx/Updater/Update.cs +++ b/Ryujinx/Updater/Update.cs @@ -11,8 +11,8 @@ namespace Ryujinx.Updater { public class Update { - private static string _parentdir = Path.Combine(@"..\.."); - public static string RyuDir = Environment.CurrentDirectory; + private static string _parentdir = Path.Combine(@"..\.."); + public static string RyuDir = Environment.CurrentDirectory; public static void PerformUpdate() {