re-organze namespace

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
 {

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<AppSymbols>
 {

ModpackUpdater.Apps.Client/AppSymbols.cs

@@ -1,4 +1,4 @@
-namespace ModpackUpdater;
+namespace ModpackUpdater.Apps.Client;
 
 public enum AppSymbols
 {

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<UpdateInfo>(result);
 
             if (info is not null && info.Version > appVersion)

ModpackUpdater.Apps.Client/FiledialogFilters.Designer.cs

@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ModpackUpdater.My.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // 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() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [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;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Json files (*.json) ähnelt.
+        /// </summary>
+        internal static string JSON_Display {
+            get {
+                return ResourceManager.GetString("JSON_Display", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die *.json ähnelt.
+        /// </summary>
+        internal static string JSON_Filter {
+            get {
+                return ResourceManager.GetString("JSON_Filter", resourceCulture);
+            }
+        }
+    }
+}

ModpackUpdater.Apps.Client/Form1.cs

@@ -1,5 +1,5 @@
-using ModpackUpdater.Manager;
+using ModpackUpdater.Apps.Client;
-using ModpackUpdater.Model;
+using ModpackUpdater.Manager;
 using ModpackUpdater.My.Resources;
 using Pilz.UI.Symbols;
 using Pilz.UI.Telerik;

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;

ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj

@@ -0,0 +1,68 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationIcon>icons8_download_from_ftp.ico</ApplicationIcon>
+    <AssemblyName>Minecraft Modpack Updater</AssemblyName>
+    <ImplicitUsings>true</ImplicitUsings>
+    <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
+    <Version>1.5.2.2</Version>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <None Remove="CustomThemes\Office2019DarkBluePurple.tssp" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <EmbeddedResource Include="CustomThemes\Office2019DarkBluePurple.tssp" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Update="FiledialogFilters.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>FiledialogFilters.resx</DependentUpon>
+    </Compile>
+    <Compile Update="LangRes.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>LangRes.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <EmbeddedResource Update="FiledialogFilters.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <CustomToolNamespace>ModpackUpdater.My.Resources</CustomToolNamespace>
+      <LastGenOutput>FiledialogFilters.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="LangRes.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <CustomToolNamespace>ModpackUpdater.My.Resources</CustomToolNamespace>
+      <LastGenOutput>LangRes.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Pilz.Configuration" Version="3.1.3" />
+    <PackageReference Include="Pilz.Cryptography" Version="2.1.1" />
+    <PackageReference Include="Pilz.IO" Version="2.1.0" />
+    <PackageReference Include="Pilz.UI.Telerik" Version="2.7.2" />
+    <PackageReference Include="Pilz.Win32" Version="2.1.0" />
+    <PackageReference Include="UI.for.WinForms.Common" Version="2024.3.806" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\ModpackUpdater.Manager\ModpackUpdater.Manager.csproj" />
+    <ProjectReference Include="..\ModpackUpdater\ModpackUpdater.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Symbols\*.svg" />
+  </ItemGroup>
+  
+</Project>

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
 {

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)
@@ -76,11 +75,8 @@ public static class Program
         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();

ModpackUpdater.Apps.Client/UpdateCheckOptionsAdv.cs

@@ -1,6 +1,6 @@
 using ModpackUpdater.Manager;
 
-namespace ModpackUpdater;
+namespace ModpackUpdater.Apps.Client;
 
 public class UpdateCheckOptionsAdv : UpdateCheckOptions
 {

ModpackUpdater.Apps.Manager/Form1.Designer.cs

@@ -0,0 +1,38 @@
+namespace ModpackUpdater.Apps.Manager;
+
+partial class Form1
+{
+    /// <summary>
+    ///  Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary>
+    ///  Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing && (components != null))
+        {
+            components.Dispose();
+        }
+        base.Dispose(disposing);
+    }
+
+    #region Windows Form Designer generated code
+
+    /// <summary>
+    ///  Required method for Designer support - do not modify
+    ///  the contents of this method with the code editor.
+    /// </summary>
+    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
+}

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();
+    }
+}

ModpackUpdater.Apps.Manager/Form1.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="UI.for.WinForms.Common" Version="2024.3.806" />
+  </ItemGroup>
+
+</Project>

ModpackUpdater.Apps.Manager/Program.cs

@@ -0,0 +1,16 @@
+namespace ModpackUpdater.Apps.Manager;
+
+internal static class Program
+{
+    /// <summary>
+    ///  The main entry point for the application.
+    /// </summary>
+    [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());
+    }
+}

ModpackUpdater.Manager/Extensions.cs

@@ -1,6 +1,4 @@
-using ModpackUpdater.Model;
+namespace ModpackUpdater.Manager;
-
-namespace ModpackUpdater.Manager;
 
 public static class Extensions
 {

ModpackUpdater.Manager/ModpackFeatures.cs

@@ -1,5 +1,4 @@
-using ModpackUpdater.Model;
+using Unleash;
-using Unleash;
 using Unleash.ClientFactory;
 
 namespace ModpackUpdater;

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;

ModpackUpdater.Manager/ModpackUpdater.Manager.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\ModpackUpdater.Model\ModpackUpdater.Model.csproj" />
+    <ProjectReference Include="..\ModpackUpdater\ModpackUpdater.csproj" />
   </ItemGroup>
   
 </Project>

ModpackUpdater.Manager/UpdateCheckOptions.cs

@@ -1,6 +1,4 @@
-using ModpackUpdater.Model;
+namespace ModpackUpdater.Manager;
-
-namespace ModpackUpdater.Manager;
 
 public class UpdateCheckOptions
 {

ModpackUpdater.Manager/UpdateCheckResult.cs

@@ -1,6 +1,4 @@
-using ModpackUpdater.Model;
+namespace ModpackUpdater.Manager;
-
-namespace ModpackUpdater.Manager;
 
 public class UpdateCheckResult
 {

ModpackUpdater.Model/ModpackUpdater.Model.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>true</ImplicitUsings>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Pilz.Cryptography" Version="2.1.1" />
-  </ItemGroup>
-
-</Project>

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

ModpackUpdater/FiledialogFilters.Designer.cs

@@ -1,95 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-// 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.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-
-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.
-    /// <summary>
-    /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    /// </summary>
-    [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()
-        {
-        }
-
-        /// <summary>
-        /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-        /// </summary>
-        [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;
-            }
-        }
-
-        /// <summary>
-        /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        /// </summary>
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Globalization.CultureInfo Culture
-        {
-            get
-            {
-                return resourceCulture;
-            }
-            set
-            {
-                resourceCulture = value;
-            }
-        }
-
-        /// <summary>
-        /// Sucht eine lokalisierte Zeichenfolge, die Json files (*.json) ähnelt.
-        /// </summary>
-        internal static string JSON_Display
-        {
-            get
-            {
-                return ResourceManager.GetString("JSON_Display", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        /// Sucht eine lokalisierte Zeichenfolge, die *.json ähnelt.
-        /// </summary>
-        internal static string JSON_Filter
-        {
-            get
-            {
-                return ResourceManager.GetString("JSON_Filter", resourceCulture);
-            }
-        }
-    }
-}

ModpackUpdater/InstallAction.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public class InstallAction
 {

ModpackUpdater/InstallInfos.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public class InstallInfos
 {

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<ModpackConfig>(result);
         config.ConfigUrl = url;
         return config;

ModpackUpdater/ModpackInfo.cs

@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public class ModpackInfo
 {

ModpackUpdater/ModpackUpdater.csproj

@@ -1,68 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationIcon>icons8_download_from_ftp.ico</ApplicationIcon>
-    <AssemblyName>Minecraft Modpack Updater</AssemblyName>
     <ImplicitUsings>true</ImplicitUsings>
-    <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
-    <Version>1.5.2.2</Version>
   </PropertyGroup>
   
   <ItemGroup>
-    <None Remove="CustomThemes\Office2019DarkBluePurple.tssp" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <EmbeddedResource Include="CustomThemes\Office2019DarkBluePurple.tssp" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Compile Update="FiledialogFilters.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>FiledialogFilters.resx</DependentUpon>
-    </Compile>
-    <Compile Update="LangRes.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>LangRes.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <EmbeddedResource Update="FiledialogFilters.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <CustomToolNamespace>ModpackUpdater.My.Resources</CustomToolNamespace>
-      <LastGenOutput>FiledialogFilters.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="LangRes.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <CustomToolNamespace>ModpackUpdater.My.Resources</CustomToolNamespace>
-      <LastGenOutput>LangRes.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Pilz.Configuration" Version="3.1.3" />
     <PackageReference Include="Pilz.Cryptography" Version="2.1.1" />
-    <PackageReference Include="Pilz.IO" Version="2.1.0" />
-    <PackageReference Include="Pilz.UI.Telerik" Version="2.7.2" />
-    <PackageReference Include="Pilz.Win32" Version="2.1.0" />
-    <PackageReference Include="UI.for.WinForms.Common" Version="2024.3.806" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\ModpackUpdater.Manager\ModpackUpdater.Manager.csproj" />
-    <ProjectReference Include="..\ModpackUpdater.Model\ModpackUpdater.Model.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Symbols\*.svg" />
   </ItemGroup>
 
 </Project>

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

ModpackUpdater/SourceType.cs

@@ -1,4 +1,4 @@
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public enum SourceType
 {

ModpackUpdater/UpdateAction.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public class UpdateAction : InstallAction
 {

ModpackUpdater/UpdateActionType.cs

@@ -1,4 +1,4 @@
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public enum UpdateActionType
 {

ModpackUpdater/UpdateInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public class UpdateInfo
 {

ModpackUpdater/UpdateInfos.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace ModpackUpdater.Model;
+namespace ModpackUpdater;
 
 public class UpdateInfos
 {