From dcac6551294b1ac3b385f0e5db939a27178678f9 Mon Sep 17 00:00:00 2001 From: MPitz Date: Mon, 6 Mar 2023 16:53:31 +0100 Subject: [PATCH] .Net 4.6.2 --- GUIs.Monitor/Monitor.vbproj | 8 ++-- GUIs.Monitor/My Project/Settings.Designer.vb | 46 ++++++++++---------- GUIs.Monitor/app.config | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index d8eac76..8caa14f 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -8,7 +8,7 @@ WinExe DigitalData.GUIs.Monitor DigitalData.GUIs.Monitor - v4.8 + v4.6.2 Monitor.Program 512 On @@ -90,12 +90,10 @@ False ..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll - - False + ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - False + ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll diff --git a/GUIs.Monitor/My Project/Settings.Designer.vb b/GUIs.Monitor/My Project/Settings.Designer.vb index 008b7ed..954894f 100644 --- a/GUIs.Monitor/My Project/Settings.Designer.vb +++ b/GUIs.Monitor/My Project/Settings.Designer.vb @@ -12,15 +12,16 @@ Option Strict On Option Explicit On - - _ -Partial Friend NotInheritable Class Settings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As Settings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()),Settings) +Namespace My + _ + Partial Friend NotInheritable Class Settings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As Settings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()),Settings) + #Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean @@ -29,16 +30,16 @@ Partial Friend NotInheritable Class Settings _ 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 + ' If My.Application.SaveMySettingsOnExit Then + ' My.Settings.Save() + ' End If + End Sub #End If #End Region - - Public Shared ReadOnly Property [Default]() As Settings - Get - + + Public Shared ReadOnly Property [Default]() As Settings + Get + #If _MyType = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject @@ -49,10 +50,11 @@ Partial Friend NotInheritable Class Settings End SyncLock End If #End If - Return defaultInstance - End Get - End Property -End Class + Return defaultInstance + End Get + End Property + End Class +End Namespace Namespace My @@ -62,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.DigitalData.GUIs.Monitor.Settings + Friend ReadOnly Property Settings() As Global.DigitalData.GUIs.Monitor.My.Settings Get - Return Global.DigitalData.GUIs.Monitor.Settings.Default + Return Global.DigitalData.GUIs.Monitor.My.Settings.Default End Get End Property End Module diff --git a/GUIs.Monitor/app.config b/GUIs.Monitor/app.config index dccfabc..4cd4723 100644 --- a/GUIs.Monitor/app.config +++ b/GUIs.Monitor/app.config @@ -46,7 +46,7 @@ - +