From bcb60d24568e1d6450849d90ab7873398097e4b2 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Mon, 29 Dec 2025 13:56:33 +0100 Subject: [PATCH] Converted project away from My namespace (MyType Empty), removed generated My files, and added Logging project reference so logger types resolve. --- Filesystem/Filesystem.vbproj | 43 ++----- Filesystem/My Project/Application.Designer.vb | 13 -- Filesystem/My Project/Application.myapp | 10 -- Filesystem/My Project/Resources.Designer.vb | 63 ---------- Filesystem/My Project/Resources.resx | 117 ------------------ Filesystem/My Project/Settings.Designer.vb | 73 ----------- Filesystem/My Project/Settings.settings | 7 -- 7 files changed, 8 insertions(+), 318 deletions(-) delete mode 100644 Filesystem/My Project/Application.Designer.vb delete mode 100644 Filesystem/My Project/Application.myapp delete mode 100644 Filesystem/My Project/Resources.Designer.vb delete mode 100644 Filesystem/My Project/Resources.resx delete mode 100644 Filesystem/My Project/Settings.Designer.vb delete mode 100644 Filesystem/My Project/Settings.settings diff --git a/Filesystem/Filesystem.vbproj b/Filesystem/Filesystem.vbproj index 2d155585..afeac4f6 100644 --- a/Filesystem/Filesystem.vbproj +++ b/Filesystem/Filesystem.vbproj @@ -4,7 +4,7 @@ Library DigitalData.Modules.Filesystem DigitalData.Modules.Filesystem - Windows + Empty enable Modules.Filesystem Stellt Funktionen für das Filesystem und Container zur Verfügung @@ -35,42 +35,15 @@ - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - + + + + + + + \ No newline at end of file diff --git a/Filesystem/My Project/Application.Designer.vb b/Filesystem/My Project/Application.Designer.vb deleted file mode 100644 index 8ab460ba..00000000 --- a/Filesystem/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/Filesystem/My Project/Application.myapp b/Filesystem/My Project/Application.myapp deleted file mode 100644 index 758895de..00000000 --- a/Filesystem/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - 0 - true - 0 - 1 - true - diff --git a/Filesystem/My Project/Resources.Designer.vb b/Filesystem/My Project/Resources.Designer.vb deleted file mode 100644 index 26ca448a..00000000 --- a/Filesystem/My Project/Resources.Designer.vb +++ /dev/null @@ -1,63 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - -Imports System - -Namespace My.Resources - - 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - ''' - ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Filesystem.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/Filesystem/My Project/Resources.resx b/Filesystem/My Project/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/Filesystem/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Filesystem/My Project/Settings.Designer.vb b/Filesystem/My Project/Settings.Designer.vb deleted file mode 100644 index cec9af04..00000000 --- a/Filesystem/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - -#Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Filesystem.My.MySettings - Get - Return Global.DigitalData.Modules.Filesystem.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/Filesystem/My Project/Settings.settings b/Filesystem/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/Filesystem/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -