diff --git a/ConfigCreator/Config.vb b/ConfigCreator/Config.vb new file mode 100644 index 00000000..df1ba07c --- /dev/null +++ b/ConfigCreator/Config.vb @@ -0,0 +1,14 @@ +Public Class Config + + Public Property EmailTemplate As New EmailTemplateConfig + + Public Class EmailTemplateConfig + Public BaseHtml As String = "" + Public BannerUrl As String = "" + Public OutputPath As String = "" + Public TrackingLink As String = "" + Public ActiveDirectoryGroup As String = "" + End Class +End Class + + diff --git a/ConfigCreator/MonoRepoUtils.vbproj b/ConfigCreator/MonoRepoUtils.vbproj index b0a03f67..05d766db 100644 --- a/ConfigCreator/MonoRepoUtils.vbproj +++ b/ConfigCreator/MonoRepoUtils.vbproj @@ -82,6 +82,7 @@ + frmStart.vb @@ -134,6 +135,10 @@ {44982f9b-6116-44e2-85d0-f39650b1ef99} Config + + {ab6f09bf-e794-4f6a-94bb-c97c0ba84d64} + Interfaces + {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging @@ -143,5 +148,11 @@ DDZUGFeRDService + + + + + + \ No newline at end of file diff --git a/ConfigCreator/My Project/Resources.Designer.vb b/ConfigCreator/My Project/Resources.Designer.vb index 86b5aba7..e8e5847e 100644 --- a/ConfigCreator/My Project/Resources.Designer.vb +++ b/ConfigCreator/My Project/Resources.Designer.vb @@ -69,5 +69,25 @@ Namespace My.Resources Return CType(obj,DevExpress.Utils.Svg.SvgImage) End Get End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property defaultprinter() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("defaultprinter", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property defaultprinter1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("defaultprinter1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property End Module End Namespace diff --git a/ConfigCreator/My Project/Resources.resx b/ConfigCreator/My Project/Resources.resx index 31ffe06a..0ac49a57 100644 --- a/ConfigCreator/My Project/Resources.resx +++ b/ConfigCreator/My Project/Resources.resx @@ -118,7 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\defaultprinter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\3trafficlightsrimmed.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\defaultprinter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/ConfigCreator/My Project/licenses.licx b/ConfigCreator/My Project/licenses.licx index 560eacb2..74c5a313 100644 --- a/ConfigCreator/My Project/licenses.licx +++ b/ConfigCreator/My Project/licenses.licx @@ -1,4 +1,5 @@ DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.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 DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ConfigCreator/Resources/defaultprinter.svg b/ConfigCreator/Resources/defaultprinter.svg new file mode 100644 index 00000000..22651c89 --- /dev/null +++ b/ConfigCreator/Resources/defaultprinter.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/ConfigCreator/Resources/defaultprinter1.svg b/ConfigCreator/Resources/defaultprinter1.svg new file mode 100644 index 00000000..22651c89 --- /dev/null +++ b/ConfigCreator/Resources/defaultprinter1.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/ConfigCreator/frmStart.Designer.vb b/ConfigCreator/frmStart.Designer.vb index 6f8a6da6..595e80da 100644 --- a/ConfigCreator/frmStart.Designer.vb +++ b/ConfigCreator/frmStart.Designer.vb @@ -33,11 +33,24 @@ Partial Class frmStart Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.txxTemplate = New DevExpress.XtraEditors.MemoEdit() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.txtBannerUrl = New DevExpress.XtraEditors.TextEdit() + Me.txtTrackingUrl = New DevExpress.XtraEditors.TextEdit() + Me.txtOutputPath = New DevExpress.XtraEditors.TextEdit() + Me.txtADGroup = New DevExpress.XtraEditors.TextEdit() + Me.SimpleButton2 = New DevExpress.XtraEditors.SimpleButton() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -51,16 +64,31 @@ Partial Class frmStart CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() + Me.XtraTabPage2.SuspendLayout() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl2.SuspendLayout() + CType(Me.txxTemplate.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtBannerUrl.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtTrackingUrl.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtOutputPath.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtADGroup.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ComboBoxEdit1 ' - Me.ComboBoxEdit1.Location = New System.Drawing.Point(100, 12) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(108, 20) Me.ComboBoxEdit1.Name = "ComboBoxEdit1" Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEdit1.Properties.Items.AddRange(New Object() {"ZUGFERD_SERVICE"}) - Me.ComboBoxEdit1.Size = New System.Drawing.Size(758, 20) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(742, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 0 ' @@ -79,19 +107,19 @@ Partial Class frmStart ' 'MemoEdit1 ' - Me.MemoEdit1.Location = New System.Drawing.Point(12, 54) + Me.MemoEdit1.Location = New System.Drawing.Point(20, 78) Me.MemoEdit1.Name = "MemoEdit1" Me.MemoEdit1.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit1.Properties.Appearance.Options.UseFont = True - Me.MemoEdit1.Size = New System.Drawing.Size(1075, 325) + Me.MemoEdit1.Size = New System.Drawing.Size(1059, 293) Me.MemoEdit1.StyleController = Me.LayoutControl1 Me.MemoEdit1.TabIndex = 5 ' 'SimpleButton1 ' - Me.SimpleButton1.Location = New System.Drawing.Point(862, 12) + Me.SimpleButton1.Location = New System.Drawing.Point(870, 20) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(225, 22) + Me.SimpleButton1.Size = New System.Drawing.Size(209, 22) Me.SimpleButton1.StyleController = Me.LayoutControl1 Me.SimpleButton1.TabIndex = 4 Me.SimpleButton1.Text = "Get Config" @@ -110,7 +138,8 @@ Partial Class frmStart Me.LayoutControlItem1.Control = Me.ComboBoxEdit1 Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(850, 26) + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem1.Size = New System.Drawing.Size(850, 42) Me.LayoutControlItem1.Text = "Config Type" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(85, 13) ' @@ -119,16 +148,18 @@ Partial Class frmStart Me.LayoutControlItem2.Control = Me.SimpleButton1 Me.LayoutControlItem2.Location = New System.Drawing.Point(850, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(229, 26) + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem2.Size = New System.Drawing.Size(229, 42) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' 'LayoutControlItem3 ' Me.LayoutControlItem3.Control = Me.MemoEdit1 - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 26) + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 42) Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Size = New System.Drawing.Size(1079, 345) + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem3.Size = New System.Drawing.Size(1079, 329) Me.LayoutControlItem3.Text = "Config Template" Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem3.TextSize = New System.Drawing.Size(85, 13) @@ -161,37 +192,59 @@ Partial Class frmStart ' 'XtraTabPage2 ' + Me.XtraTabPage2.Controls.Add(Me.LayoutControl2) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1099, 393) - Me.XtraTabPage2.Text = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(1099, 391) + Me.XtraTabPage2.Text = "EmailSignature Generator" + ' + 'LayoutControl2 + ' + Me.LayoutControl2.Controls.Add(Me.txxTemplate) + Me.LayoutControl2.Controls.Add(Me.txtBannerUrl) + Me.LayoutControl2.Controls.Add(Me.txtTrackingUrl) + Me.LayoutControl2.Controls.Add(Me.txtOutputPath) + Me.LayoutControl2.Controls.Add(Me.txtADGroup) + Me.LayoutControl2.Controls.Add(Me.SimpleButton2) + Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl2.Name = "LayoutControl2" + Me.LayoutControl2.Root = Me.LayoutControlGroup1 + Me.LayoutControl2.Size = New System.Drawing.Size(1099, 391) + Me.LayoutControl2.TabIndex = 0 + Me.LayoutControl2.Text = "LayoutControl2" + ' + 'txxTemplate + ' + Me.txxTemplate.Location = New System.Drawing.Point(135, 126) + Me.txxTemplate.MenuManager = Me.RibbonControl1 + Me.txxTemplate.Name = "txxTemplate" + Me.txxTemplate.Size = New System.Drawing.Size(944, 245) + Me.txxTemplate.StyleController = Me.LayoutControl2 + Me.txxTemplate.TabIndex = 4 ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 2 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Size = New System.Drawing.Size(1101, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Generate!" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.MonoRepoUtils.My.Resources.Resources.defaultprinter + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "RibbonPage1" ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" - ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 573) @@ -199,6 +252,122 @@ Partial Class frmStart Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Size = New System.Drawing.Size(1101, 22) ' + 'txtBannerUrl + ' + Me.txtBannerUrl.Location = New System.Drawing.Point(135, 20) + Me.txtBannerUrl.MenuManager = Me.RibbonControl1 + Me.txtBannerUrl.Name = "txtBannerUrl" + Me.txtBannerUrl.Size = New System.Drawing.Size(361, 20) + Me.txtBannerUrl.StyleController = Me.LayoutControl2 + Me.txtBannerUrl.TabIndex = 5 + ' + 'txtTrackingUrl + ' + Me.txtTrackingUrl.Location = New System.Drawing.Point(631, 20) + Me.txtTrackingUrl.MenuManager = Me.RibbonControl1 + Me.txtTrackingUrl.Name = "txtTrackingUrl" + Me.txtTrackingUrl.Size = New System.Drawing.Size(448, 20) + Me.txtTrackingUrl.StyleController = Me.LayoutControl2 + Me.txtTrackingUrl.TabIndex = 6 + ' + 'txtOutputPath + ' + Me.txtOutputPath.Location = New System.Drawing.Point(631, 60) + Me.txtOutputPath.MenuManager = Me.RibbonControl1 + Me.txtOutputPath.Name = "txtOutputPath" + Me.txtOutputPath.Size = New System.Drawing.Size(448, 20) + Me.txtOutputPath.StyleController = Me.LayoutControl2 + Me.txtOutputPath.TabIndex = 7 + ' + 'txtADGroup + ' + Me.txtADGroup.Location = New System.Drawing.Point(135, 60) + Me.txtADGroup.MenuManager = Me.RibbonControl1 + Me.txtADGroup.Name = "txtADGroup" + Me.txtADGroup.Size = New System.Drawing.Size(361, 20) + Me.txtADGroup.StyleController = Me.LayoutControl2 + Me.txtADGroup.TabIndex = 8 + ' + 'SimpleButton2 + ' + Me.SimpleButton2.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft + Me.SimpleButton2.ImageOptions.SvgImage = Global.DigitalData.GUIs.MonoRepoUtils.My.Resources.Resources.defaultprinter1 + Me.SimpleButton2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.SimpleButton2.Location = New System.Drawing.Point(508, 92) + Me.SimpleButton2.Name = "SimpleButton2" + Me.SimpleButton2.Size = New System.Drawing.Size(579, 22) + Me.SimpleButton2.StyleController = Me.LayoutControl2 + Me.SimpleButton2.TabIndex = 9 + Me.SimpleButton2.Text = "Generate!" + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9}) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 391) + Me.LayoutControlGroup1.TextVisible = False + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.txxTemplate + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 106) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem4.Size = New System.Drawing.Size(1079, 265) + Me.LayoutControlItem4.Text = "HTML Template" + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13) + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.txtBannerUrl + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem5.Size = New System.Drawing.Size(496, 40) + Me.LayoutControlItem5.Text = "Banner URL" + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(112, 13) + ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.txtTrackingUrl + Me.LayoutControlItem6.Location = New System.Drawing.Point(496, 0) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem6.Size = New System.Drawing.Size(583, 40) + Me.LayoutControlItem6.Text = "Tracking URL" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(112, 13) + ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.txtADGroup + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 40) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem8.Size = New System.Drawing.Size(496, 66) + Me.LayoutControlItem8.Text = "ActiveDirectory Group" + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(112, 13) + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.txtOutputPath + Me.LayoutControlItem7.Location = New System.Drawing.Point(496, 40) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem7.Size = New System.Drawing.Size(583, 40) + Me.LayoutControlItem7.Text = "Output Path" + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(112, 13) + ' + 'LayoutControlItem9 + ' + Me.LayoutControlItem9.Control = Me.SimpleButton2 + Me.LayoutControlItem9.Location = New System.Drawing.Point(496, 80) + Me.LayoutControlItem9.Name = "LayoutControlItem9" + Me.LayoutControlItem9.Size = New System.Drawing.Size(583, 26) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem9.TextVisible = False + ' 'RibbonPage2 ' Me.RibbonPage2.Name = "RibbonPage2" @@ -212,7 +381,6 @@ Partial Class frmStart Me.Controls.Add(Me.FluentDesignFormContainer1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.IconOptions.SvgImage = Global.DigitalData.GUIs.MonoRepoUtils.My.Resources.Resources._3trafficlightsrimmed Me.Name = "frmStart" Me.Ribbon = Me.RibbonControl1 @@ -230,7 +398,22 @@ Partial Class frmStart CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) + Me.XtraTabPage2.ResumeLayout(False) + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl2.ResumeLayout(False) + CType(Me.txxTemplate.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtBannerUrl.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtTrackingUrl.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtOutputPath.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtADGroup.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -250,8 +433,21 @@ Partial Class frmStart Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents txxTemplate As MemoEdit + Friend WithEvents txtBannerUrl As TextEdit + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents txtTrackingUrl As TextEdit + Friend WithEvents txtOutputPath As TextEdit + Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents txtADGroup As TextEdit + Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents SimpleButton2 As SimpleButton + Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/ConfigCreator/frmStart.vb b/ConfigCreator/frmStart.vb index 4d317110..27859cb1 100644 --- a/ConfigCreator/frmStart.vb +++ b/ConfigCreator/frmStart.vb @@ -1,5 +1,8 @@ Imports System.IO Imports System.Xml.Serialization +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Interfaces Public Class frmStart Private Const ZUGFERD_SERVICE = "ZUGFERD_SERVICE" @@ -9,10 +12,24 @@ Public Class frmStart ZUGFERD_SERVICE } + Private LogConfig As LogConfig + Private Config As ConfigManager(Of Config) + Private ActiveDir As ActiveDirectoryInterface + Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load ComboBoxEdit1.Properties.Items.Clear() ComboBoxEdit1.Properties.Items.AddRange(Configs) + + LogConfig = New LogConfig(LogConfig.PathType.Temp, Nothing, Nothing, "Digital Data", "Monorepo Utils") + Config = New ConfigManager(Of Config)(LogConfig, Application.CommonAppDataPath) + ActiveDir = New ActiveDirectoryInterface(LogConfig) + + txxTemplate.Text = Config.Config.EmailTemplate.BaseHtml + txtBannerUrl.Text = Config.Config.EmailTemplate.BannerUrl + txtTrackingUrl.Text = Config.Config.EmailTemplate.TrackingLink + txtOutputPath.Text = Config.Config.EmailTemplate.OutputPath + txtADGroup.Text = Config.Config.EmailTemplate.ActiveDirectoryGroup End Sub Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click @@ -39,4 +56,18 @@ Public Class frmStart Return System.Text.Encoding.UTF8.GetString(oBytes) End Function + + Private Sub frmStart_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing + Config.Config.EmailTemplate.BaseHtml = txxTemplate.Text + Config.Config.EmailTemplate.BannerUrl = txtBannerUrl.Text + Config.Config.EmailTemplate.TrackingLink = txtTrackingUrl.Text + Config.Config.EmailTemplate.OutputPath = txtOutputPath.Text + Config.Config.EmailTemplate.ActiveDirectoryGroup = txtADGroup.Text + Config.Save() + End Sub + + Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click + Dim oUsers = ActiveDir.ListUsers(Config.Config.EmailTemplate.ActiveDirectoryGroup) + MsgBox(oUsers.Count & " found.", MsgBoxStyle.Information, "Yo") + End Sub End Class \ No newline at end of file diff --git a/Controls.ChatAddUser/ChatAddUser.vbproj b/Controls.ChatAddUser/ChatAddUser.vbproj index 5b928be5..96f3addf 100644 --- a/Controls.ChatAddUser/ChatAddUser.vbproj +++ b/Controls.ChatAddUser/ChatAddUser.vbproj @@ -60,7 +60,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Controls.ChatAddUser/packages.config b/Controls.ChatAddUser/packages.config index 6f6bc401..63f3075e 100644 --- a/Controls.ChatAddUser/packages.config +++ b/Controls.ChatAddUser/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Controls.ChatControl/ChatControl.vbproj b/Controls.ChatControl/ChatControl.vbproj index 23fdbe6f..efeea882 100644 --- a/Controls.ChatControl/ChatControl.vbproj +++ b/Controls.ChatControl/ChatControl.vbproj @@ -60,7 +60,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Controls.ChatControl/packages.config b/Controls.ChatControl/packages.config index 6f6bc401..63f3075e 100644 --- a/Controls.ChatControl/packages.config +++ b/Controls.ChatControl/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Controls.ChatNewConv/ChatNewConv.vbproj b/Controls.ChatNewConv/ChatNewConv.vbproj index 8760903c..1f103073 100644 --- a/Controls.ChatNewConv/ChatNewConv.vbproj +++ b/Controls.ChatNewConv/ChatNewConv.vbproj @@ -60,7 +60,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Controls.ChatNewConv/packages.config b/Controls.ChatNewConv/packages.config index 6f6bc401..63f3075e 100644 --- a/Controls.ChatNewConv/packages.config +++ b/Controls.ChatNewConv/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 0d016151..b828008e 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -78,7 +78,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll @@ -170,7 +170,6 @@ Settings.Designer.vb - @@ -179,6 +178,7 @@ + diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config index 6f6bc401..63f3075e 100644 --- a/Controls.DocumentViewer/packages.config +++ b/Controls.DocumentViewer/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Controls.SQLEditor/SQLEditor.vbproj b/Controls.SQLEditor/SQLEditor.vbproj index 2a069d73..3ec5cb1e 100644 --- a/Controls.SQLEditor/SQLEditor.vbproj +++ b/Controls.SQLEditor/SQLEditor.vbproj @@ -62,7 +62,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Controls.SQLEditor/packages.config b/Controls.SQLEditor/packages.config index 6f6bc401..63f3075e 100644 --- a/Controls.SQLEditor/packages.config +++ b/Controls.SQLEditor/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Encryption/Encryption.vbproj b/Encryption/Encryption.vbproj index 3c310ba8..2be3a057 100644 --- a/Encryption/Encryption.vbproj +++ b/Encryption/Encryption.vbproj @@ -46,7 +46,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Encryption/packages.config b/Encryption/packages.config index 6f6bc401..63f3075e 100644 --- a/Encryption/packages.config +++ b/Encryption/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 f78631ba..a04dd852 100644 --- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj +++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj @@ -60,7 +60,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/GUIs.ClipboardWatcher/packages.config b/GUIs.ClipboardWatcher/packages.config index 6f6bc401..63f3075e 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 c9018353..f78ba23f 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -59,7 +59,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config index 6f6bc401..63f3075e 100644 --- a/GUIs.Common/packages.config +++ b/GUIs.Common/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.GlobalIndexer/GlobalIndexer.vbproj b/GUIs.GlobalIndexer/GlobalIndexer.vbproj index 86364acf..66691af9 100644 --- a/GUIs.GlobalIndexer/GlobalIndexer.vbproj +++ b/GUIs.GlobalIndexer/GlobalIndexer.vbproj @@ -55,7 +55,7 @@ - ..\..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/GUIs.GlobalIndexer/packages.config b/GUIs.GlobalIndexer/packages.config index 6f6bc401..63f3075e 100644 --- a/GUIs.GlobalIndexer/packages.config +++ b/GUIs.GlobalIndexer/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index bd1451a5..ecb93b8c 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -71,7 +71,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll @@ -140,7 +140,6 @@ Settings.settings True - @@ -175,6 +174,7 @@ + diff --git a/GUIs.Monitor/packages.config b/GUIs.Monitor/packages.config index abeaf568..63f3075e 100644 --- a/GUIs.Monitor/packages.config +++ b/GUIs.Monitor/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj index 52e21353..8cad75ac 100644 --- a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj +++ b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj @@ -69,7 +69,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/GUIs.Test.EDMIBenchmark/packages.config b/GUIs.Test.EDMIBenchmark/packages.config index e305f91b..d4e65ac3 100644 --- a/GUIs.Test.EDMIBenchmark/packages.config +++ b/GUIs.Test.EDMIBenchmark/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index b4ccc364..cc9c41cf 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -60,7 +60,7 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll diff --git a/GUIs.Test.TestGUI/packages.config b/GUIs.Test.TestGUI/packages.config index ec0e49b8..22ea4667 100644 --- a/GUIs.Test.TestGUI/packages.config +++ b/GUIs.Test.TestGUI/packages.config @@ -1,7 +1,7 @@  - + diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj index d4978ff5..a34f8613 100644 --- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj +++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/GUIs.Test.ZUGFeRDTest/packages.config b/GUIs.Test.ZUGFeRDTest/packages.config index b0732c52..f5252b7d 100644 --- a/GUIs.Test.ZUGFeRDTest/packages.config +++ b/GUIs.Test.ZUGFeRDTest/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index fe2d061a..d07a6e5c 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -71,7 +71,7 @@ C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll False diff --git a/GUIs.ZooFlow/packages.config b/GUIs.ZooFlow/packages.config index 6f6bc401..63f3075e 100644 --- a/GUIs.ZooFlow/packages.config +++ b/GUIs.ZooFlow/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 efe22453..1d94a8cb 100644 --- a/Modules.Config/Config.vbproj +++ b/Modules.Config/Config.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Config/packages.config b/Modules.Config/packages.config index 6f6bc401..63f3075e 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 d8b0b982..04526263 100644 --- a/Modules.Database/Database.vbproj +++ b/Modules.Database/Database.vbproj @@ -60,7 +60,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\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 4d83c52a..0cbaa359 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.EDMI.File/EDMI.File.vbproj b/Modules.EDMI.File/EDMI.File.vbproj index 016995e1..ba20ad95 100644 --- a/Modules.EDMI.File/EDMI.File.vbproj +++ b/Modules.EDMI.File/EDMI.File.vbproj @@ -46,7 +46,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.EDMI.File/packages.config b/Modules.EDMI.File/packages.config index e305f91b..d4e65ac3 100644 --- a/Modules.EDMI.File/packages.config +++ b/Modules.EDMI.File/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index 5f7dbe71..44dae50c 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.EDMIAPI/app.config b/Modules.EDMIAPI/app.config index aa8c85fa..b35c050d 100644 --- a/Modules.EDMIAPI/app.config +++ b/Modules.EDMIAPI/app.config @@ -1,11 +1,11 @@ - + - + @@ -15,9 +15,7 @@ - + @@ -33,13 +31,19 @@ - + + + + + + + + + diff --git a/Modules.EDMIAPI/packages.config b/Modules.EDMIAPI/packages.config index 6f6bc401..63f3075e 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 e893b4c1..d8a2a9da 100644 --- a/Modules.Filesystem/Filesystem.vbproj +++ b/Modules.Filesystem/Filesystem.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\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 51d4b9aa..4841cbb8 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 179500e7..5a56b305 100644 --- a/Modules.Interfaces/Interfaces.vbproj +++ b/Modules.Interfaces/Interfaces.vbproj @@ -51,7 +51,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Interfaces/packages.config b/Modules.Interfaces/packages.config index 6ae0ba15..ef03c2c1 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 756bc825..6b265cd3 100644 --- a/Modules.Jobs/Jobs.vbproj +++ b/Modules.Jobs/Jobs.vbproj @@ -119,7 +119,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Jobs/packages.config b/Modules.Jobs/packages.config index d889866d..dcdadb44 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 411d1199..7fba1126 100644 --- a/Modules.Language/Language.vbproj +++ b/Modules.Language/Language.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Language/packages.config b/Modules.Language/packages.config index 6f6bc401..63f3075e 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 07302c8f..2eb05c1d 100644 --- a/Modules.License/License.vbproj +++ b/Modules.License/License.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.License/packages.config b/Modules.License/packages.config index 6f6bc401..63f3075e 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 3281a6f9..8e1b6c67 100644 --- a/Modules.Logging/Logging.vbproj +++ b/Modules.Logging/Logging.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Logging/packages.config b/Modules.Logging/packages.config index 6f6bc401..63f3075e 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 3552cfe6..f19f55f8 100644 --- a/Modules.Messaging/Messaging.vbproj +++ b/Modules.Messaging/Messaging.vbproj @@ -48,7 +48,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\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 cf1d4146..fcacaf63 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 41b5b3b7..ca03b414 100644 --- a/Modules.Patterns/Patterns.vbproj +++ b/Modules.Patterns/Patterns.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Patterns/packages.config b/Modules.Patterns/packages.config index 6f6bc401..63f3075e 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 8cb45537..efb1cce7 100644 --- a/Modules.Windream/Windream.vbproj +++ b/Modules.Windream/Windream.vbproj @@ -65,7 +65,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.Windream/packages.config b/Modules.Windream/packages.config index 6f6bc401..63f3075e 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 05728d71..9b6c06c4 100644 --- a/Modules.ZooFlow/ZooFlow.vbproj +++ b/Modules.ZooFlow/ZooFlow.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Modules.ZooFlow/packages.config b/Modules.ZooFlow/packages.config index 6f6bc401..63f3075e 100644 --- a/Modules.ZooFlow/packages.config +++ b/Modules.ZooFlow/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SQLConfig/SQLConfig.vbproj b/SQLConfig/SQLConfig.vbproj index a4978ee1..a521f3e9 100644 --- a/SQLConfig/SQLConfig.vbproj +++ b/SQLConfig/SQLConfig.vbproj @@ -60,7 +60,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/SQLConfig/packages.config b/SQLConfig/packages.config index 6f6bc401..63f3075e 100644 --- a/SQLConfig/packages.config +++ b/SQLConfig/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj index e42dc00c..a407f6bd 100644 --- a/Service.EDMIService/EDMIService.vbproj +++ b/Service.EDMIService/EDMIService.vbproj @@ -74,7 +74,7 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll diff --git a/Service.EDMIService/packages.config b/Service.EDMIService/packages.config index bab29d1b..8571a474 100644 --- a/Service.EDMIService/packages.config +++ b/Service.EDMIService/packages.config @@ -2,7 +2,7 @@ - + diff --git a/Service.JobRunner/JobRunner.vbproj b/Service.JobRunner/JobRunner.vbproj index 2a9edc6c..c6fb482a 100644 --- a/Service.JobRunner/JobRunner.vbproj +++ b/Service.JobRunner/JobRunner.vbproj @@ -55,7 +55,7 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll ..\packages\Quartz.3.3.2\lib\net461\Quartz.dll diff --git a/Service.JobRunner/packages.config b/Service.JobRunner/packages.config index fe5d07b1..365826dc 100644 --- a/Service.JobRunner/packages.config +++ b/Service.JobRunner/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Services.EmailService/DDEmailService.vbproj b/Services.EmailService/DDEmailService.vbproj index 79d797c2..d3f1d31f 100644 --- a/Services.EmailService/DDEmailService.vbproj +++ b/Services.EmailService/DDEmailService.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Services.EmailService/packages.config b/Services.EmailService/packages.config index b0732c52..f5252b7d 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 f987d40a..e7bc385d 100644 --- a/Services.LicenseService/DDEDMLicenseService.vbproj +++ b/Services.LicenseService/DDEDMLicenseService.vbproj @@ -49,7 +49,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Services.LicenseService/packages.config b/Services.LicenseService/packages.config index 6f6bc401..63f3075e 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 2b3fe237..91ba160d 100644 --- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj +++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Services.ZUGFeRDService/packages.config b/Services.ZUGFeRDService/packages.config index b0732c52..f5252b7d 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 407bca0b..a8fcddbf 100644 --- a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj +++ b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj index 6f1f3f93..9a4b1ab0 100644 --- a/Windows/Windows.vbproj +++ b/Windows/Windows.vbproj @@ -45,7 +45,7 @@ - ..\packages\NLog.4.7.5\lib\net45\NLog.dll + ..\packages\NLog.4.7.10\lib\net45\NLog.dll diff --git a/Windows/packages.config b/Windows/packages.config index 6f6bc401..63f3075e 100644 --- a/Windows/packages.config +++ b/Windows/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file