diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 60f7c947..23aa92d6 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -58,8 +58,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JobRunner", "Service.JobRun EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControlGui", "LookupControlGui\LookupControlGui.vbproj", "{B65E24B3-D334-455D-A0BF-B33B8358B013}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MonoDiag", "LoggerDiag\MonoDiag.vbproj", "{3D437957-B90B-4D8F-9219-6D19B0C90994}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Language", "Modules.Language\Language.vbproj", "{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RegexEditor", "Controls.RegexEditor\RegexEditor.vbproj", "{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}" @@ -200,10 +198,6 @@ Global {B65E24B3-D334-455D-A0BF-B33B8358B013}.Debug|Any CPU.Build.0 = Debug|Any CPU {B65E24B3-D334-455D-A0BF-B33B8358B013}.Release|Any CPU.ActiveCfg = Release|Any CPU {B65E24B3-D334-455D-A0BF-B33B8358B013}.Release|Any CPU.Build.0 = Release|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Release|Any CPU.Build.0 = Release|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -354,7 +348,6 @@ Global {7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {926E6474-5613-4373-BB99-B101158B91EF} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {B65E24B3-D334-455D-A0BF-B33B8358B013} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} - {3D437957-B90B-4D8F-9219-6D19B0C90994} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {D3C8CFED-D6F6-43A8-9BDF-454145D0352F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2} = {F98C0329-C004-417F-B2AB-7466E88D8220} {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} diff --git a/LoggerDiag/App.config b/LoggerDiag/App.config deleted file mode 100644 index 5534e287..00000000 --- a/LoggerDiag/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/LoggerDiag/DummyConfig.vb b/LoggerDiag/DummyConfig.vb deleted file mode 100644 index 8fe9c12d..00000000 --- a/LoggerDiag/DummyConfig.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class DummyConfig - Public SomeSetting As String = "Default_Value" -End Class diff --git a/LoggerDiag/MonoDiag.vbproj b/LoggerDiag/MonoDiag.vbproj deleted file mode 100644 index c374a4ff..00000000 --- a/LoggerDiag/MonoDiag.vbproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - AnyCPU - {3D437957-B90B-4D8F-9219-6D19B0C90994} - WinExe - MonoDiag.My.MyApplication - MonoDiag - MonoDiag - 512 - WindowsForms - v4.6.1 - true - - - AnyCPU - true - full - true - true - bin\Debug\ - MonoDiag.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - MonoDiag.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - ..\packages\NLog.4.5.11\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - frmMain.vb - Form - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - frmMain.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - - - - \ No newline at end of file diff --git a/LoggerDiag/My Project/Application.Designer.vb b/LoggerDiag/My Project/Application.Designer.vb deleted file mode 100644 index a12c37f8..00000000 --- a/LoggerDiag/My Project/Application.Designer.vb +++ /dev/null @@ -1,38 +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 - - 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten - ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. - ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im - ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. - ' - Partial Friend Class MyApplication - - _ - Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false - Me.EnableVisualStyles = true - Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses - End Sub - - _ - Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.MonoDiag.frmMain - End Sub - End Class -End Namespace diff --git a/LoggerDiag/My Project/Application.myapp b/LoggerDiag/My Project/Application.myapp deleted file mode 100644 index 739ea6fe..00000000 --- a/LoggerDiag/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - true - frmMain - false - 0 - true - 0 - true - \ No newline at end of file diff --git a/LoggerDiag/My Project/AssemblyInfo.vb b/LoggerDiag/My Project/AssemblyInfo.vb deleted file mode 100644 index 5af86104..00000000 --- a/LoggerDiag/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - - - - - -'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. - - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' übernehmen, indem Sie "*" eingeben: -' - - - diff --git a/LoggerDiag/My Project/Resources.Designer.vb b/LoggerDiag/My Project/Resources.Designer.vb deleted file mode 100644 index b31b1912..00000000 --- a/LoggerDiag/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("MonoDiag.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/LoggerDiag/My Project/Resources.resx b/LoggerDiag/My Project/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/LoggerDiag/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/LoggerDiag/My Project/Settings.Designer.vb b/LoggerDiag/My Project/Settings.Designer.vb deleted file mode 100644 index b2d12459..00000000 --- a/LoggerDiag/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.MonoDiag.My.MySettings - Get - Return Global.MonoDiag.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/LoggerDiag/My Project/Settings.settings b/LoggerDiag/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/LoggerDiag/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/LoggerDiag/My Project/licenses.licx b/LoggerDiag/My Project/licenses.licx deleted file mode 100644 index 824a99fc..00000000 --- a/LoggerDiag/My Project/licenses.licx +++ /dev/null @@ -1 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/LoggerDiag/frmMain.Designer.vb b/LoggerDiag/frmMain.Designer.vb deleted file mode 100644 index 14cf6f4f..00000000 --- a/LoggerDiag/frmMain.Designer.vb +++ /dev/null @@ -1,122 +0,0 @@ - _ -Partial Class frmMain - Inherits System.Windows.Forms.Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - Me.GridControlLogs = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.btnRefresh = New System.Windows.Forms.Button() - Me.Button1 = New System.Windows.Forms.Button() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.Button2 = New System.Windows.Forms.Button() - CType(Me.GridControlLogs, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'GridControlLogs - ' - Me.GridControlLogs.Dock = System.Windows.Forms.DockStyle.Right - Me.GridControlLogs.Location = New System.Drawing.Point(251, 0) - Me.GridControlLogs.MainView = Me.GridView1 - Me.GridControlLogs.Name = "GridControlLogs" - Me.GridControlLogs.Size = New System.Drawing.Size(888, 679) - Me.GridControlLogs.TabIndex = 0 - Me.GridControlLogs.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.GridControl = Me.GridControlLogs - Me.GridView1.Name = "GridView1" - ' - 'btnRefresh - ' - Me.btnRefresh.Location = New System.Drawing.Point(12, 12) - Me.btnRefresh.Name = "btnRefresh" - Me.btnRefresh.Size = New System.Drawing.Size(233, 35) - Me.btnRefresh.TabIndex = 1 - Me.btnRefresh.Text = "Refresh Logs" - Me.btnRefresh.UseVisualStyleBackColor = True - ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(12, 53) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(233, 32) - Me.Button1.TabIndex = 2 - Me.Button1.Text = "Read Config" - Me.Button1.UseVisualStyleBackColor = True - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(12, 143) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(233, 20) - Me.TextBox1.TabIndex = 3 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(9, 127) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(109, 13) - Me.Label1.TabIndex = 4 - Me.Label1.Text = "Value of Test-Setting:" - ' - 'Button2 - ' - Me.Button2.Location = New System.Drawing.Point(12, 91) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(233, 33) - Me.Button2.TabIndex = 5 - Me.Button2.Text = "Save Config" - Me.Button2.UseVisualStyleBackColor = True - ' - 'frmMain - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1139, 679) - Me.Controls.Add(Me.Button2) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.TextBox1) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.btnRefresh) - Me.Controls.Add(Me.GridControlLogs) - Me.MinimumSize = New System.Drawing.Size(1155, 718) - Me.Name = "frmMain" - Me.Text = "Digital Data Diagnose" - CType(Me.GridControlLogs, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents GridControlLogs As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents btnRefresh As Button - Friend WithEvents Button1 As Button - Friend WithEvents TextBox1 As TextBox - Friend WithEvents Label1 As Label - Friend WithEvents Button2 As Button -End Class diff --git a/LoggerDiag/frmMain.resx b/LoggerDiag/frmMain.resx deleted file mode 100644 index 1af7de15..00000000 --- a/LoggerDiag/frmMain.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LoggerDiag/frmMain.vb b/LoggerDiag/frmMain.vb deleted file mode 100644 index 2fc491b3..00000000 --- a/LoggerDiag/frmMain.vb +++ /dev/null @@ -1,62 +0,0 @@ -Imports System.IO -Imports DigitalData.Modules.Config -Imports DigitalData.Modules.Logging - -Public Class frmMain - Public LogConfig As LogConfig - Public Logger As Logger - Public Config As ConfigManager(Of DummyConfig) - - - Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load - LogConfig = New LogConfig(LogConfig.PathType.AppData) With { - .Debug = True - } - - Dim productName As String = My.Application.Info.ProductName - Dim companyName As String = My.Application.Info.CompanyName - - Dim appDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) - Dim basePath = Path.Combine(appDataDir, companyName, productName, "Log") - - Logger = LogConfig.GetLogger() - Logger.Info("Initializing Config") - Logger.Info("Logging Path: {0}", basePath) - Logger.Info("UserConfig.xml Path: {0}", Application.UserAppDataPath) - Logger.Info("ComputerConfig.xml Path: {0}", Application.CommonAppDataPath) - - Config = New ConfigManager(Of DummyConfig)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath) - - RefreshLogs() - End Sub - - Private Sub RefreshLogs() - GridControlLogs.DataSource = LogConfig.Logs - End Sub - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click - RefreshLogs() - End Sub - - Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click - Try - Logger.Info("Value of TestSetting is: {0}", Config.Config.SomeSetting) - TextBox1.Text = Config.Config.SomeSetting - RefreshLogs() - Catch ex As Exception - Logger.Error(ex) - RefreshLogs() - End Try - End Sub - - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - Try - Config.Config.SomeSetting = TextBox1.Text - Config.Save() - RefreshLogs() - Catch ex As Exception - Logger.Error(ex) - RefreshLogs() - End Try - End Sub -End Class diff --git a/LoggerDiag/packages.config b/LoggerDiag/packages.config deleted file mode 100644 index f89fa324..00000000 --- a/LoggerDiag/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file