From 5fa09d8f8308645827b5b2966eb65a3dc2044ed7 Mon Sep 17 00:00:00 2001 From: ZestyTS Date: Thu, 5 Oct 2023 15:01:24 -0700 Subject: [PATCH] Fixing merge --- UWUVCI AIO WPF.sln | 18 ++--------- UWUVCI AIO WPF/Classes/KeyFile.cs | 2 +- UWUVCI AIO WPF/FodyWeavers.xsd | 30 ------------------- .../Bases/NonCustomBaseFrame.xaml.cs | 19 ++++++++---- UWUVCI AIO WPF/UI/Frames/StartFrame.xaml.cs | 15 +--------- .../UI/Windows/Custom Message.xaml.cs | 17 +++-------- 6 files changed, 23 insertions(+), 78 deletions(-) diff --git a/UWUVCI AIO WPF.sln b/UWUVCI AIO WPF.sln index e2432d2..5b3b817 100644 --- a/UWUVCI AIO WPF.sln +++ b/UWUVCI AIO WPF.sln @@ -1,32 +1,20 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32630.192 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29806.167 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.ActiveCfg = Debug|x64 - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.Build.0 = Debug|x64 - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.ActiveCfg = Debug|x86 - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.Build.0 = Debug|x86 {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.Build.0 = Release|Any CPU - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.ActiveCfg = Release|x64 - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.Build.0 = Release|x64 - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.ActiveCfg = Release|x86 - {6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UWUVCI AIO WPF/Classes/KeyFile.cs b/UWUVCI AIO WPF/Classes/KeyFile.cs index f0b456e..e3177aa 100644 --- a/UWUVCI AIO WPF/Classes/KeyFile.cs +++ b/UWUVCI AIO WPF/Classes/KeyFile.cs @@ -33,7 +33,7 @@ namespace UWUVCI_AIO_WPF.Classes public static void ExportFile(List precomp, GameConsoles console) { CheckAndFixFolder("bin\\keys"); - Stream createConfigStream = new FileStream(Path.Combine(Directory.GetCurrentDirectory(), $@"bin\keys\{console.ToString().ToLower()}.vck"), FileMode.Create, FileAccess.Write); + Stream createConfigStream = new FileStream($@"bin\keys\{console.ToString().ToLower()}.vck", FileMode.Create, FileAccess.Write); GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress); IFormatter formatter = new BinaryFormatter(); formatter.Serialize(compressedStream, precomp); diff --git a/UWUVCI AIO WPF/FodyWeavers.xsd b/UWUVCI AIO WPF/FodyWeavers.xsd index 05e92c1..44a5374 100644 --- a/UWUVCI AIO WPF/FodyWeavers.xsd +++ b/UWUVCI AIO WPF/FodyWeavers.xsd @@ -17,16 +17,6 @@ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. @@ -53,16 +43,6 @@ Controls if .pdbs for reference assemblies are also embedded. - - - Controls if runtime assemblies are also embedded. - - - - - Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. @@ -93,16 +73,6 @@ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - A list of unmanaged 32 bit assembly names to include, delimited with |. diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs index e4b6bf4..d5560bf 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs @@ -91,17 +91,26 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases if (info[0]) { mvm.BaseDownloaded = true; - if (mvm.RomSet) - mvm.CanInject = true; + if (mvm.RomSet) mvm.CanInject = true; } else + { mvm.BaseDownloaded = false; - } + + } + } + } + private void btnDwnlnd_Click(object sender, RoutedEventArgs e) { - mvm.Download(); - checkStuff(mvm.getInfoOfBase(Base)); + + mvm.Download(); + Thread.Sleep(500); + checkStuff(mvm.getInfoOfBase(Base)); + + + } private void btnDwnlnd_Copy_Click(object sender, RoutedEventArgs e) diff --git a/UWUVCI AIO WPF/UI/Frames/StartFrame.xaml.cs b/UWUVCI AIO WPF/UI/Frames/StartFrame.xaml.cs index a4b7c6d..4298777 100644 --- a/UWUVCI AIO WPF/UI/Frames/StartFrame.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/StartFrame.xaml.cs @@ -17,20 +17,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames private void Button_Click(object sender, RoutedEventArgs e) { - OpenKofiLink("uwuvci"); - } - private void Button_Click2(object sender, RoutedEventArgs e) - { - OpenKofiLink("zestyts"); - } - private void OpenKofiLink(string urlSuffix) - { - Process.Start(new ProcessStartInfo() - { - FileName = "https://ko-fi.com/" + urlSuffix, - UseShellExecute = true, - Verb = "open" - }); + Process.Start("https://ko-fi.com/uwuvci"); } private void Button_Click2(object sender, RoutedEventArgs e) { diff --git a/UWUVCI AIO WPF/UI/Windows/Custom Message.xaml.cs b/UWUVCI AIO WPF/UI/Windows/Custom Message.xaml.cs index 187ce4b..3f21f9d 100644 --- a/UWUVCI AIO WPF/UI/Windows/Custom Message.xaml.cs +++ b/UWUVCI AIO WPF/UI/Windows/Custom Message.xaml.cs @@ -110,24 +110,15 @@ namespace UWUVCI_AIO_WPF.UI.Windows private void Folder_Click(object sender, RoutedEventArgs e) { - var filePath = ""; try { - filePath = path; - if (File.Exists(filePath)) - filePath = new FileInfo(filePath).DirectoryName; - - Process.Start(new ProcessStartInfo() - { - FileName = filePath, - UseShellExecute = true, - Verb = "open" - }); + if (File.Exists(path)) path = new FileInfo(path).DirectoryName; + Process.Start(path); Close(); } catch (Exception) { - Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.\n\nFile path: " + filePath); + Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists."); try { cm.Owner = (FindResource("mvm") as MainViewModel).mw; @@ -166,7 +157,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows Close(); var containNintendont = Message.Content.ToString().ToLower().Contains("nintendont"); - SDSetup sd = new SDSetup(containNintendont, path); + SDSetup sd = new SDSetup(containNintendont ? true : false, path); try { sd.Owner = (FindResource("mvm") as MainViewModel).mw;