Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code optimization

Browse Source
This commit is contained in:
Pascal
2024-06-05 19:15:32 +02:00
parent d4be7d0566
commit 1b49c54822
151 changed files with 4124 additions and 4673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Pilz.Collections/SimpleHistory/ObjectAction.vb
View File

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

4
Pilz.Collections/SimpleHistory/SimpleHistory.vb
View File

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

5
Pilz.Configuration/AutoSaveConfigurationManager.cs
View File

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

5
Pilz.Configuration/ConfigurationManager.cs
View File

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

9
Pilz.Configuration/ConfigurationManagerList.cs
View File

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

9
Pilz.Configuration/ConfigurationSerializer.cs
View File

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

5
Pilz.Configuration/IChildSettings.cs
View File

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

5
Pilz.Configuration/ISettings.cs
View File

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

9
Pilz.Configuration/ISettingsIdentifier.cs
View File

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

5
Pilz.Configuration/ISettingsManager.cs
View File

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

10
Pilz.Configuration/Settings.cs
View File

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

11
Pilz.Configuration/SettingsManager.cs
View File

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

9
Pilz.Configuration/SimpleConfiguration.cs
View File

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

8
Pilz.Cryptography/Helpers.cs
View File

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

9
Pilz.Cryptography/ICrypter.cs
View File

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

8
Pilz.Cryptography/IUniquieID.cs
View File

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

7
Pilz.Cryptography/IUniquieIDHost.cs
View File

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

7
Pilz.Cryptography/Json.Converters/UniquieIDStringJsonConverter.cs
View File

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

4
Pilz.Cryptography/Properties/AssemblyInfo.cs
View File

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

9
Pilz.Cryptography/SecureString.cs
View File

@@ -1,12 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using System;
using System.Collections.Generic; 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))] [JsonConverter(typeof(Json.Converters.SecureStringJsonConverter))]
public class SecureString 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;
public static bool operator !=(SecureString left, SecureString right) => left?.EncryptedValue != right?.EncryptedValue; public static bool operator !=(SecureString left, SecureString right) => left?.EncryptedValue != right?.EncryptedValue;
} }
}

11
Pilz.Cryptography/SecureStringJsonConverter.cs
View File

@@ -1,15 +1,9 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Pilz.Cryptography; using Pilz.Cryptography;
using System; 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 class SecureStringJsonConverter : JsonConverter
{ {
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
@@ -38,4 +32,3 @@ namespace Pilz.Json.Converters
serializer.Serialize(writer, ((SecureString)value).EncryptedValue); serializer.Serialize(writer, ((SecureString)value).EncryptedValue);
} }
} }
}

19
Pilz.Cryptography/SimpleStringCrypter.cs
View File

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

9
Pilz.Cryptography/UniquieID.cs
View File

@@ -1,13 +1,9 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; 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))] [JsonConverter(typeof(Json.Converters.UniquieIDStringJsonConverter))]
public class UniquieID : IUniquieID 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);
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);
} }
}

7
Pilz.Cryptography/UniquieIDGenerationMode.cs
View File

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

1
Pilz.Drawing.Drawing3D.OpenGLRenderer/Camera/Camera.vb
View File

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

28
Pilz.Drawing.Drawing3D.OpenGLRenderer/Preview/ModelPreview.vb
View File

@@ -1,16 +1,32 @@
Imports System.Drawing 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 System.Windows.Forms
Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN
Imports Pilz.Drawing.Drawing3D.OpenGLFactory.RenderingN
Imports OpenTK
Imports OpenTK.Graphics.OpenGL Imports OpenTK.Graphics.OpenGL
Imports Pilz.S3DFileParser
Imports Point = System.Drawing.Point
Imports Color = System.Drawing.Color
Imports OpenTK.Mathematics Imports OpenTK.Mathematics
Imports OpenTK.WinForms Imports OpenTK.WinForms
Imports Pilz.Drawing.Drawing3D.OpenGLFactory.CameraN
Imports Pilz.Drawing.Drawing3D.OpenGLFactory.RenderingN
Imports Pilz.S3DFileParser
Imports Pilz.Win32.Mapped Imports Pilz.Win32.Mapped
Imports Color = System.Drawing.Color
Imports Point = System.Drawing.Point
Namespace PreviewN Namespace PreviewN
Public Class ModelPreview Public Class ModelPreview

13
Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/BoundingBox.vb
View File

@@ -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 Imports OpenTK.Graphics.OpenGL
Namespace RenderingN Namespace RenderingN

18
Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb
View File

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

7
Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/Renderer.vb
View File

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

1
Pilz.Drawing/HelpfulDrawingFunctions.vb
View File

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

5
Pilz.Gaming.Minecraft/Utils.cs
View File

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

7
Pilz.IO/EmbeddedFilesContainer.cs
View File

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

5
Pilz.IO/EventArgs/DataEventargs.cs
View File

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

7
Pilz.IO/Extensions.cs
View File

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

5
Pilz.IO/FileLocker.cs
View File

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

5
Pilz.IO/ManagedPipes/ManagedPipe.cs
View File

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

9
Pilz.IO/ManagedPipes/ManagedPipeClient.cs
View File

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

9
Pilz.IO/ManagedPipes/ManagedPipeServer.cs
View File

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

1
Pilz.IO/Properties/AssemblyInfo.cs
View File

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

5
Pilz.LicenseHelper/AsposeModifyInMemory.cs
View File

@@ -6,8 +6,8 @@ using System.Runtime.CompilerServices;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
namespace Pilz.LicenseHelper namespace Pilz.LicenseHelper;
{
public static class AsposeModifyInMemory 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"; 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
} }
} }
} }
}

4
Pilz.LicenseHelper/Properties/AssemblyInfo.cs
View File

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

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/FilesRetentionClient.cs
View File

@@ -1,12 +1,7 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Model; 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 class FilesRetentionClient : ClientBase
{ {
public FilesRetentionClient(NextcloudClient client) : base(client) public FilesRetentionClient(NextcloudClient client) : base(client)
@@ -42,4 +37,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention
return null; return null;
} }
} }
}

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

@@ -1,12 +1,7 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs; 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 public class RetentionRule : RetentionRuleInfo
{ {
/// <summary> /// <summary>
@@ -33,4 +28,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Mod
HasJob = data.HasJob ?? false; HasJob = data.HasJob ?? false;
} }
} }
}

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

@@ -1,12 +1,7 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs; 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 public class RetentionRuleInfo
{ {
/// <summary> /// <summary>
@@ -40,4 +35,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Mod
}; };
} }
} }
}

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

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

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

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

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

@@ -1,13 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Pilz.Networking.CloudProviders.Nextcloud.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.Apps.FileRetention.Ocs namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
{
public class OcsDataRetentionRule : OcsData public class OcsDataRetentionRule : OcsData
{ {
@@ -23,4 +18,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
[JsonProperty("timeafter")] [JsonProperty("timeafter")]
public int? TimeAfter { get; set; } public int? TimeAfter { get; set; }
} }
}

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

@@ -1,13 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses; 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 public class OcsResponseDataEntryRetention : OcsResponseDataEntry
{ {
[JsonProperty("id")] [JsonProperty("id")]
@@ -28,4 +23,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs
[JsonProperty("hasJob")] [JsonProperty("hasJob")]
public bool? HasJob { get; set; } public bool? HasJob { get; set; }
} }
}

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

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

11
Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/FileRetention/OcsApiFilesRetention.cs
View File

@@ -1,14 +1,8 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs; using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.FileRetention.Ocs;
using Pilz.Networking.CloudProviders.Nextcloud.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 class OcsApiFilesRetention : OcsApiBase
{ {
public static readonly OcsApiUrlPath OCS_FILE_RETENTION_RULES = new("/ocs/v2.php/apps/files_retention/api/v1/retentions"); 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); return Manager.MakeRequestOcs<OcsResponseRetention>(HttpMethod.Get, OCS_FILE_RETENTION_RULES);
} }
} }
}

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

@@ -1,12 +1,7 @@
using Newtonsoft.Json; 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 public class Column
{ {
[JsonProperty("type")] [JsonProperty("type")]
@@ -113,4 +108,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
}; };
} }
} }
}

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

@@ -1,12 +1,7 @@
using Newtonsoft.Json; 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 public class ColumnSelectionOption
{ {
[JsonProperty("id")] [JsonProperty("id")]
@@ -15,4 +10,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
[JsonProperty("label")] [JsonProperty("label")]
public string? Label { get; set; } public string? Label { get; set; }
} }
}

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

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

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

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

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

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

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

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

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

@@ -1,12 +1,7 @@
using Newtonsoft.Json; 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 public class RowData
{ {
[JsonProperty("columnId")] [JsonProperty("columnId")]
@@ -15,4 +10,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model
[JsonProperty("value")] [JsonProperty("value")]
public object? Value { get; set; } public object? Value { get; set; }
} }
}

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

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

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

@@ -1,15 +1,9 @@
using Newtonsoft.Json; 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 public class RowUpdate
{ {
[JsonProperty("data")] [JsonProperty("data")]
public Dictionary<long, object?> Data { get; set; } = new(); public Dictionary<long, object?> Data { get; set; } = new();
} }
}

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

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

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

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

11
Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/OcsApiTables.cs
View File

@@ -1,14 +1,8 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model; using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model;
using Pilz.Networking.CloudProviders.Nextcloud.Ocs; 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 class OcsApiTables : OcsApiBase
{ {
public static readonly OcsApiUrlPath OCS_TABLES_TABLE_ROWS = new("/apps/tables/api/1/tables/{0}/rows"); 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); return Manager.MakeRequest<Row>(HttpMethod.Post, OCS_TABLES_VIEW_ROWS.FillParameters(viewId), content: values);
} }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Apps/Tables/TablesClient.cs
View File

@@ -1,12 +1,7 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables.Model; 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 class TablesClient : ClientBase
{ {
public TablesClient(NextcloudClient client) : base(client) 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); return Client.Ocs.GetApi<OcsApiTables>().CreateRow(tableId, values);
} }
} }
}

18
Pilz.Networking.CloudProviders.Nextcloud/Client/ClientBase.cs
View File

@@ -1,14 +1,17 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Apps.Tables; namespace Pilz.Networking.CloudProviders.Nextcloud.Client;
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;
/* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
Vor:
namespace Pilz.Networking.CloudProviders.Nextcloud.Client namespace Pilz.Networking.CloudProviders.Nextcloud.Client
{ {
public abstract class ClientBase public abstract class ClientBase
Nach:
namespace Pilz.Networking.CloudProviders.Nextcloud.Client;
public abstract class ClientBase
*/
public abstract class ClientBase
{ {
protected NextcloudClient Client { get; init; } protected NextcloudClient Client { get; init; }
@@ -17,4 +20,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client
Client = client; Client = client;
} }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/CloudClient.cs
View File

@@ -1,12 +1,7 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model; 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 class CloudClient : ClientBase
{ {
public CloudClient(NextcloudClient client) : base(client) public CloudClient(NextcloudClient client) : base(client)
@@ -31,4 +26,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud
return null; return null;
} }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserBackendCapabilities.cs
View File

@@ -1,12 +1,5 @@
using Newtonsoft.Json; namespace 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.Model
{
public class UserBackendCapabilities public class UserBackendCapabilities
{ {
/// <summary> /// <summary>
@@ -19,4 +12,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
/// </summary> /// </summary>
public bool SetPassword { get; set; } public bool SetPassword { get; set; }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserInfo.cs
View File

@@ -1,12 +1,7 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs; 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 public class UserInfo
{ {
/// <summary> /// <summary>
@@ -128,4 +123,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
} }
} }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Model/UserQuota.cs
View File

@@ -1,12 +1,5 @@
using Newtonsoft.Json; namespace 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.Model
{
public class UserQuota public class UserQuota
{ {
/// <summary> /// <summary>
@@ -34,4 +27,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Model
/// </summary> /// </summary>
public long Quota { get; set; } public long Quota { get; set; }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseDataUser.cs
View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses; 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 OcsResponseDataUser : OcsResponseData
{ {
public class ResponseQuota public class ResponseQuota
@@ -88,4 +83,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs
[JsonProperty("backendCapabilities")] [JsonProperty("backendCapabilities")]
public ResponseBackendCapabilities? BackendCapabilities { get; set; } public ResponseBackendCapabilities? BackendCapabilities { get; set; }
} }
}

13
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/Ocs/OcsResponseUser.cs
View File

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

10
Pilz.Networking.CloudProviders.Nextcloud/Client/Cloud/OcsApiCloud.cs
View File

@@ -1,13 +1,8 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs; using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud.Ocs;
using Pilz.Networking.CloudProviders.Nextcloud.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 class OcsApiCloud : OcsApiBase
{ {
public readonly static OcsApiUrlPath OCS_CLOUD_USER_METADATA = new("/ocs/v1.php/cloud/users/{0}"); 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)); return Manager.MakeRequestOcs<OcsResponseUser>(HttpMethod.Get, OCS_CLOUD_USER_METADATA.FillParameters(username));
} }
} }
}

24
Pilz.Networking.CloudProviders.Nextcloud/Client/Core/OcsApiCore.cs
View File

@@ -1,12 +1,23 @@
using System;
using System.Collections.Generic; /* Nicht gemergte Änderung aus Projekt "Pilz.Networking.CloudProviders.Nextcloud (net6.0)"
using System.Linq; Vor:
using System.Text; 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 System.Threading.Tasks;
using Pilz.Networking.CloudProviders.Nextcloud.Ocs; 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 class OcsApiCore : OcsApiBase
{ {
public static readonly OcsApiUrlPath OCS_CORE_APPPASSWORD = "/ocs/v2.php/core/apppassword"; 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; return msg != null && msg.IsSuccessStatusCode;
} }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2.cs
View File

@@ -1,12 +1,7 @@
using Newtonsoft.Json; 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 OcsResponseLoginFlowV2
{ {
public class PollData public class PollData
@@ -37,4 +32,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs
[JsonProperty("login")] [JsonProperty("login")]
public string? LoginUrl { get; set; } public string? LoginUrl { get; set; }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/Ocs/OcsResponseLoginFlowV2Credentials.cs
View File

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

10
Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
View File

@@ -1,13 +1,8 @@
using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs; using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2.Ocs;
using Pilz.Networking.CloudProviders.Nextcloud.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 public class OcsApiLoginFlowV2 : OcsApiBase
{ {
private const string OCS_LOGIN_INIT = "/index.php/login/v2"; private const string OCS_LOGIN_INIT = "/index.php/login/v2";
@@ -33,4 +28,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2
}); });
} }
} }
}

9
Pilz.Networking.CloudProviders.Nextcloud/Extensions.cs
View File

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

23
Pilz.Networking.CloudProviders.Nextcloud/NextcloudClient.cs
View File

@@ -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.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
@@ -6,14 +16,12 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; 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 Pilz.Networking.CloudProviders.Nextcloud.Ocs;
using System.Diagnostics;
namespace Pilz.Networking.CloudProviders.Nextcloud;
namespace Pilz.Networking.CloudProviders.Nextcloud
{
public class NextcloudClient : IDisposable public class NextcloudClient : IDisposable
{ {
private readonly List<ClientBase> clients = new(); private readonly List<ClientBase> clients = new();
@@ -152,4 +160,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
} }
}

13
Pilz.Networking.CloudProviders.Nextcloud/NextcloudLogin.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/GetOcsApiAuthCredentailsEventArgs.cs
View File

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

24
Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
View File

@@ -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.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Diagnostics; Nach:
using System.Net; using Newtonsoft.Json;
using System.Net.Sockets;
using System.Xml.Linq;
using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud; using Pilz.Networking.CloudProviders.Nextcloud.Client.Cloud;
using Pilz.Networking.CloudProviders.Nextcloud.Client.Core; using Pilz.Networking.CloudProviders.Nextcloud.Client.Core;
using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2; using Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2;
using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses; 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 class OcsApi : IDisposable
{ {
public const string CONTENT_TYPE_JSON = "application/json"; public const string CONTENT_TYPE_JSON = "application/json";
@@ -215,4 +224,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
} }
}

10
Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiAuthCredentials.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiBase.cs
View File

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

11
Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiResponse.cs
View File

@@ -1,17 +1,10 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses; 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 public class OcsApiResponse<TOcsResponse> where TOcsResponse : IOcsResponse
{ {
[JsonProperty("ocs")] [JsonProperty("ocs")]
public TOcsResponse? Ocs { get; set; } public TOcsResponse? Ocs { get; set; }
} }
}

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApiUrlPath.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsData.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponse.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseData.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/IOcsResponseMeta.cs
View File

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

10
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponse.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseData.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataArray.cs
View File

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

9
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseDataEntry.cs
View File

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

10
Pilz.Networking.CloudProviders.Nextcloud/OCS/Responses/OcsResponseMeta.cs
View File

@@ -1,12 +1,7 @@
using Newtonsoft.Json; 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 public class OcsResponseMeta : IOcsResponseMeta
{ {
[JsonProperty("status")] [JsonProperty("status")]
@@ -18,4 +13,3 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs.Responses
[JsonProperty("message")] [JsonProperty("message")]
public string? Message { get; set; } public string? Message { get; set; }
} }
}

1
Pilz.Networking/ConnectionManagerBase.vb
View File

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

14
Pilz.Networking/TCPManager.vb
View File

@@ -1,8 +1,14 @@
Imports System.IO Imports System.Net
Imports System.Net
Imports System.Net.NetworkInformation ' 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 System.Net.Sockets
Imports Newtonsoft.Json.Linq
Public Class TCPManager Public Class TCPManager
Inherits ConnectionManagerBase Inherits ConnectionManagerBase

14
Pilz.Networking/UDPManager.vb
View File

@@ -1,9 +1,15 @@
Imports System.IO Imports System.Net
Imports System.Net
Imports System.Net.NetworkInformation
Imports System.Net.Sockets 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 System.Threading
Imports Newtonsoft.Json.Linq
Public Class UDPManager Public Class UDPManager
Inherits ConnectionManagerBase Inherits ConnectionManagerBase

10
Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs
View File

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

10
Pilz.Plugins.Advanced.UI.Telerik/PluginModule.cs
View File

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

11
Pilz.Plugins.Advanced.UI.Telerik/PluginModuleUI.cs
View File

@@ -1,13 +1,7 @@
using Pilz.UI.Telerik.Dialogs; 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 class PluginModuleUI : FlyoutBase, ILoadContent
{ {
public PluginModuleUI() public PluginModuleUI()
@@ -19,4 +13,3 @@ namespace Pilz.Plugins.Advanced.UI.Telerik
{ {
} }
} }
}

9
Pilz.Plugins.Advanced.UI/FeatureInsertMode.cs
View File

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

Some files were not shown because too many files have changed in this diff Show More