code optimization

Pilz.Collections/SimpleHistory/ObjectAction.vb

@@ -1,5 +1,4 @@
 Imports System.Reflection
-Imports System.Runtime.InteropServices
 
 Namespace SimpleHistory
 

Pilz.Collections/SimpleHistory/SimpleHistory.vb

@@ -1,6 +1,4 @@
-Imports System.Reflection
-
-Namespace SimpleHistory
+Namespace SimpleHistory
 
     Public Class HistoryStack
 

Pilz.Configuration/AutoSaveConfigurationManager.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public class AutoSaveConfigurationManager : ConfigurationManager
 {
     private bool addedHandler = false;
@@ -84,4 +84,3 @@ namespace Pilz.Configuration
         RemoveAutoSaveHandler();
     }
 }
-}

Pilz.Configuration/ConfigurationManager.cs

@@ -1,5 +1,5 @@
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public abstract class ConfigurationManager
 {
     public SimpleConfiguration Configuration { get; private set; }
@@ -9,4 +9,3 @@
         Configuration = configuration;
     }
 }
-}

Pilz.Configuration/ConfigurationManagerList.cs

@@ -1,9 +1,9 @@
-using System.Collections;
+using Pilz.GeneralEventArgs;
+using System.Collections;
 using System.Collections.Generic;
-using Pilz.GeneralEventArgs;
 
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public class ConfigurationManagerList : IList<ConfigurationManager>
 {
     public event GettingParentManagerEventHandler GettingParentManager;
@@ -85,4 +85,3 @@ namespace Pilz.Configuration
 
     IEnumerator IEnumerable.GetEnumerator() => IEnumerable_GetEnumerator();
 }
-}

Pilz.Configuration/ConfigurationSerializer.cs

@@ -1,9 +1,9 @@
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Pilz.GeneralEventArgs;
+using System.IO;
+
+namespace Pilz.Configuration;
 
-namespace Pilz.Configuration
-{
 public static class ConfigurationSerializer
 {
     public static event GettingJsonSerializerEventHandler GettingJsonSerializer;
@@ -136,4 +136,3 @@ namespace Pilz.Configuration
         return content;
     }
 }
-}

Pilz.Configuration/IChildSettings.cs

@@ -1,7 +1,6 @@
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public interface IChildSettings
 {
     void Reset();
 }
-}

Pilz.Configuration/ISettings.cs

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public interface ISettings
 {
     IReadOnlyCollection<IChildSettings> Childs { get; }
     T Get<T>() where T : IChildSettings, ISettingsIdentifier;
     void Reset();
 }
-}

Pilz.Configuration/ISettingsIdentifier.cs

@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Configuration;
 
-namespace Pilz.Configuration
-{
 public interface ISettingsIdentifier
 {
     static abstract string Identifier { get; }
 }
-}

Pilz.Configuration/ISettingsManager.cs

@@ -1,6 +1,6 @@
 
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public interface ISettingsManager
 {
     ISettings Instance { get; }
@@ -8,4 +8,3 @@ namespace Pilz.Configuration
     void Load();
     void Reset();
 }
-}

Pilz.Configuration/Settings.cs

@@ -1,10 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
 
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public class Settings : ISettings
 {
     [JsonProperty(nameof(Settings))]
@@ -34,4 +33,3 @@ namespace Pilz.Configuration
             s.Reset();
     }
 }
-}

Pilz.Configuration/SettingsManager.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System;
 using System.IO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
 
-namespace Pilz.Configuration
-{
+namespace Pilz.Configuration;
+
 public class SettingsManager : ISettingsManager
 {
     public event EventHandler AutoSavingSettings;
@@ -139,4 +137,3 @@ namespace Pilz.Configuration
             e.ErrorContext.Handled = true;
     }
 }
-}

Pilz.Configuration/SimpleConfiguration.cs

@@ -1,9 +1,9 @@
-using System.IO;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Pilz.GeneralEventArgs;
+using System.IO;
+
+namespace Pilz.Configuration;
 
-namespace Pilz.Configuration
-{
 public class SimpleConfiguration
 {
     [JsonIgnore]
@@ -107,4 +107,3 @@ namespace Pilz.Configuration
         ConfigurationSerializer.ReadFromFile(this, filePath);
     }
 }
-}

Pilz.Cryptography/Helpers.cs

@@ -1,15 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Management;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Cryptography
-{
+namespace Pilz.Cryptography;
+
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class Helpers
 {
@@ -52,4 +49,3 @@ namespace Pilz.Cryptography
         return hash;
     }
 }
-}

Pilz.Cryptography/ICrypter.cs

@@ -1,14 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Cryptography;
 
-namespace Pilz.Cryptography
-{
 public interface ICrypter
 {
     string Encrypt(string plainValue);
     string Decrypt(string encryptedValue);
 }
-}

Pilz.Cryptography/IUniquieID.cs

@@ -1,10 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace Pilz.Cryptography
-{
+namespace Pilz.Cryptography;
+
 [JsonConverter(typeof(Json.Converters.UniquieIDStringJsonConverter))]
 public interface IUniquieID
 {
@@ -15,4 +12,3 @@ namespace Pilz.Cryptography
     void Generate();
     bool Equals(object obj);
 }
-}

Pilz.Cryptography/IUniquieIDHost.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace Pilz.Cryptography;
 
-namespace Pilz.Cryptography
-{
 /// <summary>
 /// Can be implemented on objects that provides an UniquieID.
 /// </summary>
@@ -11,4 +7,3 @@ namespace Pilz.Cryptography
 {
     UniquieID ID { get; }
 }
-}

Pilz.Cryptography/Json.Converters/UniquieIDStringJsonConverter.cs

@@ -1,11 +1,9 @@
 using Newtonsoft.Json;
 using Pilz.Cryptography;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace Pilz.Json.Converters
-{
+namespace Pilz.Json.Converters;
+
 public class UniquieIDStringJsonConverter : JsonConverter
 {
     public static bool EnableCheckForDepricatedTypes { get; set; } = true;
@@ -35,4 +33,3 @@ namespace Pilz.Json.Converters
         serializer.Serialize(writer, ((UniquieID)value).ID);
     }
 }
-}

Pilz.Cryptography/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
 // für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von

Pilz.Cryptography/SecureString.cs

@@ -1,12 +1,8 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Cryptography
-{
+namespace Pilz.Cryptography;
+
 [JsonConverter(typeof(Json.Converters.SecureStringJsonConverter))]
 public class SecureString
 {
@@ -75,4 +71,3 @@ namespace Pilz.Cryptography
     public static bool operator ==(SecureString left, SecureString right) => left?.EncryptedValue == right?.EncryptedValue;
     public static bool operator !=(SecureString left, SecureString right) => left?.EncryptedValue != right?.EncryptedValue;
 }
-}

Pilz.Cryptography/SecureStringJsonConverter.cs

@@ -1,15 +1,9 @@
 using Newtonsoft.Json;
 using Pilz.Cryptography;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Json.Converters
-{
+namespace Pilz.Json.Converters;
+
 public class SecureStringJsonConverter : JsonConverter
 {
     public override bool CanConvert(Type objectType)
@@ -38,4 +32,3 @@ namespace Pilz.Json.Converters
         serializer.Serialize(writer, ((SecureString)value).EncryptedValue);
     }
 }
-}

Pilz.Cryptography/SimpleStringCrypter.cs

@@ -1,13 +1,25 @@
 using System;
-using System.Collections.Generic;
+using System.IO;
+
+/* Nicht gemergte Änderung aus Projekt "Pilz.Cryptography (net6.0)"
+Vor:
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Security.Cryptography;
 using System.IO;
+Nach:
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+*/
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Pilz.Cryptography;
 
-namespace Pilz.Cryptography
-{
 public class SimpleStringCrypter : ICrypter
 {
     private readonly TripleDES TripleDes;
@@ -77,4 +89,3 @@ namespace Pilz.Cryptography
             return DecryptData(encryptedValue);
     }
 }
-}

Pilz.Cryptography/UniquieID.cs

@@ -1,13 +1,9 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Management;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Text;
 
-namespace Pilz.Cryptography
-{
+namespace Pilz.Cryptography;
+
 [JsonConverter(typeof(Json.Converters.UniquieIDStringJsonConverter))]
 public class UniquieID : IUniquieID
 {
@@ -132,4 +128,3 @@ namespace Pilz.Cryptography
     public static bool operator ==(UniquieID left, UniquieID right) => left.ID.Equals(right.ID);
     public static bool operator !=(UniquieID left, UniquieID right) => !left.ID.Equals(right.ID);
 }
-}

Pilz.Cryptography/UniquieIDGenerationMode.cs

@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace Pilz.Cryptography;
 
-namespace Pilz.Cryptography
-{
 public enum UniquieIDGenerationMode
 {
     None,
     GenerateOnGet,
     GenerateOnInit
 }
-}

Pilz.Drawing.Drawing3D.OpenGLRenderer/Camera/Camera.vb

@@ -1,6 +1,5 @@
 Imports System.Windows.Forms
 
-Imports OpenTK
 Imports OpenTK.Mathematics
 
 Namespace CameraN

Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb

@@ -1,16 +1,32 @@
 Imports System.Drawing
+
+' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)" 
+' Vor:
+' Imports System.Windows.Forms
+' Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN
+' Nach:
+' Imports System.Windows.Forms
+' 
+' Imports OpenTK
+' Imports OpenTK.Graphics.OpenGL
+' Imports OpenTK.Mathematics
+' Imports OpenTK.WinForms
+' 
+' Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN
 Imports System.Windows.Forms
-Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN
-Imports Pilz.Drawing.Drawing3D.OpenGLFactory.RenderingN
-Imports OpenTK
+
 Imports OpenTK.Graphics.OpenGL
-Imports Pilz.S3DFileParser
-Imports Point = System.Drawing.Point
-Imports Color = System.Drawing.Color
 Imports OpenTK.Mathematics
 Imports OpenTK.WinForms
+
+Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN
+Imports Pilz.Drawing.Drawing3D.OpenGLFactory.RenderingN
+Imports Pilz.S3DFileParser
 Imports Pilz.Win32.Mapped
 
+Imports Color = System.Drawing.Color
+Imports Point = System.Drawing.Point
+
 Namespace PreviewN
 
     Public Class ModelPreview

Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/BoundingBox.vb

@@ -1,5 +1,14 @@
-Imports System.Drawing
-Imports OpenTK
+
+' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)" 
+' Vor:
+' Imports System.Drawing
+' Imports OpenTK
+' Nach:
+' Imports System.Drawing
+' 
+' Imports OpenTK
+Imports System.Drawing
+
 Imports OpenTK.Graphics.OpenGL
 
 Namespace RenderingN

Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb

@@ -1,8 +1,18 @@
-Imports System
-Imports OpenTK
-Imports OpenTK.Graphics.OpenGL
-Imports System.Drawing
+' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)" 
+' Vor:
+' Imports OpenTK
+' Imports OpenTK.Graphics.OpenGL
+' Imports System.Drawing
+' Nach:
+' Imports System.Drawing
+' Imports System.Drawing.Imaging
+' 
+' Imports OpenTK
+.Drawing
 Imports System.Drawing.Imaging
+
+Imports OpenTK.Graphics.OpenGL
+
 Imports Bitmap = System.Drawing.Bitmap
 
 Namespace RenderingN

Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/Renderer.vb

@@ -1,9 +1,4 @@
-Imports System.Drawing
-Imports System.Threading
-Imports System.Windows.Forms
-
-Imports OpenTK
-Imports OpenTK.Graphics.OpenGL
+Imports OpenTK.Graphics.OpenGL
 Imports OpenTK.Mathematics
 
 Imports Pilz.S3DFileParser

Pilz.Drawing/HelpfulDrawingFunctions.vb

@@ -1,5 +1,4 @@
 Imports System.Drawing
-Imports System.Drawing.Drawing2D
 
 Public Module HelpfulDrawingFunctions
 

Pilz.Gaming.Minecraft/Utils.cs

@@ -1,8 +1,8 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Pilz.Gaming.Minecraft
-{
+namespace Pilz.Gaming.Minecraft;
+
 public static class Utils
 {
     public static string GetUUID(string value)
@@ -40,4 +40,3 @@ namespace Pilz.Gaming.Minecraft
         return GetUUID("OfflinePlayer:" + username);
     }
 }
-}

Pilz.IO/EmbeddedFilesContainer.cs

@@ -3,12 +3,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 public class EmbeddedFilesContainer
 {
     [JsonProperty("CompressedFiles")]
@@ -171,4 +169,3 @@ namespace Pilz.IO
         compressed.Close();
     }
 }
-}

Pilz.IO/EventArgs/DataEventargs.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 public class DataEventArgs : EventArgs
 {
     public readonly byte[] Data;
@@ -11,4 +11,3 @@ namespace Pilz.IO
         Data = bytes;
     }
 }
-}

Pilz.IO/Extensions.cs

@@ -1,12 +1,10 @@
 using Pilz.Runtime;
-using Pilz.Win32.Native;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 public static class Extensions
 {
     static readonly int MAX_PATH = 255;
@@ -23,4 +21,3 @@ namespace Pilz.IO
             return Process.GetCurrentProcess().MainModule.FileName;
     }
 }
-}

Pilz.IO/FileLocker.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 public partial class FileLocker : IDisposable
 {
     private FileStream fsLock = null;
@@ -115,4 +115,3 @@ namespace Pilz.IO
     }
     #endregion
 }
-}

Pilz.IO/ManagedPipes/ManagedPipe.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 /// <summary>
 /// stellt den Erben "Server" und "Client" 2 verschiedene
 /// Message-Events zur Verfügung, und ein Event-Raisendes Dispose
@@ -64,4 +64,3 @@ namespace Pilz.IO
         GC.SuppressFinalize(this);
     }
 }
-}

Pilz.IO/ManagedPipes/ManagedPipeClient.cs

@@ -1,10 +1,10 @@
-using System;
+using global::System.IO.Pipes;
+using System;
 using System.Collections.Generic;
-using global::System.IO.Pipes;
 using System.Threading.Tasks;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 public class ManagedPipeClient : ManagedPipe
 {
     private PipeStream pipeStream;
@@ -87,4 +87,3 @@ namespace Pilz.IO
         pipeStream.Dispose();
     }
 }
-}

Pilz.IO/ManagedPipes/ManagedPipeServer.cs

@@ -1,10 +1,10 @@
-using System;
+using global::System.IO.Pipes;
+using System;
 using System.Collections.Generic;
-using global::System.IO.Pipes;
 using System.Threading.Tasks;
 
-namespace Pilz.IO
-{
+namespace Pilz.IO;
+
 public class ManagedPipeServer : ManagedPipe
 {
 
@@ -105,4 +105,3 @@ namespace Pilz.IO
             Clients[i].Dispose();
     }
 }
-}

Pilz.IO/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using global::System;
-using global::System.Reflection;
 using global::System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 

Pilz.LicenseHelper/AsposeModifyInMemory.cs

@@ -6,8 +6,8 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Xml;
 
-namespace Pilz.LicenseHelper
-{
+namespace Pilz.LicenseHelper;
+
 public static class AsposeModifyInMemory
 {
     private static string AsposeList = "Aspose.3D.dll, Aspose.BarCode.dll, Aspose.BarCode.Compact.dll, Aspose.BarCode.WPF.dll, Aspose.Cells.GridDesktop.dll, Aspose.Cells.GridWeb.dll, Aspose.CAD.dll, Aspose.Cells.dll, Aspose.Diagram.dll, Aspose.Email.dll, Aspose.Imaging.dll, Aspose.Note.dll, Aspose.OCR.dll, Aspose.Pdf.dll, Aspose.Slides.dll, Aspose.Tasks.dll, Aspose.Words.dll";
@@ -182,4 +182,3 @@ namespace Pilz.LicenseHelper
         }
     }
 }
-}

Pilz.LicenseHelper/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
 // für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs

@@ -1,12 +1,7 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention;
+
 public class FilesRetentionClient : ClientBase
 {
     public FilesRetentionClient(NextcloudClient client) : base(client)
@@ -42,4 +37,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention
         return null;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRule.cs

@@ -1,12 +1,7 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+
 public class RetentionRule : RetentionRuleInfo
 {
     /// <summary>
@@ -33,4 +28,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Mod
         HasJob = data.HasJob ?? false;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionRuleInfo.cs

@@ -1,12 +1,7 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
+
 public class RetentionRuleInfo
 {
     /// <summary>
@@ -40,4 +35,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Mod
         };
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeAfter.cs

@@ -1,14 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model
-{
 public enum RetentionTimeAfter
 {
     CreationDate,
     LastAccess
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Model/RetentionTimeUnit.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model
-{
 public enum RetentionTimeUnit
 {
     Day,
@@ -13,4 +7,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Mod
     Month,
     Year
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsDataRetentionRule.cs

@@ -1,13 +1,8 @@
 using Newtonsoft.Json;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+
 public class OcsDataRetentionRule : OcsData
 {
 
@@ -23,4 +18,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
     [JsonProperty("timeafter")]
     public int? TimeAfter { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseDataEntryRetention.cs

@@ -1,13 +1,8 @@
 using Newtonsoft.Json;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
+
 public class OcsResponseDataEntryRetention : OcsResponseDataEntry
 {
     [JsonProperty("id")]
@@ -28,4 +23,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
     [JsonProperty("hasJob")]
     public bool? HasJob { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/Ocs/OcsResponseRetention.cs

@@ -1,14 +1,7 @@
-using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
-{
 public class OcsResponseRetention : OcsResponse<OcsResponseDataArray<OcsResponseDataEntryRetention>>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs

@@ -1,14 +1,8 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention;
+
 public class OcsApiFilesRetention : OcsApiBase
 {
     public static readonly OcsApiUrlPath OCS_FILE_RETENTION_RULES = new("/ocs/v2.php/apps/files_retention/api/v1/retentions");
@@ -35,4 +29,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention
         return Manager.MakeRequestOcs<OcsResponseRetention>(HttpMethod.Get, OCS_FILE_RETENTION_RULES);
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Column.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
 public class Column
 {
     [JsonProperty("type")]
@@ -113,4 +108,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
         };
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSelectionOption.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
 public class ColumnSelectionOption
 {
     [JsonProperty("id")]
@@ -15,4 +10,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
     [JsonProperty("label")]
     public string? Label { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnSubtype.cs

@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
 public enum ColumnSubtype
 {
     None,
     Unknown,
     Line
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/ColumnType.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
 public enum ColumnType
 {
     Unknown,
@@ -13,4 +7,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
     Selection,
     DateTime
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Columns.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
 public class Columns : List<Column>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Row.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
 public class Row
 {
     [JsonProperty("id")]
@@ -30,4 +25,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
     [JsonProperty("data")]
     public List<RowData> Data { get; set; } = new();
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowData.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
 public class RowData
 {
     [JsonProperty("columnId")]
@@ -15,4 +10,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
     [JsonProperty("value")]
     public object? Value { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowSimple.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
 public class RowSimple : List<object>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowUpdate.cs

@@ -1,15 +1,9 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
+
 public class RowUpdate
 {
     [JsonProperty("data")]
     public Dictionary<long, object?> Data { get; set; } = new();
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/Rows.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
 public class Rows : List<Row>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/Model/RowsSimple.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
-{
 public class RowsSimple : List<RowSimple>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs

@@ -1,14 +1,8 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables;
+
 public class OcsApiTables : OcsApiBase
 {
     public static readonly OcsApiUrlPath OCS_TABLES_TABLE_ROWS = new("/apps/tables/api/1/tables/{0}/rows");
@@ -83,4 +77,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables
         return Manager.MakeRequest<Row>(HttpMethod.Post, OCS_TABLES_VIEW_ROWS.FillParameters(viewId), content: values);
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs

@@ -1,12 +1,7 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables;
+
 public class TablesClient : ClientBase
 {
     public TablesClient(NextcloudClient client) : base(client)
@@ -78,4 +73,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables
         return Client.Ocs.GetApi<OcsApiTables>().CreateRow(tableId, values);
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs

@@ -1,14 +1,17 @@
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client;
 
+
+/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
+Vor:
 namespace Pilz.Networking.CloudProviders.Nextcloud.Client
 {
     public abstract class ClientBase
+Nach:
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client;
+
+public abstract class ClientBase
+*/
+public abstract class ClientBase
 {
     protected NextcloudClient Client { get; init; }
 
@@ -17,4 +20,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client
         Client = client;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs

@@ -1,12 +1,7 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
+
 public class CloudClient : ClientBase
 {
     public CloudClient(NextcloudClient client) : base(client)
@@ -31,4 +26,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud
         return null;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs

@@ -1,12 +1,5 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
-{
 public class UserBackendCapabilities
 {
     /// <summary>
@@ -19,4 +12,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
     /// </summary>
     public bool SetPassword { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs

@@ -1,12 +1,7 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
+
 public class UserInfo
 {
     /// <summary>
@@ -128,4 +123,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
         }
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs

@@ -1,12 +1,5 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
-{
 public class UserQuota
 {
     /// <summary>
@@ -34,4 +27,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
     /// </summary>
     public long Quota { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs

@@ -1,13 +1,8 @@
 using Newtonsoft.Json;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
+
 public class OcsResponseDataUser : OcsResponseData
 {
     public class ResponseQuota
@@ -88,4 +83,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs
     [JsonProperty("backendCapabilities")]
     public ResponseBackendCapabilities? BackendCapabilities { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs

@@ -1,14 +1,7 @@
-using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs
-{
 public class OcsResponseUser : OcsResponse<OcsResponseDataUser>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs

@@ -1,13 +1,8 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
+
 public class OcsApiCloud : OcsApiBase
 {
     public readonly static OcsApiUrlPath OCS_CLOUD_USER_METADATA = new("/ocs/v1.php/cloud/users/{0}");
@@ -21,4 +16,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud
         return Manager.MakeRequestOcs<OcsResponseUser>(HttpMethod.Get, OCS_CLOUD_USER_METADATA.FillParameters(username));
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs

@@ -1,12 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+
+/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
+Vor:
+using System;
+Nach:
+using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using System;
+*/
+using
+/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
+Vor:
 using System.Threading.Tasks;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+Nach:
+using System.Threading.Tasks;
+*/
+Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Core;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Core
-{
 public class OcsApiCore : OcsApiBase
 {
     public static readonly OcsApiUrlPath OCS_CORE_APPPASSWORD = "/ocs/v2.php/core/apppassword";
@@ -21,4 +32,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Core
         return msg != null && msg.IsSuccessStatusCode;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+
 public class OcsResponseLoginFlowV2
 {
     public class PollData
@@ -37,4 +32,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs
     [JsonProperty("login")]
     public string? LoginUrl { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+
 public class OcsResponseLoginFlowV2Credentials
 {
     /// <summary>
@@ -27,4 +22,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs
     [JsonProperty("appPassword")]
     public string? AppPassword { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs

@@ -1,13 +1,8 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2;
+
 public class OcsApiLoginFlowV2 : OcsApiBase
 {
     private const string OCS_LOGIN_INIT = "/index.php/login/v2";
@@ -33,4 +28,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2
             });
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs

@@ -1,12 +1,8 @@
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud;
+
 public static class Extensions
 {
     public static string ToBasicAuth(this OcsApiAuthCredentials? credentials)
@@ -43,4 +39,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
         return new DateTimeOffset(value).ToUnixTimeMilliseconds();
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs

@@ -1,4 +1,14 @@
-using System;
+using Pilz.Networking.CloudProviders.Nextcloud.Client;
+using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
+using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
+using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+
+/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
+Vor:
+using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+Nach:
+using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -6,14 +16,12 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using Pilz.Networking.CloudProviders.Nextcloud.Client;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+*/
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+using System.Diagnostics;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud
-{
 public class NextcloudClient : IDisposable
 {
     private readonly List<ClientBase> clients = new();
@@ -152,4 +160,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
         GC.SuppressFinalize(this);
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs

@@ -1,13 +1,7 @@
-using Newtonsoft.Json;
-using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
+
+namespace Pilz.Networking.CloudProviders.Nextcloud;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud
-{
 public class NextcloudLogin
 {
     /// <summary>
@@ -36,4 +30,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
         AppPassword = response.AppPassword;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs

@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
 public delegate void GetOcsApiAuthCredentailsEventHandler(object sender, GetOcsApiAuthCredentailsEventArgs eventArgs);
 
 public class GetOcsApiAuthCredentailsEventArgs : EventArgs
 {
     public OcsApiAuthCredentials? Credentials { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs

@@ -1,21 +1,30 @@
-using System;
+/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
+Vor:
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Net.Http.Headers;
 using Newtonsoft.Json;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Sockets;
-using System.Xml.Linq;
+Nach:
+using Newtonsoft.Json;
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
 using Pilz.Networking.CloudProviders.Nextcloud.Client.Core;
 using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+using System;
+using System.Json;
+*/
+
+/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
+Vor:
+using 
+Nach:
+using
+*/
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
 public class OcsApi : IDisposable
 {
     public const string CONTENT_TYPE_JSON = "application/json";
@@ -215,4 +224,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
         GC.SuppressFinalize(this);
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
 public struct OcsApiAuthCredentials
 {
     public string LoginName { get; set; }
@@ -18,4 +11,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
         AppPassword = appPassword;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
 public abstract class OcsApiBase
 {
     protected OcsApi Manager { get; init; }
@@ -15,4 +9,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
         Manager = manager;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs

@@ -1,17 +1,10 @@
 using Newtonsoft.Json;
 using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
+
 public class OcsApiResponse<TOcsResponse> where TOcsResponse : IOcsResponse
 {
     [JsonProperty("ocs")]
     public TOcsResponse? Ocs { get; set; }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
 public readonly struct OcsApiUrlPath
 {
     private readonly string path;
@@ -28,4 +22,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
         return path;
     }
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
-{
 public class OcsData
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
 public interface IOcsResponse
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
 public interface IOcsResponseData
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
 public interface IOcsResponseMeta
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+
 public class OcsResponse<TMeta, TData> : IOcsResponse where TMeta : IOcsResponseMeta where TData : IOcsResponseData
 {
     [JsonProperty("meta")]
@@ -23,4 +18,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
 public class OcsResponse : OcsResponse<OcsResponseMeta, OcsResponseData>
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
 public class OcsResponseData : IOcsResponseData
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
 public class OcsResponseDataArray<TEntry> : List<TEntry>, IOcsResponseData where TEntry : OcsResponseDataEntry
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
 public class OcsResponseDataEntry
 {
 }
-}

Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
-{
+namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses;
+
 public class OcsResponseMeta : IOcsResponseMeta
 {
     [JsonProperty("status")]
@@ -18,4 +13,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
     [JsonProperty("message")]
     public string? Message { get; set; }
 }
-}

Pilz.Networking/ConnectionManagerBase.vb

@@ -1,5 +1,6 @@
 Imports System.IO
 Imports System.Net
+
 Imports Newtonsoft.Json.Linq
 
 Public MustInherit Class ConnectionManagerBase

Pilz.Networking/TCPManager.vb

@@ -1,8 +1,14 @@
-Imports System.IO
-Imports System.Net
-Imports System.Net.NetworkInformation
+Imports System.Net
+
+' Nicht gemergte Änderung aus Projekt "Pilz.Networking (net8.0-windows)" 
+' Vor:
+' Imports System.Net.Sockets
+' Imports Newtonsoft.Json.Linq
+' Nach:
+' Imports System.Net.Sockets
+' 
+' Imports Newtonsoft.Json.Linq
 Imports System.Net.Sockets
-Imports Newtonsoft.Json.Linq
 
 Public Class TCPManager
     Inherits ConnectionManagerBase

Pilz.Networking/UDPManager.vb

@@ -1,9 +1,15 @@
-Imports System.IO
-Imports System.Net
-Imports System.Net.NetworkInformation
+Imports System.Net
 Imports System.Net.Sockets
+
+' Nicht gemergte Änderung aus Projekt "Pilz.Networking (net8.0-windows)" 
+' Vor:
+' Imports System.Threading
+' Imports Newtonsoft.Json.Linq
+' Nach:
+' Imports System.Threading
+' 
+' Imports Newtonsoft.Json.Linq
 Imports System.Threading
-Imports Newtonsoft.Json.Linq
 
 Public Class UDPManager
     Inherits ConnectionManagerBase

Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs

@@ -1,11 +1,8 @@
-using System.Drawing;
-using System.Reflection;
-using Telerik.WinControls;
-using Telerik.WinControls.Elements;
+using Telerik.WinControls;
 using Telerik.WinControls.UI;
 
-namespace Pilz.Plugins.Advanced.UI.Telerik
-{
+namespace Pilz.Plugins.Advanced.UI.Telerik;
+
 public static class Extensions
 {
     public static Icon? ToIcon(this Image image)
@@ -122,4 +119,3 @@ namespace Pilz.Plugins.Advanced.UI.Telerik
             function.Execute();
     }
 }
-}

Pilz.Plugins.Advanced.UI.Telerik/PluginModule.cs

@@ -1,12 +1,9 @@
-using Pilz.Plugins.Advanced.UI;
-using Pilz.UI.Telerik;
+using Pilz.UI.Telerik;
 using Pilz.UI.Telerik.Dialogs;
-using System.Drawing;
-using System.Windows.Forms;
 using Telerik.WinControls;
 
-namespace Pilz.Plugins.Advanced.UI.Telerik
-{
+namespace Pilz.Plugins.Advanced.UI.Telerik;
+
 public abstract class PluginModule : PluginModule<PluginModuleUI>
 {
     /// <summary>
@@ -36,4 +33,3 @@ namespace Pilz.Plugins.Advanced.UI.Telerik
         }
     }
 }
-}

Pilz.Plugins.Advanced.UI.Telerik/PluginModuleUI.cs

@@ -1,13 +1,7 @@
 using Pilz.UI.Telerik.Dialogs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
-namespace Pilz.Plugins.Advanced.UI.Telerik
-{
+namespace Pilz.Plugins.Advanced.UI.Telerik;
+
 public class PluginModuleUI : FlyoutBase, ILoadContent
 {
     public PluginModuleUI()
@@ -19,4 +13,3 @@ namespace Pilz.Plugins.Advanced.UI.Telerik
     {
     }
 }
-}

Pilz.Plugins.Advanced.UI/FeatureInsertMode.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace Pilz.Plugins.Advanced.UI;
 
-namespace Pilz.Plugins.Advanced.UI
-{
 [Flags]
 public enum FeatureInsertMode
 {
@@ -36,4 +30,3 @@ namespace Pilz.Plugins.Advanced.UI
     /// </summary>
     InsertTopAndBottom = InsertTop | InsertBottom,
 }
-}