diff --git a/ModpackUpdater/App.config b/ModpackUpdater.Apps.Client/App.config similarity index 100% rename from ModpackUpdater/App.config rename to ModpackUpdater.Apps.Client/App.config diff --git a/ModpackUpdater/AppConfig.cs b/ModpackUpdater.Apps.Client/AppConfig.cs similarity index 94% rename from ModpackUpdater/AppConfig.cs rename to ModpackUpdater.Apps.Client/AppConfig.cs index a249e01..4f91318 100644 --- a/ModpackUpdater/AppConfig.cs +++ b/ModpackUpdater.Apps.Client/AppConfig.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Pilz.Configuration; -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; public class AppConfig : IChildSettings, ISettingsIdentifier { diff --git a/ModpackUpdater/AppSymbolFactory.cs b/ModpackUpdater.Apps.Client/AppSymbolFactory.cs similarity index 93% rename from ModpackUpdater/AppSymbolFactory.cs rename to ModpackUpdater.Apps.Client/AppSymbolFactory.cs index da08cd4..065d3c5 100644 --- a/ModpackUpdater/AppSymbolFactory.cs +++ b/ModpackUpdater.Apps.Client/AppSymbolFactory.cs @@ -2,7 +2,7 @@ using Pilz.UI.Telerik.Symbols; using System.Reflection; -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; public class AppSymbolFactory : RadSymbolFactory { diff --git a/ModpackUpdater/AppSymbols.cs b/ModpackUpdater.Apps.Client/AppSymbols.cs similarity index 86% rename from ModpackUpdater/AppSymbols.cs rename to ModpackUpdater.Apps.Client/AppSymbols.cs index fdb37f1..44341ee 100644 --- a/ModpackUpdater/AppSymbols.cs +++ b/ModpackUpdater.Apps.Client/AppSymbols.cs @@ -1,4 +1,4 @@ -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; public enum AppSymbols { diff --git a/ModpackUpdater/AppUpdater.cs b/ModpackUpdater.Apps.Client/AppUpdater.cs similarity index 94% rename from ModpackUpdater/AppUpdater.cs rename to ModpackUpdater.Apps.Client/AppUpdater.cs index 6ebd533..dbb6378 100644 --- a/ModpackUpdater/AppUpdater.cs +++ b/ModpackUpdater.Apps.Client/AppUpdater.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Converters; using System.Reflection; -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; public class AppUpdater { @@ -24,7 +24,7 @@ public class AppUpdater try { var appVersion = Assembly.GetExecutingAssembly().GetName().Version; - string result = await httpClient.GetStringAsync(UPDATE_URL); + var result = await httpClient.GetStringAsync(UPDATE_URL); info = JsonConvert.DeserializeObject(result); if (info is not null && info.Version > appVersion) diff --git a/ModpackUpdater/CustomThemes/Office2019Dark Theme Color Palette.png b/ModpackUpdater.Apps.Client/CustomThemes/Office2019Dark Theme Color Palette.png similarity index 100% rename from ModpackUpdater/CustomThemes/Office2019Dark Theme Color Palette.png rename to ModpackUpdater.Apps.Client/CustomThemes/Office2019Dark Theme Color Palette.png diff --git a/ModpackUpdater/CustomThemes/Office2019DarkBluePurple.tssp b/ModpackUpdater.Apps.Client/CustomThemes/Office2019DarkBluePurple.tssp similarity index 100% rename from ModpackUpdater/CustomThemes/Office2019DarkBluePurple.tssp rename to ModpackUpdater.Apps.Client/CustomThemes/Office2019DarkBluePurple.tssp diff --git a/ModpackUpdater.Apps.Client/FiledialogFilters.Designer.cs b/ModpackUpdater.Apps.Client/FiledialogFilters.Designer.cs new file mode 100644 index 0000000..eee4e64 --- /dev/null +++ b/ModpackUpdater.Apps.Client/FiledialogFilters.Designer.cs @@ -0,0 +1,81 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace ModpackUpdater.My.Resources { + using System; + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class FiledialogFilters { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal FiledialogFilters() { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.Apps.Client.FiledialogFilters", typeof(FiledialogFilters).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Json files (*.json) ähnelt. + /// + internal static string JSON_Display { + get { + return ResourceManager.GetString("JSON_Display", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die *.json ähnelt. + /// + internal static string JSON_Filter { + get { + return ResourceManager.GetString("JSON_Filter", resourceCulture); + } + } + } +} diff --git a/ModpackUpdater/FiledialogFilters.resx b/ModpackUpdater.Apps.Client/FiledialogFilters.resx similarity index 100% rename from ModpackUpdater/FiledialogFilters.resx rename to ModpackUpdater.Apps.Client/FiledialogFilters.resx diff --git a/ModpackUpdater/Form1.Designer.cs b/ModpackUpdater.Apps.Client/Form1.Designer.cs similarity index 100% rename from ModpackUpdater/Form1.Designer.cs rename to ModpackUpdater.Apps.Client/Form1.Designer.cs diff --git a/ModpackUpdater/Form1.cs b/ModpackUpdater.Apps.Client/Form1.cs similarity index 99% rename from ModpackUpdater/Form1.cs rename to ModpackUpdater.Apps.Client/Form1.cs index 15ba6e5..1e90c0e 100644 --- a/ModpackUpdater/Form1.cs +++ b/ModpackUpdater.Apps.Client/Form1.cs @@ -1,5 +1,5 @@ -using ModpackUpdater.Manager; -using ModpackUpdater.Model; +using ModpackUpdater.Apps.Client; +using ModpackUpdater.Manager; using ModpackUpdater.My.Resources; using Pilz.UI.Symbols; using Pilz.UI.Telerik; diff --git a/ModpackUpdater/Form1.resx b/ModpackUpdater.Apps.Client/Form1.resx similarity index 100% rename from ModpackUpdater/Form1.resx rename to ModpackUpdater.Apps.Client/Form1.resx diff --git a/ModpackUpdater/LangRes.Designer.cs b/ModpackUpdater.Apps.Client/LangRes.Designer.cs similarity index 99% rename from ModpackUpdater/LangRes.Designer.cs rename to ModpackUpdater.Apps.Client/LangRes.Designer.cs index 0f71b98..d512234 100644 --- a/ModpackUpdater/LangRes.Designer.cs +++ b/ModpackUpdater.Apps.Client/LangRes.Designer.cs @@ -39,7 +39,7 @@ namespace ModpackUpdater.My.Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.LangRes", typeof(LangRes).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.Apps.Client.LangRes", typeof(LangRes).Assembly); resourceMan = temp; } return resourceMan; diff --git a/ModpackUpdater/LangRes.resx b/ModpackUpdater.Apps.Client/LangRes.resx similarity index 100% rename from ModpackUpdater/LangRes.resx rename to ModpackUpdater.Apps.Client/LangRes.resx diff --git a/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj b/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj new file mode 100644 index 0000000..2df3ab1 --- /dev/null +++ b/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj @@ -0,0 +1,68 @@ + + + + Exe + net8.0-windows + true + icons8_download_from_ftp.ico + Minecraft Modpack Updater + true + true + 1.5.2.2 + + + + + + + + + + + + + True + True + FiledialogFilters.resx + + + True + True + LangRes.resx + + + + + + ResXFileCodeGenerator + ModpackUpdater.My.Resources + FiledialogFilters.Designer.cs + + + ResXFileCodeGenerator + ModpackUpdater.My.Resources + LangRes.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater/Options.cs b/ModpackUpdater.Apps.Client/Options.cs similarity index 95% rename from ModpackUpdater/Options.cs rename to ModpackUpdater.Apps.Client/Options.cs index b43bae0..6bf540f 100644 --- a/ModpackUpdater/Options.cs +++ b/ModpackUpdater.Apps.Client/Options.cs @@ -1,7 +1,6 @@ -using ModpackUpdater.Model; -using Mono.Options; +using Mono.Options; -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; internal class Options { diff --git a/ModpackUpdater/Program.cs b/ModpackUpdater.Apps.Client/Program.cs similarity index 93% rename from ModpackUpdater/Program.cs rename to ModpackUpdater.Apps.Client/Program.cs index 7bf4925..2bf06ca 100644 --- a/ModpackUpdater/Program.cs +++ b/ModpackUpdater.Apps.Client/Program.cs @@ -1,11 +1,10 @@ using ModpackUpdater.Manager; -using ModpackUpdater.Model; using Newtonsoft.Json; using Pilz.Configuration; using System.Runtime.InteropServices; using Telerik.WinControls; -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; public static class Program { @@ -14,10 +13,10 @@ public static class Program public static ISettings Settings => settingsManager.Instance; [DllImport("kernel32.dll")] - static extern IntPtr GetConsoleWindow(); + static extern nint GetConsoleWindow(); [DllImport("user32.dll")] - static extern bool ShowWindow(IntPtr hWnd, int nCmdShow); + static extern bool ShowWindow(nint hWnd, int nCmdShow); static Program() { @@ -49,7 +48,7 @@ public static class Program if (ThemeResolutionService.LoadPackageResource("ModpackUpdater.CustomThemes.Office2019DarkBluePurple.tssp")) ThemeResolutionService.ApplicationThemeName = "Office2019DarkBluePurple"; - Application.Run(new Form1(updateOptions)); + Application.Run(new Form1(updateOptions)); } private static string GetSettingsPath(int? settingsVersion = 2) @@ -74,13 +73,10 @@ public static class Program // Migrate var newConfig = Settings.Get(); newConfig.LastMinecraftProfilePath = legacyConfig.LastMinecraftProfilePath; - + if (ModpackInfo.TryLoad(legacyConfig.LastMinecraftProfilePath) is ModpackInfo info) - { #pragma warning disable CS0612 // Typ oder Element ist veraltet info.ConfigUrl = legacyConfig.ConfigFilePath; -#pragma warning restore CS0612 // Typ oder Element ist veraltet - } // Ensure save settings settingsManager.Save(); diff --git a/ModpackUpdater/Properties/PublishProfiles/FolderProfile.pubxml b/ModpackUpdater.Apps.Client/Properties/PublishProfiles/FolderProfile.pubxml similarity index 100% rename from ModpackUpdater/Properties/PublishProfiles/FolderProfile.pubxml rename to ModpackUpdater.Apps.Client/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/ModpackUpdater/Symbols/checkmark.svg b/ModpackUpdater.Apps.Client/Symbols/checkmark.svg similarity index 100% rename from ModpackUpdater/Symbols/checkmark.svg rename to ModpackUpdater.Apps.Client/Symbols/checkmark.svg diff --git a/ModpackUpdater/Symbols/close.svg b/ModpackUpdater.Apps.Client/Symbols/close.svg similarity index 100% rename from ModpackUpdater/Symbols/close.svg rename to ModpackUpdater.Apps.Client/Symbols/close.svg diff --git a/ModpackUpdater/Symbols/delete.svg b/ModpackUpdater.Apps.Client/Symbols/delete.svg similarity index 100% rename from ModpackUpdater/Symbols/delete.svg rename to ModpackUpdater.Apps.Client/Symbols/delete.svg diff --git a/ModpackUpdater/Symbols/done.svg b/ModpackUpdater.Apps.Client/Symbols/done.svg similarity index 100% rename from ModpackUpdater/Symbols/done.svg rename to ModpackUpdater.Apps.Client/Symbols/done.svg diff --git a/ModpackUpdater/Symbols/download_from_ftp.svg b/ModpackUpdater.Apps.Client/Symbols/download_from_ftp.svg similarity index 100% rename from ModpackUpdater/Symbols/download_from_ftp.svg rename to ModpackUpdater.Apps.Client/Symbols/download_from_ftp.svg diff --git a/ModpackUpdater/Symbols/general_warning_sign.svg b/ModpackUpdater.Apps.Client/Symbols/general_warning_sign.svg similarity index 100% rename from ModpackUpdater/Symbols/general_warning_sign.svg rename to ModpackUpdater.Apps.Client/Symbols/general_warning_sign.svg diff --git a/ModpackUpdater/Symbols/opened_folder.svg b/ModpackUpdater.Apps.Client/Symbols/opened_folder.svg similarity index 100% rename from ModpackUpdater/Symbols/opened_folder.svg rename to ModpackUpdater.Apps.Client/Symbols/opened_folder.svg diff --git a/ModpackUpdater/Symbols/paste.svg b/ModpackUpdater.Apps.Client/Symbols/paste.svg similarity index 100% rename from ModpackUpdater/Symbols/paste.svg rename to ModpackUpdater.Apps.Client/Symbols/paste.svg diff --git a/ModpackUpdater/Symbols/refresh.svg b/ModpackUpdater.Apps.Client/Symbols/refresh.svg similarity index 100% rename from ModpackUpdater/Symbols/refresh.svg rename to ModpackUpdater.Apps.Client/Symbols/refresh.svg diff --git a/ModpackUpdater/Symbols/replay.svg b/ModpackUpdater.Apps.Client/Symbols/replay.svg similarity index 100% rename from ModpackUpdater/Symbols/replay.svg rename to ModpackUpdater.Apps.Client/Symbols/replay.svg diff --git a/ModpackUpdater/Symbols/save.svg b/ModpackUpdater.Apps.Client/Symbols/save.svg similarity index 100% rename from ModpackUpdater/Symbols/save.svg rename to ModpackUpdater.Apps.Client/Symbols/save.svg diff --git a/ModpackUpdater/Symbols/services.svg b/ModpackUpdater.Apps.Client/Symbols/services.svg similarity index 100% rename from ModpackUpdater/Symbols/services.svg rename to ModpackUpdater.Apps.Client/Symbols/services.svg diff --git a/ModpackUpdater/Symbols/software_installer.svg b/ModpackUpdater.Apps.Client/Symbols/software_installer.svg similarity index 100% rename from ModpackUpdater/Symbols/software_installer.svg rename to ModpackUpdater.Apps.Client/Symbols/software_installer.svg diff --git a/ModpackUpdater/Symbols/update_done.svg b/ModpackUpdater.Apps.Client/Symbols/update_done.svg similarity index 100% rename from ModpackUpdater/Symbols/update_done.svg rename to ModpackUpdater.Apps.Client/Symbols/update_done.svg diff --git a/ModpackUpdater/Symbols/wrench.svg b/ModpackUpdater.Apps.Client/Symbols/wrench.svg similarity index 100% rename from ModpackUpdater/Symbols/wrench.svg rename to ModpackUpdater.Apps.Client/Symbols/wrench.svg diff --git a/ModpackUpdater/UpdateCheckOptionsAdv.cs b/ModpackUpdater.Apps.Client/UpdateCheckOptionsAdv.cs similarity index 87% rename from ModpackUpdater/UpdateCheckOptionsAdv.cs rename to ModpackUpdater.Apps.Client/UpdateCheckOptionsAdv.cs index c5429c6..6c1066d 100644 --- a/ModpackUpdater/UpdateCheckOptionsAdv.cs +++ b/ModpackUpdater.Apps.Client/UpdateCheckOptionsAdv.cs @@ -1,6 +1,6 @@ using ModpackUpdater.Manager; -namespace ModpackUpdater; +namespace ModpackUpdater.Apps.Client; public class UpdateCheckOptionsAdv : UpdateCheckOptions { diff --git a/ModpackUpdater/icons8_download_from_ftp.ico b/ModpackUpdater.Apps.Client/icons8_download_from_ftp.ico similarity index 100% rename from ModpackUpdater/icons8_download_from_ftp.ico rename to ModpackUpdater.Apps.Client/icons8_download_from_ftp.ico diff --git a/ModpackUpdater.Apps.Manager/Form1.Designer.cs b/ModpackUpdater.Apps.Manager/Form1.Designer.cs new file mode 100644 index 0000000..84f0976 --- /dev/null +++ b/ModpackUpdater.Apps.Manager/Form1.Designer.cs @@ -0,0 +1,38 @@ +namespace ModpackUpdater.Apps.Manager; + +partial class Form1 +{ + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "Form1"; + } + + #endregion +} diff --git a/ModpackUpdater.Apps.Manager/Form1.cs b/ModpackUpdater.Apps.Manager/Form1.cs new file mode 100644 index 0000000..5b37f43 --- /dev/null +++ b/ModpackUpdater.Apps.Manager/Form1.cs @@ -0,0 +1,11 @@ +using Telerik.WinControls.UI; + +namespace ModpackUpdater.Apps.Manager; + +public partial class Form1 : RadForm +{ + public Form1() + { + InitializeComponent(); + } +} diff --git a/ModpackUpdater.Apps.Manager/Form1.resx b/ModpackUpdater.Apps.Manager/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ModpackUpdater.Apps.Manager/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj new file mode 100644 index 0000000..d28b3f7 --- /dev/null +++ b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj @@ -0,0 +1,15 @@ + + + + WinExe + net8.0-windows + enable + true + enable + + + + + + + \ No newline at end of file diff --git a/ModpackUpdater.Apps.Manager/Program.cs b/ModpackUpdater.Apps.Manager/Program.cs new file mode 100644 index 0000000..275204a --- /dev/null +++ b/ModpackUpdater.Apps.Manager/Program.cs @@ -0,0 +1,16 @@ +namespace ModpackUpdater.Apps.Manager; + +internal static class Program +{ + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. + ApplicationConfiguration.Initialize(); + Application.Run(new Form1()); + } +} \ No newline at end of file diff --git a/ModpackUpdater.Manager/Extensions.cs b/ModpackUpdater.Manager/Extensions.cs index 49b53e9..6ea07ef 100644 --- a/ModpackUpdater.Manager/Extensions.cs +++ b/ModpackUpdater.Manager/Extensions.cs @@ -1,6 +1,4 @@ -using ModpackUpdater.Model; - -namespace ModpackUpdater.Manager; +namespace ModpackUpdater.Manager; public static class Extensions { diff --git a/ModpackUpdater.Manager/ModpackFeatures.cs b/ModpackUpdater.Manager/ModpackFeatures.cs index 2bb6252..cd8c8d7 100644 --- a/ModpackUpdater.Manager/ModpackFeatures.cs +++ b/ModpackUpdater.Manager/ModpackFeatures.cs @@ -1,5 +1,4 @@ -using ModpackUpdater.Model; -using Unleash; +using Unleash; using Unleash.ClientFactory; namespace ModpackUpdater; diff --git a/ModpackUpdater.Manager/ModpackInstaller.cs b/ModpackUpdater.Manager/ModpackInstaller.cs index 8500f29..085e957 100644 --- a/ModpackUpdater.Manager/ModpackInstaller.cs +++ b/ModpackUpdater.Manager/ModpackInstaller.cs @@ -1,5 +1,4 @@ -using ModpackUpdater.Model; -using Newtonsoft.Json; +using Newtonsoft.Json; using Octokit; using System.IO.Compression; using System.Text.RegularExpressions; diff --git a/ModpackUpdater.Manager/ModpackUpdater.Manager.csproj b/ModpackUpdater.Manager/ModpackUpdater.Manager.csproj index cd0e02a..19904b8 100644 --- a/ModpackUpdater.Manager/ModpackUpdater.Manager.csproj +++ b/ModpackUpdater.Manager/ModpackUpdater.Manager.csproj @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/ModpackUpdater.Manager/UpdateCheckOptions.cs b/ModpackUpdater.Manager/UpdateCheckOptions.cs index c643ef2..77375da 100644 --- a/ModpackUpdater.Manager/UpdateCheckOptions.cs +++ b/ModpackUpdater.Manager/UpdateCheckOptions.cs @@ -1,6 +1,4 @@ -using ModpackUpdater.Model; - -namespace ModpackUpdater.Manager; +namespace ModpackUpdater.Manager; public class UpdateCheckOptions { diff --git a/ModpackUpdater.Manager/UpdateCheckResult.cs b/ModpackUpdater.Manager/UpdateCheckResult.cs index 658f208..91a155b 100644 --- a/ModpackUpdater.Manager/UpdateCheckResult.cs +++ b/ModpackUpdater.Manager/UpdateCheckResult.cs @@ -1,6 +1,4 @@ -using ModpackUpdater.Model; - -namespace ModpackUpdater.Manager; +namespace ModpackUpdater.Manager; public class UpdateCheckResult { diff --git a/ModpackUpdater.Model/ModpackUpdater.Model.csproj b/ModpackUpdater.Model/ModpackUpdater.Model.csproj deleted file mode 100644 index 85db8e4..0000000 --- a/ModpackUpdater.Model/ModpackUpdater.Model.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net8.0 - true - - - - - - - \ No newline at end of file diff --git a/ModpackUpdater.sln b/ModpackUpdater.sln index 1e4a085..e37a74e 100644 --- a/ModpackUpdater.sln +++ b/ModpackUpdater.sln @@ -3,12 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32526.322 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModpackUpdater", "ModpackUpdater\ModpackUpdater.csproj", "{81F9A2F7-D36B-0F08-12D7-9EC2606C9080}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModpackUpdater.Apps.Client", "ModpackUpdater.Apps.Client\ModpackUpdater.Apps.Client.csproj", "{81F9A2F7-D36B-0F08-12D7-9EC2606C9080}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModpackUpdater.Model", "ModpackUpdater.Model\ModpackUpdater.Model.csproj", "{0E6B6470-8C1D-0CDD-3681-461297A01960}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModpackUpdater", "ModpackUpdater\ModpackUpdater.csproj", "{0E6B6470-8C1D-0CDD-3681-461297A01960}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModpackUpdater.Manager", "ModpackUpdater.Manager\ModpackUpdater.Manager.csproj", "{D3A92EBD-FF6E-09D0-00A1-20221AAA198E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{743892CF-E482-4FBD-9BAB-02920C140F2B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{96B711FA-1AF2-469B-BC02-6D1E540E8E9D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModpackUpdater.Apps.Manager", "ModpackUpdater.Apps.Manager\ModpackUpdater.Apps.Manager.csproj", "{227A37AA-73F0-431D-B976-B9B3A8ADD8C2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,10 +33,20 @@ Global {D3A92EBD-FF6E-09D0-00A1-20221AAA198E}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3A92EBD-FF6E-09D0-00A1-20221AAA198E}.Release|Any CPU.ActiveCfg = Release|Any CPU {D3A92EBD-FF6E-09D0-00A1-20221AAA198E}.Release|Any CPU.Build.0 = Release|Any CPU + {227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {81F9A2F7-D36B-0F08-12D7-9EC2606C9080} = {743892CF-E482-4FBD-9BAB-02920C140F2B} + {0E6B6470-8C1D-0CDD-3681-461297A01960} = {96B711FA-1AF2-469B-BC02-6D1E540E8E9D} + {D3A92EBD-FF6E-09D0-00A1-20221AAA198E} = {96B711FA-1AF2-469B-BC02-6D1E540E8E9D} + {227A37AA-73F0-431D-B976-B9B3A8ADD8C2} = {743892CF-E482-4FBD-9BAB-02920C140F2B} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {322E6A6B-9F3E-4E88-8945-C98A9EF613BF} EndGlobalSection diff --git a/ModpackUpdater/FiledialogFilters.Designer.cs b/ModpackUpdater/FiledialogFilters.Designer.cs deleted file mode 100644 index b6de0b4..0000000 --- a/ModpackUpdater/FiledialogFilters.Designer.cs +++ /dev/null @@ -1,95 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. -// -// ------------------------------------------------------------------------------ - - -using System.Diagnostics; - -namespace ModpackUpdater.My.Resources -{ - - // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - [System.CodeDom.Compiler.GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal class FiledialogFilters - { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal FiledialogFilters() : base() - { - } - - /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager - { - get - { - if (ReferenceEquals(resourceMan, null)) - { - var temp = new System.Resources.ResourceManager("ModpackUpdater.FiledialogFilters", typeof(FiledialogFilters).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Json files (*.json) ähnelt. - /// - internal static string JSON_Display - { - get - { - return ResourceManager.GetString("JSON_Display", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die *.json ähnelt. - /// - internal static string JSON_Filter - { - get - { - return ResourceManager.GetString("JSON_Filter", resourceCulture); - } - } - } -} \ No newline at end of file diff --git a/ModpackUpdater.Model/InstallAction.cs b/ModpackUpdater/InstallAction.cs similarity index 95% rename from ModpackUpdater.Model/InstallAction.cs rename to ModpackUpdater/InstallAction.cs index ce06a6d..0282ad8 100644 --- a/ModpackUpdater.Model/InstallAction.cs +++ b/ModpackUpdater/InstallAction.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class InstallAction { diff --git a/ModpackUpdater.Model/InstallInfos.cs b/ModpackUpdater/InstallInfos.cs similarity index 91% rename from ModpackUpdater.Model/InstallInfos.cs rename to ModpackUpdater/InstallInfos.cs index 14d29f3..625920f 100644 --- a/ModpackUpdater.Model/InstallInfos.cs +++ b/ModpackUpdater/InstallInfos.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class InstallInfos { diff --git a/ModpackUpdater.Model/ModpackConfig.cs b/ModpackUpdater/ModpackConfig.cs similarity index 85% rename from ModpackUpdater.Model/ModpackConfig.cs rename to ModpackUpdater/ModpackConfig.cs index d7f0ee2..699e732 100644 --- a/ModpackUpdater.Model/ModpackConfig.cs +++ b/ModpackUpdater/ModpackConfig.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class ModpackConfig { @@ -16,7 +16,7 @@ public class ModpackConfig public static ModpackConfig LoadFromUrl(string url) { - string result = new HttpClient().GetStringAsync(url).Result; + var result = new HttpClient().GetStringAsync(url).Result; var config = JsonConvert.DeserializeObject(result); config.ConfigUrl = url; return config; diff --git a/ModpackUpdater.Model/ModpackInfo.cs b/ModpackUpdater/ModpackInfo.cs similarity index 97% rename from ModpackUpdater.Model/ModpackInfo.cs rename to ModpackUpdater/ModpackInfo.cs index 4dd660d..c177841 100644 --- a/ModpackUpdater.Model/ModpackInfo.cs +++ b/ModpackUpdater/ModpackInfo.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class ModpackInfo { diff --git a/ModpackUpdater/ModpackUpdater.csproj b/ModpackUpdater/ModpackUpdater.csproj index 2d45fc4..85db8e4 100644 --- a/ModpackUpdater/ModpackUpdater.csproj +++ b/ModpackUpdater/ModpackUpdater.csproj @@ -1,68 +1,12 @@  - Exe - net8.0-windows - true - icons8_download_from_ftp.ico - Minecraft Modpack Updater + net8.0 true - true - 1.5.2.2 - - - - - - - - - - True - True - FiledialogFilters.resx - - - True - True - LangRes.resx - - - - - - ResXFileCodeGenerator - ModpackUpdater.My.Resources - FiledialogFilters.Designer.cs - - - ResXFileCodeGenerator - ModpackUpdater.My.Resources - LangRes.Designer.cs - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ModpackUpdater.Model/Side.cs b/ModpackUpdater/Side.cs similarity index 85% rename from ModpackUpdater.Model/Side.cs rename to ModpackUpdater/Side.cs index 55cbd6b..a62ac70 100644 --- a/ModpackUpdater.Model/Side.cs +++ b/ModpackUpdater/Side.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; [JsonConverter(typeof(StringEnumConverter)), Flags] public enum Side diff --git a/ModpackUpdater.Model/SourceType.cs b/ModpackUpdater/SourceType.cs similarity index 61% rename from ModpackUpdater.Model/SourceType.cs rename to ModpackUpdater/SourceType.cs index 37d8398..5389b4f 100644 --- a/ModpackUpdater.Model/SourceType.cs +++ b/ModpackUpdater/SourceType.cs @@ -1,4 +1,4 @@ -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public enum SourceType { diff --git a/ModpackUpdater.Model/UpdateAction.cs b/ModpackUpdater/UpdateAction.cs similarity index 89% rename from ModpackUpdater.Model/UpdateAction.cs rename to ModpackUpdater/UpdateAction.cs index e1de794..ab3c958 100644 --- a/ModpackUpdater.Model/UpdateAction.cs +++ b/ModpackUpdater/UpdateAction.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class UpdateAction : InstallAction { diff --git a/ModpackUpdater.Model/UpdateActionType.cs b/ModpackUpdater/UpdateActionType.cs similarity index 71% rename from ModpackUpdater.Model/UpdateActionType.cs rename to ModpackUpdater/UpdateActionType.cs index 329030d..0a70581 100644 --- a/ModpackUpdater.Model/UpdateActionType.cs +++ b/ModpackUpdater/UpdateActionType.cs @@ -1,4 +1,4 @@ -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public enum UpdateActionType { diff --git a/ModpackUpdater.Model/UpdateInfo.cs b/ModpackUpdater/UpdateInfo.cs similarity index 88% rename from ModpackUpdater.Model/UpdateInfo.cs rename to ModpackUpdater/UpdateInfo.cs index 853b6ad..8c44f62 100644 --- a/ModpackUpdater.Model/UpdateInfo.cs +++ b/ModpackUpdater/UpdateInfo.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class UpdateInfo { diff --git a/ModpackUpdater.Model/UpdateInfos.cs b/ModpackUpdater/UpdateInfos.cs similarity index 88% rename from ModpackUpdater.Model/UpdateInfos.cs rename to ModpackUpdater/UpdateInfos.cs index b583bfb..6cea55f 100644 --- a/ModpackUpdater.Model/UpdateInfos.cs +++ b/ModpackUpdater/UpdateInfos.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace ModpackUpdater.Model; +namespace ModpackUpdater; public class UpdateInfos {