update structure

ModpackUpdater.Manager/ModpackUpdater.Manager.vbproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>ModpackUpdater.Manager</RootNamespace>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WebDav.Client" Version="2.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ModpackUpdater.Model\ModpackUpdater.Model.vbproj" />
+  </ItemGroup>
+
+</Project>

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)

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

ModpackUpdater.Model/ModpackUpdater.Model.vbproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>ModpackUpdater.Model</RootNamespace>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Pilz.Cryptography" Version="2.0.1" />
+  </ItemGroup>
+
+</Project>

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

ModpackUpdater/Form1.vb

@@ -1,5 +1,9 @@
 Imports System.IO
 
+Imports ModpackUpdater.Manager
+
+Imports ModpackUpdater.Model
+
 Imports ModpackUpdater.My.Resources
 
 Imports Telerik.WinControls

ModpackUpdater/FormSettings.vb

@@ -1,4 +1,5 @@
-Imports ModpackUpdater.My.Resources
+Imports ModpackUpdater.Model
+Imports ModpackUpdater.My.Resources
 
 Imports Telerik.WinControls.UI
 

ModpackUpdater/ModpackUpdater.vbproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <StartupObject>Sub Main</StartupObject>
     <UseWindowsForms>true</UseWindowsForms>
     <MyType>WindowsForms</MyType>
@@ -72,21 +72,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Pilz.Cryptography" Version="2.0.1" />
+    <PackageReference Include="Pilz.IO" Version="2.0.0" />
+    <PackageReference Include="Pilz.Win32" Version="2.0.0" />
     <PackageReference Include="UI.for.WinForms.Common" Version="2023.1.117" />
-    <PackageReference Include="WebDav.Client" Version="2.8.0" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Pilz">
+    <ProjectReference Include="..\ModpackUpdater.Manager\ModpackUpdater.Manager.vbproj" />
-      <HintPath>..\SharedLibs\Pilz.dll</HintPath>
+    <ProjectReference Include="..\ModpackUpdater.Model\ModpackUpdater.Model.vbproj" />
-    </Reference>
-    <Reference Include="Pilz.Cryptography">
-      <HintPath>..\SharedLibs\Pilz.Cryptography.dll</HintPath>
-    </Reference>
-    <Reference Include="Pilz.IO">
-      <HintPath>..\SharedLibs\Pilz.IO.dll</HintPath>
-    </Reference>
-    <Reference Include="Pilz.Win32">
-      <HintPath>..\SharedLibs\Pilz.Win32.dll</HintPath>
-    </Reference>
   </ItemGroup>
 </Project>

SharedLibs/Pilz.IO.xml

@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Pilz.IO</name>
-    </assembly>
-    <members>
-        <member name="P:Pilz.IO.EmbeddedFilesContainer.AllFileNames">
-            <summary>
-            Returns the names of all embedded files.
-            </summary>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.AddFileAsync(System.String,System.String)">
-            <summary>
-            Embeds a file to this container.
-            </summary>
-            <param name="fileName">The name how it should be called in this container.</param>
-            <param name="filePath">The file path to the file that should be embedded.</param>
-            <returns>Returns a <see cref="T:System.Boolean"/> that defines if the file as been embedded successfully.</returns>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.AddFile(System.String,System.String)">
-            <summary>
-            Embeds a file to this container.
-            </summary>
-            <param name="fileName">The name how it should be called in this container.</param>
-            <param name="filePath">The file path to the file that should be embedded.</param>
-            <returns>Returns a <see cref="T:System.Boolean"/> that defines if the file as been embedded successfully.</returns>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.RemoveFile(System.String)">
-            <summary>
-            Removes a file from this container.
-            </summary>
-            <param name="fileName">The name how the file is called.</param>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.HasFile(System.String)">
-            <summary>
-            Checks if the given file exists in this container.
-            </summary>
-            <param name="fileName">The name how the file is called.</param>
-            <returns>Returns if the given file exists in this container.</returns>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.GetStreamAsync(System.String)">
-            <summary>
-            Gets a file from this container as stream.
-            </summary>
-            <param name="fileName">The name how the file is called.</param>
-            <returns>Returns a stream of the file with the given name.</returns>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.GetStream(System.String)">
-            <summary>
-            Gets a file from this container as stream.
-            </summary>
-            <param name="fileName">The name how the file is called.</param>
-            <returns>Returns a stream of the file with the given name.</returns>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.GetLocalFilePathAsync(System.String)">
-            <summary>
-            Saves a given file to the users temp directory.
-            </summary>
-            <param name="fileName">The name how the file is called.</param>
-            <returns>Returns the file path to the temp file.</returns>
-        </member>
-        <member name="M:Pilz.IO.EmbeddedFilesContainer.GetLocalFilePath(System.String)">
-            <summary>
-            Saves a given file to the users temp directory.
-            </summary>
-            <param name="fileName">The name how the file is called.</param>
-            <returns>Returns the file path to the temp file.</returns>
-        </member>
-        <member name="P:Pilz.IO.FileLocker.FilePath">
-            <summary>
-            Defines the file path to the file that should be locked.
-            </summary>
-        </member>
-        <member name="P:Pilz.IO.FileLocker.LockFile">
-            <summary>
-            Defines the file path to the lock file that is used to identify the file lock.
-            </summary>
-        </member>
-        <member name="P:Pilz.IO.FileLocker.LockedPrivate">
-            <summary>
-            Defines if the file is locked privatly by this instance.
-            </summary>
-        </member>
-        <member name="P:Pilz.IO.FileLocker.LockedExternal">
-            <summary>
-            Defines if the file is locked by an other instance/program/user.
-            </summary>
-        </member>
-        <member name="M:Pilz.IO.FileLocker.#ctor(System.String)">
-            <summary>
-            Generate a new instance of <see cref="T:Pilz.IO.FileLocker"/> and locks the given file automatically.
-            </summary>
-            <param name="filePath">The file path to the file that should be locked.</param>
-        </member>
-        <member name="M:Pilz.IO.FileLocker.#ctor(System.String,System.Boolean)">
-            <summary>
-            Generate a new instance of <see cref="T:Pilz.IO.FileLocker"/>
-            </summary>
-            <param name="filePath">The file path to the file that should be locked.</param>
-            <param name="autoLock">Defines if the file should be locked automatically right after creating this instance.</param>
-        </member>
-        <member name="M:Pilz.IO.FileLocker.Lock">
-            <summary>
-            Locks the file, if not already locked privatly.
-            </summary>
-        </member>
-        <member name="M:Pilz.IO.FileLocker.Unlock">
-            <summary>
-            Unlocks the file, if locked privatly.
-            </summary>
-        </member>
-        <member name="T:Pilz.IO.ManagedPipe">
-            <summary>
-            stellt den Erben "Server" und "Client" 2 verschiedene
-            Message-Events zur Verfügung, und ein Event-Raisendes Dispose
-            </summary>
-        </member>
-        <member name="E:Pilz.IO.ManagedPipe.StatusMessage">
-            <summary>
-            Zur Ausgabe chat-verwaltungstechnischer Status-Informationen
-            </summary>
-        </member>
-        <member name="E:Pilz.IO.ManagedPipe.RetriveData">
-            <summary>Zur Ausgabe von Chat-Messages</summary>
-        </member>
-        <member name="T:Pilz.IO.My.Resources.Resources">
-            <summary>
-              Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-            </summary>
-        </member>
-        <member name="P:Pilz.IO.My.Resources.Resources.ResourceManager">
-            <summary>
-              Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-            </summary>
-        </member>
-        <member name="P:Pilz.IO.My.Resources.Resources.Culture">
-            <summary>
-              Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-              Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-            </summary>
-        </member>
-    </members>
-</doc>

SharedLibs/Pilz.Win32.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-<assembly>
-<name>
-Pilz.Win32
-</name>
-</assembly>
-<members>
-<member name="T:Pilz.Win32.My.Resources.Resources">
-<summary>
-  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-</summary>
-</member>
-<member name="P:Pilz.Win32.My.Resources.Resources.ResourceManager">
-<summary>
-  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-</summary>
-</member>
-<member name="P:Pilz.Win32.My.Resources.Resources.Culture">
-<summary>
-  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-</summary>
-</member>
-<member name="M:Pilz.Win32.Internals.IconExtractor.ExtractIcon(System.String,Pilz.Win32.Mapped.SystemIconSize)">
- <summary>
- Extrahiert das Icon aus einer Datei oder aus einem Ordner.
- </summary>
- <param name="FilePath">Hier übergeben Sie den Pfad der Datei von dem das Icon extrahiert werden soll.</param>
- <param name="size">Bei übergabe von true wird ein kleines und bei false ein großes Icon zurück gegeben.</param>
-</member>
-<member name="M:Pilz.Win32.Internals.IconFactory.GetIconsCountInFile(System.String)">
- <summary>
- Get the number of icons in the specified file.
- </summary>
- <param name="fileName">Full path of the file to look for.</param>
- <returns></returns>
-</member>
-<member name="M:Pilz.Win32.Internals.IconFactory.ExtractInformationsFromRegistryString(System.String,System.String@,System.Int32@)">
- <summary>
- Parse strings in registry who contains the name of the icon and
- the index of the icon an return both parts.
- </summary>
- <param name="regString">The full string in the form "path,index" as found in registry.</param>
- <param name="fileName">The "path" part of the string.</param>
- <param name="index">The "index" part of the string.</param>
-</member>
-<member name="T:Pilz.Win32.Mapped.SystemIconSize">
- <summary>
- Two constants extracted from the FileInfoFlags, the only that are
- meaningfull for the user of this class.
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.FileInfoFlags.SHGFI_ICON">
- <summary>
- 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.
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.FileInfoFlags.SHGFI_USEFILEATTRIBUTES">
- <summary>
- 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.
- </summary>
-</member>
-<member name="T:Pilz.Win32.Native.SHFILEINFO">
- <summary>
- Contains information about a file object. 
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.SHFILEINFO.hIcon">
- <summary>
- Handle to the icon that represents the file. You are responsible for
- destroying this handle with DestroyIcon when you no longer need it. 
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.SHFILEINFO.iIcon">
- <summary>
- Index of the icon image within the system image list.
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.SHFILEINFO.dwAttributes">
- <summary>
- Array of values that indicates the attributes of the file object.
- For information about these values, see the IShellFolder::GetAttributesOf
- method.
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.SHFILEINFO.szDisplayName">
- <summary>
- 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.
- </summary>
-</member>
-<member name="F:Pilz.Win32.Native.SHFILEINFO.szTypeName">
- <summary>
- String that describes the type of file.
- </summary>
-</member>
-</members>
-</doc>

SharedLibs/Pilz.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-<assembly>
-<name>
-Pilz
-</name>
-</assembly>
-<members>
-<member name="T:Pilz.My.Resources.Resources">
-<summary>
-  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-</summary>
-</member>
-<member name="P:Pilz.My.Resources.Resources.ResourceManager">
-<summary>
-  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-</summary>
-</member>
-<member name="P:Pilz.My.Resources.Resources.Culture">
-<summary>
-  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-</summary>
-</member>
-</members>
-</doc>