diff --git a/ModpackUpdater/MinecraftProfileChecker.vb b/ModpackUpdater.Manager/MinecraftProfileChecker.vb similarity index 100% rename from ModpackUpdater/MinecraftProfileChecker.vb rename to ModpackUpdater.Manager/MinecraftProfileChecker.vb diff --git a/ModpackUpdater.Manager/ModpackUpdater.Manager.vbproj b/ModpackUpdater.Manager/ModpackUpdater.Manager.vbproj new file mode 100644 index 0000000..a5b3134 --- /dev/null +++ b/ModpackUpdater.Manager/ModpackUpdater.Manager.vbproj @@ -0,0 +1,16 @@ + + + + ModpackUpdater.Manager + net8.0 + + + + + + + + + + + diff --git a/ModpackUpdater/UpdateCheckResult.vb b/ModpackUpdater.Manager/UpdateCheckResult.vb similarity index 90% rename from ModpackUpdater/UpdateCheckResult.vb rename to ModpackUpdater.Manager/UpdateCheckResult.vb index 562132a..d73f424 100644 --- a/ModpackUpdater/UpdateCheckResult.vb +++ b/ModpackUpdater.Manager/UpdateCheckResult.vb @@ -1,4 +1,6 @@ -Public Class UpdateCheckResult +Imports ModpackUpdater.Model + +Public Class UpdateCheckResult Public Property IsLegacy As Boolean Public ReadOnly Property SyncFiles As New List(Of UpdateSyncFile) diff --git a/ModpackUpdater/UpdateInstaller.vb b/ModpackUpdater.Manager/UpdateInstaller.vb similarity index 99% rename from ModpackUpdater/UpdateInstaller.vb rename to ModpackUpdater.Manager/UpdateInstaller.vb index 8a6e423..37f78f4 100644 --- a/ModpackUpdater/UpdateInstaller.vb +++ b/ModpackUpdater.Manager/UpdateInstaller.vb @@ -2,6 +2,8 @@ Imports System.IO Imports System.Net Imports System.Net.Http +Imports ModpackUpdater.Model + Imports WebDav Public Class UpdateInstaller diff --git a/ModpackUpdater/UpdateSyncAction.vb b/ModpackUpdater.Manager/UpdateSyncAction.vb similarity index 100% rename from ModpackUpdater/UpdateSyncAction.vb rename to ModpackUpdater.Manager/UpdateSyncAction.vb diff --git a/ModpackUpdater/UpdateSyncFile.vb b/ModpackUpdater.Manager/UpdateSyncFile.vb similarity index 100% rename from ModpackUpdater/UpdateSyncFile.vb rename to ModpackUpdater.Manager/UpdateSyncFile.vb diff --git a/ModpackUpdater/ModpackInfo.vb b/ModpackUpdater.Model/ModpackInfo.vb similarity index 100% rename from ModpackUpdater/ModpackInfo.vb rename to ModpackUpdater.Model/ModpackInfo.vb diff --git a/ModpackUpdater.Model/ModpackUpdater.Model.vbproj b/ModpackUpdater.Model/ModpackUpdater.Model.vbproj new file mode 100644 index 0000000..f65a20d --- /dev/null +++ b/ModpackUpdater.Model/ModpackUpdater.Model.vbproj @@ -0,0 +1,12 @@ + + + + ModpackUpdater.Model + net8.0 + + + + + + + diff --git a/ModpackUpdater/UpdateAction.vb b/ModpackUpdater.Model/UpdateAction.vb similarity index 100% rename from ModpackUpdater/UpdateAction.vb rename to ModpackUpdater.Model/UpdateAction.vb diff --git a/ModpackUpdater/UpdateActionType.vb b/ModpackUpdater.Model/UpdateActionType.vb similarity index 100% rename from ModpackUpdater/UpdateActionType.vb rename to ModpackUpdater.Model/UpdateActionType.vb diff --git a/ModpackUpdater/UpdateConfig.vb b/ModpackUpdater.Model/UpdateConfig.vb similarity index 100% rename from ModpackUpdater/UpdateConfig.vb rename to ModpackUpdater.Model/UpdateConfig.vb diff --git a/ModpackUpdater/UpdateInfo.vb b/ModpackUpdater.Model/UpdateInfo.vb similarity index 100% rename from ModpackUpdater/UpdateInfo.vb rename to ModpackUpdater.Model/UpdateInfo.vb diff --git a/ModpackUpdater/UpdateInfos.vb b/ModpackUpdater.Model/UpdateInfos.vb similarity index 100% rename from ModpackUpdater/UpdateInfos.vb rename to ModpackUpdater.Model/UpdateInfos.vb diff --git a/ModpackUpdater.sln b/ModpackUpdater.sln index 04c8f56..7290800 100644 --- a/ModpackUpdater.sln +++ b/ModpackUpdater.sln @@ -5,6 +5,10 @@ VisualStudioVersion = 17.2.32526.322 MinimumVisualStudioVersion = 10.0.40219.1 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ModpackUpdater", "ModpackUpdater\ModpackUpdater.vbproj", "{33DD239C-1F33-40F9-908F-54BC02FBA420}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ModpackUpdater.Model", "ModpackUpdater.Model\ModpackUpdater.Model.vbproj", "{BC4FE51B-4045-432C-B4D9-8C6CF5372DC0}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ModpackUpdater.Manager", "ModpackUpdater.Manager\ModpackUpdater.Manager.vbproj", "{618DAFD6-3336-4621-82F9-EA5C783D2D2E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +19,14 @@ Global {33DD239C-1F33-40F9-908F-54BC02FBA420}.Debug|Any CPU.Build.0 = Debug|Any CPU {33DD239C-1F33-40F9-908F-54BC02FBA420}.Release|Any CPU.ActiveCfg = Release|Any CPU {33DD239C-1F33-40F9-908F-54BC02FBA420}.Release|Any CPU.Build.0 = Release|Any CPU + {BC4FE51B-4045-432C-B4D9-8C6CF5372DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC4FE51B-4045-432C-B4D9-8C6CF5372DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC4FE51B-4045-432C-B4D9-8C6CF5372DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC4FE51B-4045-432C-B4D9-8C6CF5372DC0}.Release|Any CPU.Build.0 = Release|Any CPU + {618DAFD6-3336-4621-82F9-EA5C783D2D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {618DAFD6-3336-4621-82F9-EA5C783D2D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {618DAFD6-3336-4621-82F9-EA5C783D2D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {618DAFD6-3336-4621-82F9-EA5C783D2D2E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ModpackUpdater/Form1.vb b/ModpackUpdater/Form1.vb index 0c5082a..bcb2d5f 100644 --- a/ModpackUpdater/Form1.vb +++ b/ModpackUpdater/Form1.vb @@ -1,5 +1,9 @@ Imports System.IO +Imports ModpackUpdater.Manager + +Imports ModpackUpdater.Model + Imports ModpackUpdater.My.Resources Imports Telerik.WinControls diff --git a/ModpackUpdater/FormSettings.vb b/ModpackUpdater/FormSettings.vb index 7e99caf..e378b08 100644 --- a/ModpackUpdater/FormSettings.vb +++ b/ModpackUpdater/FormSettings.vb @@ -1,4 +1,5 @@ -Imports ModpackUpdater.My.Resources +Imports ModpackUpdater.Model +Imports ModpackUpdater.My.Resources Imports Telerik.WinControls.UI diff --git a/ModpackUpdater/ModpackUpdater.vbproj b/ModpackUpdater/ModpackUpdater.vbproj index 6f1cc17..0b3db54 100644 --- a/ModpackUpdater/ModpackUpdater.vbproj +++ b/ModpackUpdater/ModpackUpdater.vbproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + net8.0-windows Sub Main true WindowsForms @@ -72,21 +72,13 @@ + + + - - - ..\SharedLibs\Pilz.dll - - - ..\SharedLibs\Pilz.Cryptography.dll - - - ..\SharedLibs\Pilz.IO.dll - - - ..\SharedLibs\Pilz.Win32.dll - + + \ No newline at end of file diff --git a/SharedLibs/Pilz.Cryptography.dll b/SharedLibs/Pilz.Cryptography.dll deleted file mode 100644 index 90239e8..0000000 Binary files a/SharedLibs/Pilz.Cryptography.dll and /dev/null differ diff --git a/SharedLibs/Pilz.IO.dll b/SharedLibs/Pilz.IO.dll deleted file mode 100644 index 8853fba..0000000 Binary files a/SharedLibs/Pilz.IO.dll and /dev/null differ diff --git a/SharedLibs/Pilz.IO.xml b/SharedLibs/Pilz.IO.xml deleted file mode 100644 index 5847807..0000000 --- a/SharedLibs/Pilz.IO.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - Pilz.IO - - - - - Returns the names of all embedded files. - - - - - Embeds a file to this container. - - The name how it should be called in this container. - The file path to the file that should be embedded. - Returns a that defines if the file as been embedded successfully. - - - - Embeds a file to this container. - - The name how it should be called in this container. - The file path to the file that should be embedded. - Returns a that defines if the file as been embedded successfully. - - - - Removes a file from this container. - - The name how the file is called. - - - - Checks if the given file exists in this container. - - The name how the file is called. - Returns if the given file exists in this container. - - - - Gets a file from this container as stream. - - The name how the file is called. - Returns a stream of the file with the given name. - - - - Gets a file from this container as stream. - - The name how the file is called. - Returns a stream of the file with the given name. - - - - Saves a given file to the users temp directory. - - The name how the file is called. - Returns the file path to the temp file. - - - - Saves a given file to the users temp directory. - - The name how the file is called. - Returns the file path to the temp file. - - - - Defines the file path to the file that should be locked. - - - - - Defines the file path to the lock file that is used to identify the file lock. - - - - - Defines if the file is locked privatly by this instance. - - - - - Defines if the file is locked by an other instance/program/user. - - - - - Generate a new instance of and locks the given file automatically. - - The file path to the file that should be locked. - - - - Generate a new instance of - - The file path to the file that should be locked. - Defines if the file should be locked automatically right after creating this instance. - - - - Locks the file, if not already locked privatly. - - - - - Unlocks the file, if locked privatly. - - - - - stellt den Erben "Server" und "Client" 2 verschiedene - Message-Events zur Verfügung, und ein Event-Raisendes Dispose - - - - - Zur Ausgabe chat-verwaltungstechnischer Status-Informationen - - - - Zur Ausgabe von Chat-Messages - - - - Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - - - - - Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - - - - - Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - - - - diff --git a/SharedLibs/Pilz.Win32.dll b/SharedLibs/Pilz.Win32.dll deleted file mode 100644 index f0eef7f..0000000 Binary files a/SharedLibs/Pilz.Win32.dll and /dev/null differ diff --git a/SharedLibs/Pilz.Win32.xml b/SharedLibs/Pilz.Win32.xml deleted file mode 100644 index 58bdcee..0000000 --- a/SharedLibs/Pilz.Win32.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - -Pilz.Win32 - - - - - - Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - - - - - Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - - - - - Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - - - - - Extrahiert das Icon aus einer Datei oder aus einem Ordner. - - Hier übergeben Sie den Pfad der Datei von dem das Icon extrahiert werden soll. - Bei übergabe von true wird ein kleines und bei false ein großes Icon zurück gegeben. - - - - Get the number of icons in the specified file. - - Full path of the file to look for. - - - - - Parse strings in registry who contains the name of the icon and - the index of the icon an return both parts. - - The full string in the form "path,index" as found in registry. - The "path" part of the string. - The "index" part of the string. - - - - Two constants extracted from the FileInfoFlags, the only that are - meaningfull for the user of this class. - - - - - Retrieve the handle to the icon that represents the file and the index - of the icon within the system image list. The handle is copied to the - hIcon member of the structure specified by psfi, and the index is copied - to the iIcon member. - - - - - Indicates that the function should not attempt to access the file - specified by pszPath. Rather, it should act as if the file specified by - pszPath exists with the file attributes passed in dwFileAttributes. - - - - - Contains information about a file object. - - - - - Handle to the icon that represents the file. You are responsible for - destroying this handle with DestroyIcon when you no longer need it. - - - - - Index of the icon image within the system image list. - - - - - Array of values that indicates the attributes of the file object. - For information about these values, see the IShellFolder::GetAttributesOf - method. - - - - - String that contains the name of the file as it appears in the Microsoft - Windows Shell, or the path and file name of the file that contains the - icon representing the file. - - - - - String that describes the type of file. - - - - diff --git a/SharedLibs/Pilz.dll b/SharedLibs/Pilz.dll deleted file mode 100644 index a68942d..0000000 Binary files a/SharedLibs/Pilz.dll and /dev/null differ diff --git a/SharedLibs/Pilz.xml b/SharedLibs/Pilz.xml deleted file mode 100644 index f944155..0000000 --- a/SharedLibs/Pilz.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - -Pilz - - - - - - Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - - - - - Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - - - - - Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - - - -