diff --git a/Controls.ChatControl/ChatControl.Designer.vb b/Controls.ChatControl/ChatControl.Designer.vb new file mode 100644 index 00000000..87731564 --- /dev/null +++ b/Controls.ChatControl/ChatControl.Designer.vb @@ -0,0 +1,231 @@ + _ +Partial Class ChatControl + Inherits System.Windows.Forms.UserControl + + 'UserControl1 ü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.components = New System.ComponentModel.Container() + Dim ItemTemplate3 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() + Dim TableColumnDefinition7 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition8 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TileViewItemElement7 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement8 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement9 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TableRowDefinition7 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition8 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim ItemTemplate4 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate() + Dim TableColumnDefinition9 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition10 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TileViewItemElement10 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement11 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement12 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TableRowDefinition9 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition10 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableColumnDefinition11 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition12 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableRowDefinition11 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition12 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Me.columnUsername = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.columnMessage = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.columnDate = New DevExpress.XtraGrid.Columns.TileViewColumn() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridChat = New DevExpress.XtraGrid.GridControl() + Me.ChatView = New DevExpress.XtraGrid.Views.Tile.TileView() + Me.txtMessage = New DevExpress.XtraEditors.MemoEdit() + Me.ChatSource = New System.Windows.Forms.BindingSource(Me.components) + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.SuspendLayout() + CType(Me.GridChat, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChatView, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtMessage.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChatSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'columnUsername + ' + Me.columnUsername.FieldName = "USERNAME" + Me.columnUsername.Name = "columnUsername" + Me.columnUsername.Visible = True + Me.columnUsername.VisibleIndex = 1 + ' + 'columnMessage + ' + Me.columnMessage.FieldName = "MESSAGE" + Me.columnMessage.Name = "columnMessage" + Me.columnMessage.Visible = True + Me.columnMessage.VisibleIndex = 0 + ' + 'columnDate + ' + Me.columnDate.FieldName = "DATE" + Me.columnDate.Name = "columnDate" + Me.columnDate.Visible = True + Me.columnDate.VisibleIndex = 2 + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2 + Me.SplitContainerControl1.Horizontal = False + Me.SplitContainerControl1.IsSplitterFixed = True + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridChat) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + Me.SplitContainerControl1.Panel2.Controls.Add(Me.txtMessage) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(317, 314) + Me.SplitContainerControl1.SplitterPosition = 50 + Me.SplitContainerControl1.TabIndex = 0 + ' + 'GridChat + ' + Me.GridChat.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridChat.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridChat.Location = New System.Drawing.Point(0, 0) + Me.GridChat.MainView = Me.ChatView + Me.GridChat.Name = "GridChat" + Me.GridChat.Size = New System.Drawing.Size(317, 254) + Me.GridChat.TabIndex = 0 + Me.GridChat.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ChatView}) + ' + 'ChatView + ' + Me.ChatView.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.columnMessage, Me.columnUsername, Me.columnDate}) + Me.ChatView.GridControl = Me.GridChat + Me.ChatView.Name = "ChatView" + Me.ChatView.OptionsTiles.GroupTextPadding = New System.Windows.Forms.Padding(0) + Me.ChatView.OptionsTiles.IndentBetweenGroups = 0 + Me.ChatView.OptionsTiles.IndentBetweenItems = 0 + Me.ChatView.OptionsTiles.ItemPadding = New System.Windows.Forms.Padding(0) + Me.ChatView.OptionsTiles.ItemSize = New System.Drawing.Size(374, 64) + Me.ChatView.OptionsTiles.LayoutMode = DevExpress.XtraGrid.Views.Tile.TileViewLayoutMode.List + Me.ChatView.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical + Me.ChatView.OptionsTiles.RowCount = 0 + Me.ChatView.OptionsTiles.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollButtons + TableColumnDefinition7.Length.Value = 250.0R + TableColumnDefinition8.Length.Value = 100.0R + ItemTemplate3.Columns.Add(TableColumnDefinition7) + ItemTemplate3.Columns.Add(TableColumnDefinition8) + TileViewItemElement7.Column = Me.columnUsername + TileViewItemElement7.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement7.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement7.Text = "columnUsername" + TileViewItemElement7.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement7.TextLocation = New System.Drawing.Point(10, 0) + TileViewItemElement8.Column = Me.columnMessage + TileViewItemElement8.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement8.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement8.RowIndex = 1 + TileViewItemElement8.Text = "columnMessage" + TileViewItemElement8.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement8.TextLocation = New System.Drawing.Point(10, 0) + TileViewItemElement9.Column = Me.columnDate + TileViewItemElement9.ColumnIndex = 1 + TileViewItemElement9.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement9.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement9.Text = "columnDate" + TileViewItemElement9.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement9.TextLocation = New System.Drawing.Point(-10, 0) + ItemTemplate3.Elements.Add(TileViewItemElement7) + ItemTemplate3.Elements.Add(TileViewItemElement8) + ItemTemplate3.Elements.Add(TileViewItemElement9) + ItemTemplate3.Name = "ChatLeft" + TableRowDefinition7.Length.Value = 24.0R + TableRowDefinition8.Length.Value = 24.0R + ItemTemplate3.Rows.Add(TableRowDefinition7) + ItemTemplate3.Rows.Add(TableRowDefinition8) + TableColumnDefinition9.Length.Value = 100.0R + TableColumnDefinition10.Length.Value = 250.0R + ItemTemplate4.Columns.Add(TableColumnDefinition9) + ItemTemplate4.Columns.Add(TableColumnDefinition10) + TileViewItemElement10.Column = Me.columnUsername + TileViewItemElement10.ColumnIndex = 1 + TileViewItemElement10.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement10.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement10.Text = "columnUsername" + TileViewItemElement10.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement10.TextLocation = New System.Drawing.Point(-10, 0) + TileViewItemElement11.Column = Me.columnMessage + TileViewItemElement11.ColumnIndex = 1 + TileViewItemElement11.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement11.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement11.RowIndex = 1 + TileViewItemElement11.Text = "columnMessage" + TileViewItemElement11.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleRight + TileViewItemElement11.TextLocation = New System.Drawing.Point(-10, 0) + TileViewItemElement12.Column = Me.columnDate + TileViewItemElement12.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement12.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement12.Text = "columnDate" + TileViewItemElement12.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement12.TextLocation = New System.Drawing.Point(10, 0) + ItemTemplate4.Elements.Add(TileViewItemElement10) + ItemTemplate4.Elements.Add(TileViewItemElement11) + ItemTemplate4.Elements.Add(TileViewItemElement12) + ItemTemplate4.Name = "ChatRight" + TableRowDefinition9.Length.Value = 24.0R + TableRowDefinition10.Length.Value = 24.0R + ItemTemplate4.Rows.Add(TableRowDefinition9) + ItemTemplate4.Rows.Add(TableRowDefinition10) + Me.ChatView.Templates.Add(ItemTemplate3) + Me.ChatView.Templates.Add(ItemTemplate4) + Me.ChatView.TileColumns.Add(TableColumnDefinition11) + Me.ChatView.TileColumns.Add(TableColumnDefinition12) + Me.ChatView.TileRows.Add(TableRowDefinition11) + Me.ChatView.TileRows.Add(TableRowDefinition12) + ' + 'txtMessage + ' + Me.txtMessage.Dock = System.Windows.Forms.DockStyle.Fill + Me.txtMessage.Location = New System.Drawing.Point(0, 0) + Me.txtMessage.Name = "txtMessage" + Me.txtMessage.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMessage.Properties.Appearance.Options.UseFont = True + Me.txtMessage.Size = New System.Drawing.Size(317, 50) + Me.txtMessage.TabIndex = 1 + ' + 'ChatControl + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.SplitContainerControl1) + Me.Name = "ChatControl" + Me.Size = New System.Drawing.Size(317, 314) + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.GridChat, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChatView, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtMessage.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChatSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents GridChat As DevExpress.XtraGrid.GridControl + Friend WithEvents ChatView As DevExpress.XtraGrid.Views.Tile.TileView + Friend WithEvents txtMessage As DevExpress.XtraEditors.MemoEdit + Friend WithEvents columnMessage As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents columnUsername As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents columnDate As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents ChatSource As BindingSource +End Class diff --git a/Controls.ChatControl/ChatControl.resx b/Controls.ChatControl/ChatControl.resx new file mode 100644 index 00000000..ce02ca62 --- /dev/null +++ b/Controls.ChatControl/ChatControl.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/Controls.ChatControl/ChatControl.vb b/Controls.ChatControl/ChatControl.vb new file mode 100644 index 00000000..c8ab2553 --- /dev/null +++ b/Controls.ChatControl/ChatControl.vb @@ -0,0 +1,115 @@ +Imports DevExpress.XtraGrid.Views.Tile +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging + +Public Class ChatControl + Private ReadOnly IdColumn As String = "ID" + Private ReadOnly UsernameColumn As String = "USERNAME" + Private ReadOnly MessageColumn As String = "MESSAGE" + Private ReadOnly DateColumn As String = "DATE" + + Private Db As MSSQLServer + Private LogConfig As LogConfig + Private Logger As Logger + + Private ReadOnly UsernameColorsDict As New Dictionary(Of String, Color) + Private ReadOnly UsernameColors As New List(Of Color) From { + Color.Purple, + Color.Red, + Color.LightBlue, + Color.DarkSeaGreen + } + + Public IDBObjectId As Long + Public ConnectionString As String + + Public Sub New() + InitializeComponent() + End Sub + + Public Sub Init(ConnectionString As String, IDBObjectId As Long, CurrentUser As String) + + End Sub + + Public Function InitData() As DataTable + Dim oDatatable As New DataTable() + Dim oColumns As New List(Of DataColumn) From { + New DataColumn(IdColumn, New Integer.GetType), + New DataColumn(UsernameColumn), + New DataColumn(MessageColumn), + New DataColumn(DateColumn, New Date.GetType) + } + oDatatable.Columns.AddRange(oColumns.ToArray) + + Dim oRow1 = oDatatable.NewRow() + With oRow1 + .Item(IdColumn) = 0 + .Item(UsernameColumn) = "Jonathan" + .Item(MessageColumn) = "Hi" + .Item(DateColumn) = Now.AddMinutes(-10).ToShortTimeString + End With + + Dim oRow2 = oDatatable.NewRow() + With oRow2 + .Item(IdColumn) = 0 + .Item(UsernameColumn) = "Marlon" + .Item(MessageColumn) = "Was geht?" + .Item(DateColumn) = Now.ToShortTimeString + End With + + oDatatable.Rows.Add(oRow1) + oDatatable.Rows.Add(oRow2) + oDatatable.AcceptChanges() + + Return oDatatable + End Function + + Private Sub ChatControl_Load(sender As Object, e As EventArgs) Handles Me.Load + Dim oDatatable = InitData() + + BuildUsernameColorDict(oDatatable) + + GridChat.DataSource = ChatSource + ChatSource.DataSource = oDatatable + End Sub + + Private Sub BuildUsernameColorDict(Datatable As DataTable) + Dim oIndex = 0 + + Datatable.AsEnumerable(). + Select(Function(Row) Row.Item(UsernameColumn)). + Distinct().ToList(). + ForEach(Sub(Name) + UsernameColorsDict.Add(Name, UsernameColors.Item(oIndex)) + oIndex += 1 + End Sub) + End Sub + + Private Sub ChatView_CustomItemTemplate(sender As Object, e As DevExpress.XtraGrid.Views.Tile.TileViewCustomItemTemplateEventArgs) Handles ChatView.CustomItemTemplate + Dim oRow As DataRow = ChatView.GetDataRow(e.RowHandle) + Dim oUsername As String = oRow.Item(UsernameColumn) + + If oUsername = "Jonathan" Then + e.Template = e.Templates.Item("ChatRight") + Else + e.Template = e.Templates.Item("ChatLeft") + End If + End Sub + + Private Sub ChatView_ItemCustomize(sender As Object, e As TileViewItemCustomizeEventArgs) Handles ChatView.ItemCustomize + Dim oRow As DataRow = ChatView.GetDataRow(e.RowHandle) + Dim oUsername As String = oRow.Item(UsernameColumn) + Dim oColor As Color = UsernameColorsDict.Item(oUsername) + + If oUsername = "Jonathan" Then + e.Item.AppearanceItem.Normal.BackColor = Color.LightGray + End If + e.Item.Item(UsernameColumn).Appearance.Normal.ForeColor = oColor + End Sub + + Private Sub txtMessage_KeyUp(sender As Object, e As KeyEventArgs) Handles txtMessage.KeyUp + If e.Control And e.KeyCode = Keys.Enter Then + + End If + End Sub +End Class diff --git a/Controls.ChatControl/ChatControl.vbproj b/Controls.ChatControl/ChatControl.vbproj new file mode 100644 index 00000000..ea28a54f --- /dev/null +++ b/Controls.ChatControl/ChatControl.vbproj @@ -0,0 +1,144 @@ + + + + + Debug + AnyCPU + {1F278760-4F6B-42E8-B82D-01D4C8618340} + Library + DigitalData.Controls.ChatControl + DigitalData.Controls.ChatControl + 512 + Windows + v4.7.2 + true + + + true + full + true + true + bin\Debug\ + DigitalData.Controls.ChatControl.xml + _MYFORMS=True + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + pdbonly + false + true + true + bin\Release\ + DigitalData.Controls.ChatControl.xml + _MYFORMS=True + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + Application.myapp + + + UserControl + + + ChatControl.vb + + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + ChatControl.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + + + {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} + Database + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + + + \ No newline at end of file diff --git a/Controls.ChatControl/My Project/Application.Designer.vb b/Controls.ChatControl/My Project/Application.Designer.vb new file mode 100644 index 00000000..8ab460ba --- /dev/null +++ b/Controls.ChatControl/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' 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/Controls.ChatControl/My Project/Application.myapp b/Controls.ChatControl/My Project/Application.myapp new file mode 100644 index 00000000..758895de --- /dev/null +++ b/Controls.ChatControl/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + false + false + 0 + true + 0 + 1 + true + diff --git a/Controls.ChatControl/My Project/AssemblyInfo.vb b/Controls.ChatControl/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..f71c7e93 --- /dev/null +++ b/Controls.ChatControl/My Project/AssemblyInfo.vb @@ -0,0 +1,34 @@ +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 wird für die typelib-ID verwendet, 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, +' indem Sie "*" wie unten gezeigt eingeben: + + + diff --git a/Controls.ChatControl/My Project/Resources.Designer.vb b/Controls.ChatControl/My Project/Resources.Designer.vb new file mode 100644 index 00000000..150629e8 --- /dev/null +++ b/Controls.ChatControl/My Project/Resources.Designer.vb @@ -0,0 +1,63 @@ +'------------------------------------------------------------------------------ +' +' 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.Controls.ChatControl.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/Controls.ChatControl/My Project/Resources.resx b/Controls.ChatControl/My Project/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/Controls.ChatControl/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Controls.ChatControl/My Project/Settings.Designer.vb b/Controls.ChatControl/My Project/Settings.Designer.vb new file mode 100644 index 00000000..7e6d6ee8 --- /dev/null +++ b/Controls.ChatControl/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' 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.Controls.ChatControl.My.MySettings + Get + Return Global.DigitalData.Controls.ChatControl.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/Controls.ChatControl/My Project/Settings.settings b/Controls.ChatControl/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/Controls.ChatControl/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Controls.ChatControl/My Project/licenses.licx b/Controls.ChatControl/My Project/licenses.licx new file mode 100644 index 00000000..a360c698 --- /dev/null +++ b/Controls.ChatControl/My Project/licenses.licx @@ -0,0 +1,2 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index bd715555..42665861 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -78,7 +78,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Controls.DocumentViewer/packages.config +++ b/Controls.DocumentViewer/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 39372e2f..efc29723 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -114,10 +114,14 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "Serv EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.EDMIBenchmark", "GUIs.Test.EDMIBenchmark\GUIs.Test.EDMIBenchmark.vbproj", "{5FDEC007-7AE0-4829-B1AE-6165E29375DA}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatServer", "ChatServer\ChatServer.vbproj", "{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ChatServer", "ChatServer\ChatServer.vbproj", "{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatClient", "ChatClient\ChatClient.vbproj", "{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatControl", "Controls.ChatControl\ChatControl.vbproj", "{1F278760-4F6B-42E8-B82D-01D4C8618340}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatTest", "ChatTest\ChatTest.vbproj", "{4A726345-FD6B-4E1C-9E5D-18C9043D7714}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -308,6 +312,14 @@ Global {9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}.Debug|Any CPU.Build.0 = Debug|Any CPU {9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}.Release|Any CPU.ActiveCfg = Release|Any CPU {9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}.Release|Any CPU.Build.0 = Release|Any CPU + {1F278760-4F6B-42E8-B82D-01D4C8618340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F278760-4F6B-42E8-B82D-01D4C8618340}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F278760-4F6B-42E8-B82D-01D4C8618340}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F278760-4F6B-42E8-B82D-01D4C8618340}.Release|Any CPU.Build.0 = Release|Any CPU + {4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -359,6 +371,8 @@ Global {5FDEC007-7AE0-4829-B1AE-6165E29375DA} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {C8F9C3DD-9328-49E3-8530-48E6A4C82CAF} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} + {1F278760-4F6B-42E8-B82D-01D4C8618340} = {F98C0329-C004-417F-B2AB-7466E88D8220} + {4A726345-FD6B-4E1C-9E5D-18C9043D7714} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} diff --git a/EDMI.File/EDMI.File.vbproj b/EDMI.File/EDMI.File.vbproj index 10093658..8395d3ae 100644 --- a/EDMI.File/EDMI.File.vbproj +++ b/EDMI.File/EDMI.File.vbproj @@ -46,7 +46,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/EDMI.File/packages.config b/EDMI.File/packages.config index ef1d1ab0..1baeaab3 100644 --- a/EDMI.File/packages.config +++ b/EDMI.File/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj index 0ed02c9e..6b2b248c 100644 --- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj +++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj @@ -55,7 +55,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/GUIs.ClipboardWatcher/packages.config b/GUIs.ClipboardWatcher/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/GUIs.ClipboardWatcher/packages.config +++ b/GUIs.ClipboardWatcher/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 7a944000..e61036dd 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -62,7 +62,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/GUIs.Common/packages.config +++ b/GUIs.Common/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.Config/Config.vbproj b/Modules.Config/Config.vbproj index f1023808..4db9e89f 100644 --- a/Modules.Config/Config.vbproj +++ b/Modules.Config/Config.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Config/packages.config b/Modules.Config/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.Config/packages.config +++ b/Modules.Config/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.Database/Database.vbproj b/Modules.Database/Database.vbproj index 46730ac9..b9ae8073 100644 --- a/Modules.Database/Database.vbproj +++ b/Modules.Database/Database.vbproj @@ -59,7 +59,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll diff --git a/Modules.Database/packages.config b/Modules.Database/packages.config index f80f30ec..7fffa742 100644 --- a/Modules.Database/packages.config +++ b/Modules.Database/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index 6880d2de..db21be8f 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.EDMIAPI/packages.config b/Modules.EDMIAPI/packages.config index c1fd79a0..f8dbc83e 100644 --- a/Modules.EDMIAPI/packages.config +++ b/Modules.EDMIAPI/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.Filesystem/Filesystem.vbproj b/Modules.Filesystem/Filesystem.vbproj index 8f1e83fc..6bafb245 100644 --- a/Modules.Filesystem/Filesystem.vbproj +++ b/Modules.Filesystem/Filesystem.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll ..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll diff --git a/Modules.Filesystem/packages.config b/Modules.Filesystem/packages.config index f6c8c5a4..f3a378b6 100644 --- a/Modules.Filesystem/packages.config +++ b/Modules.Filesystem/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Modules.Interfaces/Interfaces.vbproj b/Modules.Interfaces/Interfaces.vbproj index e40f1254..a9bd218a 100644 --- a/Modules.Interfaces/Interfaces.vbproj +++ b/Modules.Interfaces/Interfaces.vbproj @@ -51,7 +51,7 @@ ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Interfaces/packages.config b/Modules.Interfaces/packages.config index 09a6f4d1..09e512cd 100644 --- a/Modules.Interfaces/packages.config +++ b/Modules.Interfaces/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Modules.Jobs/Jobs.vbproj b/Modules.Jobs/Jobs.vbproj index 8b7daa08..c809d6e9 100644 --- a/Modules.Jobs/Jobs.vbproj +++ b/Modules.Jobs/Jobs.vbproj @@ -118,7 +118,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Jobs/packages.config b/Modules.Jobs/packages.config index c6e89356..6447395e 100644 --- a/Modules.Jobs/packages.config +++ b/Modules.Jobs/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Modules.Language/Language.vbproj b/Modules.Language/Language.vbproj index 5181b529..ffffd8d2 100644 --- a/Modules.Language/Language.vbproj +++ b/Modules.Language/Language.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Language/packages.config b/Modules.Language/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.Language/packages.config +++ b/Modules.Language/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.License/License.vbproj b/Modules.License/License.vbproj index baf807df..b2f2eb36 100644 --- a/Modules.License/License.vbproj +++ b/Modules.License/License.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.License/packages.config b/Modules.License/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.License/packages.config +++ b/Modules.License/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.Logging/Logging.vbproj b/Modules.Logging/Logging.vbproj index ad3f13b2..985235ec 100644 --- a/Modules.Logging/Logging.vbproj +++ b/Modules.Logging/Logging.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Logging/packages.config b/Modules.Logging/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.Logging/packages.config +++ b/Modules.Logging/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.Messaging/Messaging.vbproj b/Modules.Messaging/Messaging.vbproj index 99473635..b7afaf09 100644 --- a/Modules.Messaging/Messaging.vbproj +++ b/Modules.Messaging/Messaging.vbproj @@ -48,7 +48,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll ..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll diff --git a/Modules.Messaging/packages.config b/Modules.Messaging/packages.config index 32985371..30212888 100644 --- a/Modules.Messaging/packages.config +++ b/Modules.Messaging/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Modules.Patterns/Patterns.vbproj b/Modules.Patterns/Patterns.vbproj index 5cd07153..01be2339 100644 --- a/Modules.Patterns/Patterns.vbproj +++ b/Modules.Patterns/Patterns.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Patterns/packages.config b/Modules.Patterns/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.Patterns/packages.config +++ b/Modules.Patterns/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.Windream/Windream.vbproj b/Modules.Windream/Windream.vbproj index f5db4b6a..91a95cc5 100644 --- a/Modules.Windream/Windream.vbproj +++ b/Modules.Windream/Windream.vbproj @@ -65,7 +65,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.Windream/packages.config b/Modules.Windream/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.Windream/packages.config +++ b/Modules.Windream/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.ZooFlow/ZooFlow.vbproj b/Modules.ZooFlow/ZooFlow.vbproj index 41499ffe..271ce2d5 100644 --- a/Modules.ZooFlow/ZooFlow.vbproj +++ b/Modules.ZooFlow/ZooFlow.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Modules.ZooFlow/packages.config b/Modules.ZooFlow/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Modules.ZooFlow/packages.config +++ b/Modules.ZooFlow/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Service.EDMIService/App.config b/Service.EDMIService/App.config index 8c1bd90e..4e4387a6 100644 --- a/Service.EDMIService/App.config +++ b/Service.EDMIService/App.config @@ -1,67 +1,55 @@ - + - - - - + + + + - + - + - - + + - + - + - + - + - - + + - - + + - + @@ -69,10 +57,10 @@ - + - + @@ -80,8 +68,8 @@ - - + + @@ -89,9 +77,9 @@ - - + + - + diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj index 444b5c26..865e59cf 100644 --- a/Service.EDMIService/EDMIService.vbproj +++ b/Service.EDMIService/EDMIService.vbproj @@ -68,7 +68,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Service.EDMIService/packages.config b/Service.EDMIService/packages.config index 380efd84..bac6970a 100644 --- a/Service.EDMIService/packages.config +++ b/Service.EDMIService/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Service.JobRunner/JobRunner.vbproj b/Service.JobRunner/JobRunner.vbproj index c1f26d4d..5922661c 100644 --- a/Service.JobRunner/JobRunner.vbproj +++ b/Service.JobRunner/JobRunner.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll ..\packages\Quartz.3.0.7\lib\net452\Quartz.dll diff --git a/Service.JobRunner/packages.config b/Service.JobRunner/packages.config index f3451819..9ee770de 100644 --- a/Service.JobRunner/packages.config +++ b/Service.JobRunner/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Services.EmailService/DDEmailService.vbproj b/Services.EmailService/DDEmailService.vbproj index 19744be0..998e122a 100644 --- a/Services.EmailService/DDEmailService.vbproj +++ b/Services.EmailService/DDEmailService.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Services.EmailService/packages.config b/Services.EmailService/packages.config index 9df4a30e..20d7a800 100644 --- a/Services.EmailService/packages.config +++ b/Services.EmailService/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Services.LicenseService/DDEDMLicenseService.vbproj b/Services.LicenseService/DDEDMLicenseService.vbproj index 1725b5a3..8c28073a 100644 --- a/Services.LicenseService/DDEDMLicenseService.vbproj +++ b/Services.LicenseService/DDEDMLicenseService.vbproj @@ -49,7 +49,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Services.LicenseService/packages.config b/Services.LicenseService/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Services.LicenseService/packages.config +++ b/Services.LicenseService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj index bfb02e47..38554a25 100644 --- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj +++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Services.ZUGFeRDService/packages.config b/Services.ZUGFeRDService/packages.config index 9df4a30e..20d7a800 100644 --- a/Services.ZUGFeRDService/packages.config +++ b/Services.ZUGFeRDService/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj index 6979bef1..8d327b9f 100644 --- a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj +++ b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj @@ -9,7 +9,7 @@ - + diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj index f0dba021..b2611b70 100644 --- a/Windows/Windows.vbproj +++ b/Windows/Windows.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.0\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll diff --git a/Windows/packages.config b/Windows/packages.config index d7bc5b9d..f8dbc83e 100644 --- a/Windows/packages.config +++ b/Windows/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file