From d9690d270bf03c060ae315432c3ec3743d987170 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 24 Jan 2023 14:35:09 +0100 Subject: [PATCH] Downgrade to 4.6.2 --- Base/Base.vbproj | 2 +- Base/My Project/Settings.Designer.vb | 2 +- Config/Config.vbproj | 2 +- Config/My Project/Settings.Designer.vb | 2 +- Database.Test/My Project/Application.myapp | 10 +++++++ Database/App.config | 2 +- Database/Database.vbproj | 2 +- Database/My Project/Settings.Designer.vb | 2 +- EDMIAPI/EDMI.API.vbproj | 2 +- EDMIAPI/My Project/Settings.Designer.vb | 2 +- EDMIAPI/app.config | 2 +- Encryption/Encryption.vbproj | 2 +- Encryption/My Project/Settings.Designer.vb | 2 +- Filesystem/Filesystem.vbproj | 2 +- Filesystem/My Project/Settings.Designer.vb | 2 +- Interfaces/Interfaces.vbproj | 2 +- Interfaces/app.config | 2 +- Jobs/App.config | 2 +- Jobs/Jobs.vbproj | 2 +- Language/Language.vbproj | 2 +- Language/My Project/Settings.Designer.vb | 2 +- License/License.vbproj | 2 +- License/My Project/Settings.Designer.vb | 2 +- Logging.Test/Logging.Test.vbproj | 2 +- Logging.Test/My Project/Settings.Designer.vb | 2 +- Logging/LogConfig.vb | 2 +- Logging/Logging.vbproj | 2 +- Logging/My Project/Settings.Designer.vb | 2 +- Messaging/MailSender.vb | 30 ++++++++++++++++++-- Messaging/Messaging.vbproj | 2 +- Messaging/My Project/AssemblyInfo.vb | 6 ++-- Messaging/My Project/Settings.Designer.vb | 2 +- Patterns/My Project/Settings.Designer.vb | 2 +- Patterns/Patterns.vbproj | 2 +- Patterns/app.config | 2 +- Windows/My Project/Settings.Designer.vb | 2 +- Windows/Windows.vbproj | 2 +- Windream/My Project/Settings.Designer.vb | 2 +- Windream/Windream.vbproj | 2 +- ZooFlow/My Project/Settings.Designer.vb | 2 +- ZooFlow/ZooFlow.vbproj | 2 +- ZooFlow/app.config | 2 +- 42 files changed, 79 insertions(+), 45 deletions(-) create mode 100644 Database.Test/My Project/Application.myapp diff --git a/Base/Base.vbproj b/Base/Base.vbproj index 8a3f04b5..f6ca6eae 100644 --- a/Base/Base.vbproj +++ b/Base/Base.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Base 512 Windows - v4.8 + v4.6.2 true diff --git a/Base/My Project/Settings.Designer.vb b/Base/My Project/Settings.Designer.vb index 11bb174b..42bd5f93 100644 --- a/Base/My Project/Settings.Designer.vb +++ b/Base/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Config/Config.vbproj b/Config/Config.vbproj index e019d702..b1152a18 100644 --- a/Config/Config.vbproj +++ b/Config/Config.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Config 512 Windows - v4.8 + v4.6.2 diff --git a/Config/My Project/Settings.Designer.vb b/Config/My Project/Settings.Designer.vb index a98908b6..c0dfd971 100644 --- a/Config/My Project/Settings.Designer.vb +++ b/Config/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Database.Test/My Project/Application.myapp b/Database.Test/My Project/Application.myapp new file mode 100644 index 00000000..c0f7fef4 --- /dev/null +++ b/Database.Test/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + true + Form1 + false + 0 + true + 0 + true + \ No newline at end of file diff --git a/Database/App.config b/Database/App.config index 813da1b1..446ac8a8 100644 --- a/Database/App.config +++ b/Database/App.config @@ -20,4 +20,4 @@ - + diff --git a/Database/Database.vbproj b/Database/Database.vbproj index b0ef3829..adcd0fbf 100644 --- a/Database/Database.vbproj +++ b/Database/Database.vbproj @@ -11,7 +11,7 @@ DigitalData.Modules.Database 512 Windows - v4.8 + v4.6.2 diff --git a/Database/My Project/Settings.Designer.vb b/Database/My Project/Settings.Designer.vb index cc5e7411..183e592d 100644 --- a/Database/My Project/Settings.Designer.vb +++ b/Database/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/EDMIAPI/EDMI.API.vbproj b/EDMIAPI/EDMI.API.vbproj index 7f269378..bd822add 100644 --- a/EDMIAPI/EDMI.API.vbproj +++ b/EDMIAPI/EDMI.API.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.EDMI.API 512 Windows - v4.8 + v4.6.2 diff --git a/EDMIAPI/My Project/Settings.Designer.vb b/EDMIAPI/My Project/Settings.Designer.vb index 08665b0c..6937d1ac 100644 --- a/EDMIAPI/My Project/Settings.Designer.vb +++ b/EDMIAPI/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/EDMIAPI/app.config b/EDMIAPI/app.config index 9fd5a174..6ddebb81 100644 --- a/EDMIAPI/app.config +++ b/EDMIAPI/app.config @@ -46,4 +46,4 @@ - + diff --git a/Encryption/Encryption.vbproj b/Encryption/Encryption.vbproj index bfa88c8d..16be5211 100644 --- a/Encryption/Encryption.vbproj +++ b/Encryption/Encryption.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Encryption 512 Windows - v4.8 + v4.6.2 true diff --git a/Encryption/My Project/Settings.Designer.vb b/Encryption/My Project/Settings.Designer.vb index 00b356ca..7d3786b6 100644 --- a/Encryption/My Project/Settings.Designer.vb +++ b/Encryption/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Filesystem/Filesystem.vbproj b/Filesystem/Filesystem.vbproj index b189e336..c22d606b 100644 --- a/Filesystem/Filesystem.vbproj +++ b/Filesystem/Filesystem.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Filesystem 512 Windows - v4.8 + v4.6.2 diff --git a/Filesystem/My Project/Settings.Designer.vb b/Filesystem/My Project/Settings.Designer.vb index 10d9c887..42eecd06 100644 --- a/Filesystem/My Project/Settings.Designer.vb +++ b/Filesystem/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Interfaces/Interfaces.vbproj b/Interfaces/Interfaces.vbproj index 71f3e9b1..49f37819 100644 --- a/Interfaces/Interfaces.vbproj +++ b/Interfaces/Interfaces.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Interfaces 512 Windows - v4.8 + v4.6.2 diff --git a/Interfaces/app.config b/Interfaces/app.config index 4934484b..99f551b0 100644 --- a/Interfaces/app.config +++ b/Interfaces/app.config @@ -8,4 +8,4 @@ - + diff --git a/Jobs/App.config b/Jobs/App.config index dde06da8..276809a3 100644 --- a/Jobs/App.config +++ b/Jobs/App.config @@ -1,7 +1,7 @@ - + diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj index 68e81994..a6718f21 100644 --- a/Jobs/Jobs.vbproj +++ b/Jobs/Jobs.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Jobs 512 Empty - v4.8 + v4.6.2 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 true diff --git a/Language/Language.vbproj b/Language/Language.vbproj index 892abccb..c91e6544 100644 --- a/Language/Language.vbproj +++ b/Language/Language.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Language 512 Windows - v4.8 + v4.6.2 diff --git a/Language/My Project/Settings.Designer.vb b/Language/My Project/Settings.Designer.vb index aaa90187..81c481db 100644 --- a/Language/My Project/Settings.Designer.vb +++ b/Language/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/License/License.vbproj b/License/License.vbproj index 70268621..0b95ba02 100644 --- a/License/License.vbproj +++ b/License/License.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.License 512 Windows - v4.8 + v4.6.2 diff --git a/License/My Project/Settings.Designer.vb b/License/My Project/Settings.Designer.vb index 70bb1fa6..1939a0fb 100644 --- a/License/My Project/Settings.Designer.vb +++ b/License/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Logging.Test/Logging.Test.vbproj b/Logging.Test/Logging.Test.vbproj index 03decd0a..8e5cd852 100644 --- a/Logging.Test/Logging.Test.vbproj +++ b/Logging.Test/Logging.Test.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Logging.Test 512 Windows - v4.8 + v4.6.2 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Logging.Test/My Project/Settings.Designer.vb b/Logging.Test/My Project/Settings.Designer.vb index 6ef90547..7435735a 100644 --- a/Logging.Test/My Project/Settings.Designer.vb +++ b/Logging.Test/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Logging/LogConfig.vb b/Logging/LogConfig.vb index 77450f51..97208491 100644 --- a/Logging/LogConfig.vb +++ b/Logging/LogConfig.vb @@ -87,7 +87,7 @@ Public Class LogConfig Private Const LOG_FORMAT_BASE As String = "${time}|${logger:shortName=True}|${level:uppercase=true}" Private Const LOG_FORMAT_CALLSITE As String = "${callsite:className=false:fileName=true:includeSourcePath=false:methodName=true}" - Private Const LOG_FORMAT_EXCEPTION As String = "${exception:format=Message,StackTrace:innerFormat=Message:maxInnerExceptionLevel=3}" + Private Const LOG_FORMAT_EXCEPTION As String = "${exception:format=Message,StackTrace:innerFormat=Message,StackTrace:maxInnerExceptionLevel=3}" Private Const LOG_FORMAT_DEFAULT As String = LOG_FORMAT_BASE & " >> ${message}" Private Const LOG_FORMAT_ERROR As String = LOG_FORMAT_BASE & " >> " & LOG_FORMAT_EXCEPTION diff --git a/Logging/Logging.vbproj b/Logging/Logging.vbproj index 6eb52a34..4a872a75 100644 --- a/Logging/Logging.vbproj +++ b/Logging/Logging.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Logging 512 Windows - v4.8 + v4.6.2 diff --git a/Logging/My Project/Settings.Designer.vb b/Logging/My Project/Settings.Designer.vb index 61a3e53f..5688b861 100644 --- a/Logging/My Project/Settings.Designer.vb +++ b/Logging/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Messaging/MailSender.vb b/Messaging/MailSender.vb index f7515538..231c0ceb 100644 --- a/Messaging/MailSender.vb +++ b/Messaging/MailSender.vb @@ -21,7 +21,10 @@ Public Class MailSender SslPolicyErrors.RemoteCertificateNameMismatch ' name mismatch Public Class MailSenderOptions - Public Property TlsVersion As Security.Authentication.SslProtocols = Security.Authentication.SslProtocols.Default + Public Property EnableDefault As Boolean = True + Public Property EnableTls1_1 As Boolean = False + Public Property EnableTls1_2 As Boolean = False + Public Property EnableTls1_3 As Boolean = False End Class Public Sub New(pLogConfig As LogConfig) @@ -59,11 +62,32 @@ Public Class MailSender Logger.Debug("Initializing Connection with Auth type [{0}].", pAuthType) + If pOptions.EnableDefault Then + Logger.Debug("Enabling Default TLS Version") + oSession.SSLConfiguration.EnabledSslProtocols = Security.Authentication.SslProtocols.Default + Else + Logger.Debug("Disabling Default TLS Version") + oSession.SSLConfiguration.EnabledSslProtocols = Security.Authentication.SslProtocols.None + End If + ' Set TLS Version manually if requested - If pOptions.TlsVersion <> Security.Authentication.SslProtocols.Default Then - oSession.SSLConfiguration.EnabledSslProtocols = pOptions.TlsVersion + If pOptions.EnableTls1_1 Then + Logger.Debug("Enabling TLS Version 1.1") + oSession.SSLConfiguration.EnabledSslProtocols = oSession.SSLConfiguration.EnabledSslProtocols Or Security.Authentication.SslProtocols.Tls11 + End If + + If pOptions.EnableTls1_2 Then + Logger.Debug("Enabling TLS Version 1.2") + oSession.SSLConfiguration.EnabledSslProtocols = oSession.SSLConfiguration.EnabledSslProtocols Or Security.Authentication.SslProtocols.Tls12 + End If + + If pOptions.EnableTls1_3 Then + Logger.Debug("Enabling TLS Version 1.3") + oSession.SSLConfiguration.EnabledSslProtocols = oSession.SSLConfiguration.EnabledSslProtocols Or Security.Authentication.SslProtocols.Tls13 End If + Logger.Debug("Enabled Encryption Protocols: [{0}]", oSession.SSLConfiguration.EnabledSslProtocols) + If pAuthType = "SSL" Then Try If pPort = 465 Then diff --git a/Messaging/Messaging.vbproj b/Messaging/Messaging.vbproj index 699ccaad..666effc2 100644 --- a/Messaging/Messaging.vbproj +++ b/Messaging/Messaging.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Messaging 512 Windows - v4.8 + v4.6.2 diff --git a/Messaging/My Project/AssemblyInfo.vb b/Messaging/My Project/AssemblyInfo.vb index bd3a01bb..aed102f7 100644 --- a/Messaging/My Project/AssemblyInfo.vb +++ b/Messaging/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Messaging/My Project/Settings.Designer.vb b/Messaging/My Project/Settings.Designer.vb index 3480fed7..5e43dae7 100644 --- a/Messaging/My Project/Settings.Designer.vb +++ b/Messaging/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Patterns/My Project/Settings.Designer.vb b/Patterns/My Project/Settings.Designer.vb index 3040a6b3..e2f5dfc9 100644 --- a/Patterns/My Project/Settings.Designer.vb +++ b/Patterns/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Patterns/Patterns.vbproj b/Patterns/Patterns.vbproj index 861dc26b..0fe15dfc 100644 --- a/Patterns/Patterns.vbproj +++ b/Patterns/Patterns.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Patterns 512 Windows - v4.8 + v4.6.2 diff --git a/Patterns/app.config b/Patterns/app.config index 4934484b..99f551b0 100644 --- a/Patterns/app.config +++ b/Patterns/app.config @@ -8,4 +8,4 @@ - + diff --git a/Windows/My Project/Settings.Designer.vb b/Windows/My Project/Settings.Designer.vb index c038d216..96a20b6e 100644 --- a/Windows/My Project/Settings.Designer.vb +++ b/Windows/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj index 22ced1c6..2ff51567 100644 --- a/Windows/Windows.vbproj +++ b/Windows/Windows.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Windows 512 Windows - v4.8 + v4.6.2 diff --git a/Windream/My Project/Settings.Designer.vb b/Windream/My Project/Settings.Designer.vb index 518a9b6d..666f73a6 100644 --- a/Windream/My Project/Settings.Designer.vb +++ b/Windream/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/Windream/Windream.vbproj b/Windream/Windream.vbproj index 9f1d02ce..21e62780 100644 --- a/Windream/Windream.vbproj +++ b/Windream/Windream.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.Windream 512 Windows - v4.8 + v4.6.2 diff --git a/ZooFlow/My Project/Settings.Designer.vb b/ZooFlow/My Project/Settings.Designer.vb index 26496ddb..5ea84a63 100644 --- a/ZooFlow/My Project/Settings.Designer.vb +++ b/ZooFlow/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/ZooFlow/ZooFlow.vbproj b/ZooFlow/ZooFlow.vbproj index a34b5ebc..c6f2363f 100644 --- a/ZooFlow/ZooFlow.vbproj +++ b/ZooFlow/ZooFlow.vbproj @@ -10,7 +10,7 @@ DigitalData.Modules.ZooFlow 512 Windows - v4.8 + v4.6.2 diff --git a/ZooFlow/app.config b/ZooFlow/app.config index 4934484b..99f551b0 100644 --- a/ZooFlow/app.config +++ b/ZooFlow/app.config @@ -8,4 +8,4 @@ - +