rename EDMIAPI to EDMI.API, Rename IDBService to EDMIService

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -53,13 +53,11 @@ Partial Class DocumentViewer
         Me.btnFlipY = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.btnSettings = New System.Windows.Forms.ToolStripButton()
-        Me.statusbar = New System.Windows.Forms.StatusStrip()
-        Me.infoLabel = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.statusLabel = New System.Windows.Forms.ToolStripStatusLabel()
         Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog()
         Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
+        Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
+        Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
         Me.mainToolStrip.SuspendLayout()
-        Me.statusbar.SuspendLayout()
         Me.SuspendLayout()
         '
         'GdViewer
@@ -103,7 +101,7 @@ Partial Class DocumentViewer
         Me.GdViewer.MagnifierZoomY = 2.0!
         Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
         Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
-        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom
+        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeVerticalScroll
         Me.GdViewer.Name = "GdViewer"
         Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
         Me.GdViewer.PageBordersPenSize = 1
@@ -125,7 +123,7 @@ Partial Class DocumentViewer
         Me.GdViewer.ScrollLargeChange = CType(50, Short)
         Me.GdViewer.ScrollSmallChange = CType(1, Short)
         Me.GdViewer.SilentMode = True
-        Me.GdViewer.Size = New System.Drawing.Size(1015, 537)
+        Me.GdViewer.Size = New System.Drawing.Size(1015, 559)
         Me.GdViewer.TabIndex = 0
         Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
         Me.GdViewer.Zoom = 1.0R
@@ -382,58 +380,44 @@ Partial Class DocumentViewer
         Me.btnSettings.Size = New System.Drawing.Size(28, 28)
         Me.btnSettings.Text = "Viewer settings"
         '
-        'statusbar
-        '
-        Me.statusbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.infoLabel, Me.statusLabel})
-        Me.statusbar.Location = New System.Drawing.Point(0, 568)
-        Me.statusbar.Name = "statusbar"
-        Me.statusbar.Size = New System.Drawing.Size(1015, 22)
-        Me.statusbar.SizingGrip = False
-        Me.statusbar.TabIndex = 7
-        Me.statusbar.Text = "StatusStrip1"
-        '
-        'infoLabel
-        '
-        Me.infoLabel.Name = "infoLabel"
-        Me.infoLabel.Size = New System.Drawing.Size(56, 17)
-        Me.infoLabel.Text = "infoLabel"
-        '
-        'statusLabel
-        '
-        Me.statusLabel.Name = "statusLabel"
-        Me.statusLabel.Size = New System.Drawing.Size(66, 17)
-        Me.statusLabel.Text = "statusLabel"
-        '
         'OpenFileDialog
         '
         Me.OpenFileDialog.FileName = "OpenFileDialog1"
         '
         'RichEditControl1
         '
-        Me.RichEditControl1.Location = New System.Drawing.Point(735, 313)
+        Me.RichEditControl1.Location = New System.Drawing.Point(735, 377)
         Me.RichEditControl1.Name = "RichEditControl1"
         Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
         Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
         Me.RichEditControl1.ReadOnly = True
-        Me.RichEditControl1.Size = New System.Drawing.Size(249, 225)
+        Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
         Me.RichEditControl1.TabIndex = 8
         Me.RichEditControl1.Text = "RichEditControl1"
         Me.RichEditControl1.Visible = False
         '
+        'SpreadsheetControl1
+        '
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(461, 377)
+        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
+        Me.SpreadsheetControl1.ReadOnly = True
+        Me.SpreadsheetControl1.Size = New System.Drawing.Size(268, 161)
+        Me.SpreadsheetControl1.TabIndex = 9
+        Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
+        Me.SpreadsheetControl1.Visible = False
+        '
         'DocumentViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.SpreadsheetControl1)
         Me.Controls.Add(Me.RichEditControl1)
         Me.Controls.Add(Me.GdViewer)
-        Me.Controls.Add(Me.statusbar)
         Me.Controls.Add(Me.mainToolStrip)
         Me.Name = "DocumentViewer"
         Me.Size = New System.Drawing.Size(1015, 590)
         Me.mainToolStrip.ResumeLayout(False)
         Me.mainToolStrip.PerformLayout()
-        Me.statusbar.ResumeLayout(False)
-        Me.statusbar.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -469,9 +453,8 @@ Partial Class DocumentViewer
     Friend WithEvents btnFlipY As ToolStripButton
     Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
     Friend WithEvents btnSettings As ToolStripButton
-    Friend WithEvents statusbar As StatusStrip
-    Friend WithEvents infoLabel As ToolStripStatusLabel
-    Friend WithEvents statusLabel As ToolStripStatusLabel
     Friend WithEvents OpenFileDialog As OpenFileDialog
     Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
+    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
+    Friend WithEvents PrintDocument1 As Printing.PrintDocument
 End Class

Controls.DocumentViewer/DocumentViewer.resx

@@ -124,13 +124,13 @@
   <data name="btnPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVVBToRAEESNF/+kv+AKNx5AQuBi5hMe3JDo
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVWxToRAEEWNjf+kf0FBRccHkBBozH6CjSHa
-        yQ+w8WR8iCfCgQ9sdsNBnLFrdtodBgmzu2IllanudHdN70IIppDnuSQqnEVRDE4mYqZp84MQ4pIGKF8c
+        aGVvuNL4IRIKvuFyFwpx13l7O96ySNi7E1/ysm8mM/N27iAEU8jzXBIVzqIoBicTMdO0+UEIcU4DlC8O
-        bZAkyfWyBkLcLLzBSm8gpdQD7JPJMXCUwV2xVufQjDmA3N+jKPrCU9H3vbrNK+JKohinre2cG0ODbdvq
+        NkiS5HJZAyGuFt7gUW8gpdQD7JPJMXCQwU2xUqfQjNmD3N+jKPrCU9H3vbrOK+K9RDFOW9s5N4YG27bV
-        pyuO488sy15g8PPo/aWBmdlrAyYMuPBU8n/CXHoDOTDouk6Jh1dqqHTx3uyg7ZwbQ6O3aZppg6qqVF3X
+        T1ccx59Zlr3A4OfR+0sDM7PXBkwYcOGx5P+EufQGcmDQdZ0Sd6/UUOnindle2zk3hkZv0zTTBlVVqbqu
-        ErfAqjhtbefcGBq9ZVmODZbkYIM5befceEr/zwZaGEBP3cjOufGUxkCdsMlFvnCHssbbjA/LmhIjE9AX
+        JW6BVXHa2s65MTR6y7IcGyzJwQZz2s658ZT+nw20MICeupGdc+MpjYE6YZOLfOEOZY23GR+WFSVGJqAv
-        v/USe+Kj+WHGQBHj+e1DPTlEjoHb4iNlWv1gG8zhbIO5DVAbhuGVafWDu4H75nIMnLrBxvTPIk3THbVc
+        fusl9sQH88OMgSLG89uHenKIHAO3xUfKtPrBNpjDyQZzG6A2DMML0+oHdwP3zeUYOHaDtemfRZqmW2o5
-        7Ds9Qbcij2KDTWa4Jd6bNgdB8A1sed+Z/8S0TAAAAABJRU5ErkJggg==
+        23V6gm5FHsUam8xwQ7w1bQ6C4BuAm93DSGjZ/gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnFitWidth.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -154,87 +154,87 @@
   <data name="btnMouseMode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AGVRqPQIDMjVH4AnWRV
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AFqjUKDzIxQ+QE0IqHS
-        GhEh7IwoFIRGIqLTULIkmLsRHwUNCZGlUEtQ0hESwnXPeDeZuGfNrCd5cjP3vefM7uxOphx9ffkqxy/0
+        iAhhZ0ShIDQSEVFTsiSYuxEfBQ0JkaVQS1DSERLCdc94N5m4Z82sJ3lyM/e958zu7E6mFD09uQrHz/e5
-        u4EKvZy6b8qufniB0nP5K401ujb7mOMczks0mbbR/QYnp85Q9Nut01trD+I8clLxN+ZT7bGS3vkjPbtR
+        gQq9rLpv6F/98AKl53JXGmt0bfYxxzmcl2gyLaP7dU5WnaHot1unt9YexHnkpOJvzKfaYyXd80d6dqMQ
-        jFY2R04qyuNNKpeF4fPbuwZY2TzS5KWK4/nhMg0a47B5pMlLFceZUBc0aIzD5hB5qeI4Y+qJBWEcNofI
+        rWyOnFSUxptULgvD57d3DbCyeaTJSxXH88NlGjTGYfNIk5cqjjOhLmjQGIfNIfJSxXHG1BMLwjhsDpGX
-        SxXHy6pPFoRx2DzS5KXKpnP6uJqGjN1TBX19+6RfzA+MFdfsHJQ6m9bByxoWiJtbPaf7JTuNUmdTusFB
+        Ko7Xqz5ZEMZh80iTlyqb9unjShoydk7l9fXtk34xPzBWXLNzUOpsmgcvq1ggbnb1nO4XbTdKnU3xBgeF
-        8eFfFi7uoptInQ37BngU2cUT7a+d65n1op7fvIpWXGOfPSqps0nziNIodTbN0/laFqhUqbPpGd6rY4FK
+        h3+Zv7iLbiJ1Nuwb4FH0L55of+1cz6wX9PzmVbTiGvvsUUmdTZpHlEaps2mczlWzQLlKnU3X8F4NC5Sr
-        lTqbn7/pyhcLpXflS+o4f73JaUx8k51AHbJgWpGXKo7rh0MsmFbkpYrTMbFT3x6oRxZOEjnkpao8rr87
+        1Nn8/E1XvlgovStfUsf5601OY+Kb7ATqkAXTirxUcVw/HGLBtCIvVZy2iZ3a1kA9snCSyCEvVaVx/d0B
-        wAqSRE4qknF9tcRKyonzEk2PG4TjLSPbb6ywJOY4J5HK6ZoqNDpBuGDKboyvMW+wj7kcJWQy3xcBuJab
+        VpAkclKRjOurJVZSSpyXaHrcIBxvGtl+Y4VFMcc5iZRPx1S+3gnCBVN2Y3yNeYN9zOUoIZP5Bl9auHhV
-        Sv3YAAAAAElFTkSuQmCC
+        DRJiAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnFirstPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmIB68iRVHE
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmof0CkKIp4
-        W8++kt0iUsQi+hM8eRfFZreI4ME/IAqK+h8En1efmXSiyyaNSWn1gyGTeXzfzpAsaQdGS94Auq0FEFMm
+        69lXs1tEgiCiP8GTd1FsdksRPPgHREFR/4Pg8+oz005w2KY1Ka1+MGQyj+/bGZJlncB4MRhCt70AYi7U
-        tql78IwhQiwuP1UbnN99xVRq2Euij3KxZXDxFPJgihDKNj7AIAjPLAJm6ajfZGLT733RebCkOQEgpkxW
+        LveOXjDEmCP1F7Xhxf03TCWGu6IGuFQ7llTPEQ+mGOPC/wSDIDzTCNjFyqAt1HbY+2ryYElrAkDMhd4a
-        hpl4VHtVH0uzrcjktR4gthb2H/Q+3bAl3QQji8e91PXWDVbfsVrfyMfWZIHgxFyuUebd63WpBSCgWihg
+        FeqJ9lIfS9OtyJblPiB2lg4fzT7TsCXZBGPLJ/3cCzYtUdsxrW/kY2tzgeqJpd7gIngw6xILQIBaJOBI
-        cbFqLVfv9HxaC8gBkVOMi3fYcSSuvavxOB/pYwQSfPX9t3qk/wMBCLTDkP4fJhji8s2/Uy71eFZD+vj/
+        te6slu7NfFKrkgPqTjGhPmDHdXHjncbjfKSPEWji0/ff6pH+DwQg0AlD+n+YYETq9/BOuTLjaQ3p4/+D
-        YIyddBtMThiOOLd45fv0al34bOQjfbwApkihsNfpX7+T/o92odelFoCAanFXhV0+7bJ5rZBlddiaPEEE
+        SXHaawk9ZRXUhSN/Tk/romcjH+njBTDFcrmD7vD6nQ5/tEuzLrEABKjFXRWuf9bjynIuzeqwtfkEdfD9
-        5XKHf+9PGSsg9LO6sFf1sSOjAAImMl05bbrVK7VX9bE03YoaIV88y1mumDG4d6PzYElzE+gIPgZHzlJX
+        rvDen7HWQKjWR3upjx0pBRAwke3pWdsrXdNe6mNpshU1QjZ/nnE8NWfJ4NbkwZLWJjBR/RgKep576iZa
-        XIerw1RrkS/u5Gwu5kzn8BZD7QGsru4R8gWfFS0VPudnjwAAAABJRU5ErkJggg==
+        Habai2x+L+NKtWAXju8w1BnA6moeY9/IuSrpVj3aVAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnPreviousPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g
-        X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLW/+BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK
+        X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLa//BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK
-        sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yx9dj0
+        sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yxdd70
-        F9kAiiwIDV3FbFuxKdymdPMpO8/Nf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp
+        F9kAiiwIDV3FbFuxKdymdPMpO5fNf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp
-        ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qWsCS1MRgC0DAI3cbu33Fplib
+        ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qIJLUxGALQMAjdxu7fcWmWJuy
-        sg2X8bkImY9LDTIbajwCAMsTFpvKTQHAjHQEpJBSDDUWO7Ar3eBoXb5xh3z8/N8wFyG7EEbjY0ONwg/s
+        DZfxuQiZj0sNMhtqPAIAyxMWm8pNAcCMdASkkFIMNRY7sCvd4GhdvnGHfPz83zAXIbsQRuNjQ43CD+zK
-        yjcY2pRtXGGbteknsgFUswAGgEWFum355qn6+eu/gwwhBkO1kgZsq7ZLgkpRu4qNb7G5GpkN1UIesKnY
+        NxjalG1cYZu16SeyAVSzAAaARYW6bfnmqfr567+DDCEGQ7WSBmyrtkuCSlG7io1vsbkamQ3VQh6wqdgi
-        ImhbtrESVA/QxAIYABUvoLxkV7LhLshwZAxVQh0ASuK2pZujgbXbWar6AAMAi3ig672sSzcdhIrQCvxn
+        aFu2sRJUD9DEAhgAFS+gvGRXsuEuyHBkDFVCHQBK4ralm6OBtdtZqvoAAwCLeKDrvaxLNx2EitAK/Gdk
-        ZGBgYAAA+36Jhi0FcugAAAAASUVORK5CYII=
+        YGBgAABSZ4fXERBsXgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnNextPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2
-        FZv/Q/EN2/JNKfb1+zmgUtQBtuXN/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG
+        FZv/Q/EN2/JNKfb1+zmgUtQBtuX1/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG
-        KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMY9Nf23L
+        KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMedNf23L
-        N+yxr9jiQlQSB2kkC3tu/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp
+        N+yxr9jiQlQSB2kkC7ts/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp
-        FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHLP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+
+        FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXH9P+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+
         YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam
         nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2
-        sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAv7+J
+        sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEA5X2H
-        hvKjV0wAAAAASUVORK5CYII=
+        142IlcMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnLastPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFxSURBVEhLY4ABp8qN4lAmbYBt2dqPtuWbOmlmkV3F5v8g
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFwSURBVEhLY4ABp8qN4lAmbYBt2dqPtuWbOmlmkV3F5v8g
-        bF2x6YNtxaYO+6JNIlApooF8/PzfMHNgGCoF9EF58z+QAIiGsj/ZlG9qs6ncJgpVQhCALEA3ByqF1QIw
+        bF2x6YNtxaYO+6JNIlApooF8/PzfMHNgGCoF9EF5/T+QAIiGsj/ZlG9qs6ncJgpVQhCALEA3ByqF1QIw
         27x803vb8s0txFiE1wKQIF5csOYd2KKKLYJQLRiA1CDCYINo63JgHJVtbLQo3CEE1QoHZAURMhtZzLZ8
-        41vbis21yD6iLIhw4eINr+wqNlWDzKBKEMHE0PngOPLY9BddHGo8FSzAwYYaTwcLQIK0wFDjh4APgGXY
+        41vbis21yD6iLIhw4eINr+wqNlWDzKBKEMHE0PngOHLe9BddHGo8FSzAwYYaTwcLQIK0wFDjh4APgGXY
-        Ja2KzX/QxaHGk+uDln/WpZvOWZdvDnQp381P7Yx2Hli8B4eGrmKGGkGdjAYKCvuKLaH29ftZoFrhgIKM
+        Ja2KzX/QxaHGk+uD+n/WpZvOWZdvDnQp381P7Yx2Hli8B4eGrmKGGkGdjAYKCvuKLaH29ftZoFrhgIKM
-        BgyKkk2XgPVEOEN9PRNUCwYgK4hsyjZctinbHIHNxeiApCCyrth4za5sU5Rx2hlWqBKCgIggavlnW7bp
+        BgyKkk2XgPVEOEN9PRNUCwYgK4hsyjZctinbHIHNxeiApCCyrth4za5sU5Rx2hlWqBKCgIggAtpatumq
-        qm3p5mjkyCMW4PWBTen66/YVm2KN02YS7WKSAClBQTxgYAAARistFZO7C1wAAAAASUVORK5CYII=
+        benmaOTIIxbg9YFN6frr9hWbYo3TZhLtYpIAKUFBPGBgAAB8byrpVSoE5AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnZoomOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMHSURBVEhLtVXfS5NRGA6KLuqiKCSCqIsi6Da69qL+Bm/S
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMESURBVEhLtVVdS1RRFA2KHuqhKCSCqIci6DV69qF+gy9p
-        EHXqnNrEOdBy+yxBMCxMSlaolVYGddEPQomyJAgEMxvLQXO6aUaNVWpSy9Z3et597/k8n1PUpAde3/Pj
+        iDrqfDiNOA5oOXMtQTAsTEos1Eorg3rog1CiLAkC0TGKSaeZUaaMKLFSk5psuqe15+5zPXdGUZMWbPf5
-        Oc/zvke/44bl4HA49hUVFbkLCwsfI4eKi4tjGIcRTzCvtdlsB5m6NuTl5WVA4Gp2dnYCojqF3W4XauaY
+        WGetvY/e47ql4HQ695SUlPiKi4sfIkdLS0snMR5DPMK8xmaz7Wfq6lBQUJAFgcu5ubkJiOoUdrtdqJlj
-        R9yC0R4+ujIgfAQiURJabeTn539GPsoSywOtH0Y1M7JCOsx5TtMaIucvtU42NjZ/pPliDnWL4o6xVDoK
+        HnEDRrv46PKA8CGIvCOhlUZhYeFn5MMssTTQ+kFUMyMrpMOc5zStPn72QstEQ0PTR5qnc6hbFHeEpTJR
-        Cgp2gDgmD1CUlZXFX/T3fxobH9eFgomJST3wbkQ4nc6fKh8Rg8lelrQCxGYiy3C73R+CwWCSBKempiwG
+        VFS0DcRxeYCirKxs6ll//6e3kYguFIyNjeuhNyPC4/H8VPmISZjsZkkrQGwisgyfz/chFAolSTAej1sM
-        ch6JRHSfz/dHPYe4w5ILKC8vz4B7qm0ilZaWTgcCgSQJrRTRaFTXNM28rtzc3N8lJSWHWNoANmzcYop0
+        5Dwajeqtra1/1HOIWyy5ALfbnQX3VNtEcrlc0yROQstFLBbTNU0zrys/P/+3w+E4wNIGsGHjFlOkuz29
-        v6c3RodT5QLqmCDnMr8PjZodkAauSWNpA1jolAS4/5r9PmcRXclAx8+6M2dNE+g9Y2kDWHwlO6isrInT
+        k3Q4VS6gjglyLnMkGjM7IA1ck8bSBrDQKQlw/zX7fc4iupyBjp+1p06bJtB7wtIGsPhCdlBRUT1FB7Or
-        wczqhyKz+hGCsjpW14w58Ttu3DQ7QEyytAE4vpUGuM84VZUutrwBofveA9XgG0sbwMZLaVBz6vTsv3TQ
+        7ovsqgcIyupYXTPmxO+4dt3sADHB0gbg+Eoa4D6nqKpMsaUNCN137qkG31jaADaeS4PqEydn/6WD9qud
-        fr3TNMD3NMHSBrDRRpsUeH+S0zOzlntXxwQ5l1nHL8Hj1VLnOZ6ytAEsHJcdEKGnt3dNBiPBoClOGrjy
+        pgG+p/csbQAbbbRJgfcnOT0za7l3dUyQc5l1/BL8AS11nuMxSxvAwlHZARF6entXZTAyOmqKkwauvIal
-        WpY2gIVt2PwiSRUVFcnh4eFVGSQSCVFfX28aIOZxCwdYegFw9soOKHs8Ht3v96d9WGqEw2G9paXFrJxz
+        DWBhCza/SFJ5eXlycHBwRQaJRELU1dWZBoh53MI+ll4AnAOyA8p+v18PBoOLflwywuGw3tzcbFbOuYsl
-        F0tagS620F+TJFO4XC7R1/dchEbDlg4i+HoHXw8Jr9driksD/IIH8BLsZFkrsLkfJHot1ZbFSadTNJ5r
+        rUAXm+ivSZIpvF6v6Ot7iisIWzqI4usdCg6LQCBgiksD/IIH8BJsZ1krsLkXJHot1ZbFcY9HNJxpFBcv
-        EpevtImmCxeFq6qKPkgLRw0UOkiPJ8taQSbUiaxIrU6GXFuKI8fQGaJ/XCxrRU5OzlaQ6kD4uviwKoIq
+        tYnGc+eFt7KSPkgLRw0UOkSPJ8taQSbUiaxIrU6GXFuMI8fQGaZ/XCxrRV5e3maQakH4mn5YFUGVP5Bb
-        fyC3Quzu4j0evwFnF8umA+/9dhBPgNiBTM9JAHkAHXZj7IDwbuJlZWVtxvptEl0i/Cmx9QImG2HahUi7
+        IHY7fY/HL8HZwbKZwHu/FcRjIHYg03MSQh5Ah90YOyG8k3g5OTkbsX6TRBeJ1ymxtQIm62Hahci4Lqas
-        LqasH3jHNqG7a//NgMAm7QtXZBd/AZO8KHAJXygYAAAAAElFTkSuQmCC
+        HXjHNqC7K//NgMAm7QtXZBd/AWaMJXnjHFh9AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnZoomIn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -307,25 +307,25 @@
   <data name="btnSettings.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALDSURBVEhLpVY9aBRBFD5ECxstFLWSVFEi5Oc2i00wjWJj
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALDSURBVEhLpVY9aFNRFA6ig4sOijqpU5QI/XsNLsUsiouD
-        IWjjT0x3Ue5ud2b2UAvhiIVWIhhBxEKCRojcZvci2oqNaSxMtLAIpBEbGxUSIcZb3zf35hz3cudx+eAx
+        oEP8wW6tkuS9e+8L6lAIOugkghVEHKRohUpe3ktFV3Gxi4OtDg6FLuLiokIr1Jjn+W7Ojdf81JB+cLjn
-        733z3vfezOzBZQyyfuUkuxqujIKe8ce/iL/CVPdwvMpTR4SJo+JZxIMyHHBVnIDrE+GGTtoKhvLPfkBw
+        fPec75x77wskYTDilU+yq5GWoX9g/PEv4q8w1T8ct/zUEUHsqGgO8ZAMBtMqisGlRFDTSZvBcO7ZDwh2
-        MxuW8SNO6x5Hvep+TAtBrNli+LHhi3CK07YG02CwONun42vPd4Or81FxtPx6u07sBo43fxDifSpeY0qD
+        slEZPeK0/nHUre7FtBDEOlIIPjZ9EUxz2uZgGgwV5lI6vvZ8J7gGHxYypddbdWI/cNz5/RBPqWiNKQ16
-        3uQ9eGPDIj7OW53DkdHE30njJOvNnQLviuqROh8lw6pKVxUlQ0F8DHuB57lCiEQpldA6Ca4laMoVuwHW
+        k/fgjY2K6Dhv9Q5HhpN/J43iEbdyCnxaVI80+DAeVVW6qjAe9qNj2PNdNy2EiJVSMa03wHUFTbliN8Ca
-        XjGzWvejxPXDl6PqyfSImLk1qh7uRY30/QmrwQst1AqOqp7Qx1dz0/Tt34dfj+k9VLyEnKuqsCGlfKML
+        FLOrDT+M017wMqOezIyJ2VsZ9XA3aqTnTVoNXmihbnBU9YQ+vqrM0Ld/H34jpvdQ0RJyrqp8TUr5RhcQ
-        CCQcQxxWKBS+Mg3+HDjKHWCqGfgN4BRo4IrKKyUKq0rJROqJ5QZWTD82NvYbYvD5NAuWn/i+f4glm4Ef
+        SDiCOCyfz39lGvw5cJQ7yFQ78BvAKdAgLcqvlMivKiVjqSeWNayYPpvN/oYYfD7NguXHnucdYsl24MeF
-        Fxo4frRwWVwfD6iBLUgT1kyMlbia5aPBZ5baHP1qrrc/CPdxmCHBRTOZETExVqt5DXE+n9/DpZ0BVwSB
+        Bo4XLlwW18d9amAL0oR1E2Mlrm75aPCZpTpjQFWSA36wh8MECS6ayYyIibFazeuIc7ncLi7tDbgiCLTY
-        lE2R2B1a11N8wmXtIaV3kQTuki2iyJpyvVwub+M0Dc/zvpkcnID8t/QGgvgRTmkGClpY03dPXD6V0zBO
+        NIndoXW9hY+5bGNI6V4kgbtkiyiyplwvlUpbOE3Ddd1vJgcnIP8tvYEgfoxT2oGCLtb23ROXa8lpGqe0
-        aQY2MQ1PZJ+gxCkN0LSXTI6Vp41TmkEPe4YKb9Mxl+wG9IBfOKUBEvpkciCKKyObp/obnNIauG8U20Yi
+        A5uYhieyT1DklCZo2ksmx8rTxintoIc9Q4W36ZhLdgN6wC+c0gQJfTI5EMWVkc1T/RSndAfuG8W2kciy
-        y0EQnCX/NA3yIb1Pe40vsCPQJD8xGYrNlCbGmrqW71zWGaigaoTNasyOjY8mdKqbXN4exWJxFwotW0vF
+        7/tnyT9Ng3xo3ae95hfYE2iSn5gMxWZKE2NtuZbvXNYbqKBqhM1qzI6NjyZ0qptcvjEKhcIOFFq21hJ3
-        LY2a7GSZ9qDkXhTQNT1AXCqVDtCUy5gUPK0rtNeDPfLfMf/PH4j/IpfL7WBXg0TwA9QNSPwe0xrEHWa3
+        NWqynWU2BiUnUUDX9ABxsVjcR1MuY1LwtK7Q3kHskf+O+X/+QPwXExMT29jVIBH8AHUDEr/HtAZxh9nt
-        e9Dxz0Oc7QLTmyCT+QMFJGVa6YYlSgAAAABJRU5ErkJggg==
+        H3T88xBnu8B0ByQSfwCqJWQA7REYAQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="statusbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>128, 20</value>
-  </metadata>
   <metadata name="OpenFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>233, 25</value>
   </metadata>
+  <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>368, 25</value>
+  </metadata>
 </root>

Controls.DocumentViewer/DocumentViewer.vb

@@ -2,7 +2,11 @@
 Imports System.Globalization
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
+Imports Independentsoft.Msg
+Imports DevExpress.Spreadsheet
 Imports GdPicture14
+Imports DevExpress
+Imports DevExpress.Office.Utils
 
 Public Class DocumentViewer
     Private Enum ZoomMode
@@ -16,7 +20,6 @@ Public Class DocumentViewer
         ZoomFitHeight
     End Enum
 
-    Private _docPath As String
     Private _currentSearchOccurence As Integer = 0
     Private _toggleGamma As Boolean = True
     Private _licenseKey As String = String.Empty
@@ -24,6 +27,8 @@ Public Class DocumentViewer
     Private _logConfig As LogConfig
     Private _logger As Logger
 
+    Private _hide_file_info_from_user As Boolean = False
+
     ' List of all created temp files when converting msg files
     Private _TempFiles As New List(Of String)
 
@@ -66,29 +71,26 @@ Public Class DocumentViewer
     ''' </summary>
     Public Sub Done()
         DeleteTempFiles()
-        Dispose()
     End Sub
 
     ''' <summary>
     ''' Load a file and display it
     ''' </summary>
-    ''' <param name="filepath"></param>
+    ''' <param name="FilePath"></param>
-    Public Sub LoadFile(filepath As String)
+    Public Sub LoadFile(FilePath As String)
         If _licenseKey = String.Empty Then
-            _logger.Warn("License key was not provided. File {0} not loaded.", filepath)
+            _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
             Exit Sub
         End If
 
-        '_logger.Info("Resetting Viewer.")
+        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-        'GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-        'GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
 
-        _logger.Info("Loading File.")
+        _logger.Info("Loading File {0}", FilePath)
-        DoLoadFile(filepath)
 
-        '_logger.Info("Updating UI.")
+        DoLoadFile(FilePath)
-        'statusLabel.Text = _docPath
+
-        ' UpdateMainUi()
+        UpdateMainUi()
     End Sub
 
     Public Sub CloseDocument()
@@ -110,46 +112,70 @@ Public Class DocumentViewer
     Private Sub DoLoadFile(FilePath As String)
         Try
             Dim oFileInfo = New IO.FileInfo(FilePath)
-            Dim oExtension As String = oFileInfo.Extension
+            Dim oExtension As String = oFileInfo.Extension.ToUpper
 
-            Select Case oExtension
+            RichEditControl1.Visible = False
-                Case ".msg"
+            RichEditControl1.Dock = DockStyle.None
-                    Dim oMsg As New Independentsoft.Msg.Message(FilePath)
+
+            SpreadsheetControl1.Visible = False
+            SpreadsheetControl1.Dock = DockStyle.None
+
+            mainToolStrip.Visible = False
+
+            Select Case oExtension.ToUpper
+                Case ".MSG"
+                    Dim oMsg As New Message(FilePath)
                     ' TODO: Improve Encoding, maybe convert based on encoding
                     oMsg.Encoding = System.Text.Encoding.UTF32
                     Dim oMime = oMsg.ConvertToMimeMessage()
                     Dim oTempFileName = IO.Path.GetTempFileName()
                     oMime.Save(oTempFileName, True)
 
-                    RichEditControl1.LoadDocument(oTempFileName, DevExpress.XtraRichEdit.DocumentFormat.Mht)
+                    RichEditControl1.LoadDocument(oTempFileName, XtraRichEdit.DocumentFormat.Mht)
 
                     _TempFiles.Add(oTempFileName)
 
                     RichEditControl1.Visible = True
                     RichEditControl1.Dock = DockStyle.Fill
-                Case ".eml"
+
-                    RichEditControl1.LoadDocument(FilePath, DevExpress.XtraRichEdit.DocumentFormat.Mht)
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined
+
+                    Select Case oExtension.ToUpper
+                        Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht
+                        Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc
+                        Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml
+                        Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument
+                        Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf
+                        Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText
+                    End Select
+
+                    RichEditControl1.LoadDocument(FilePath, oFormat)
 
                     RichEditControl1.Visible = True
                     RichEditControl1.Dock = DockStyle.Fill
-                Case ".xls"
-                    Using oConverter As GdPictureDocumentConverter = New GdPictureDocumentConverter()
-                        ' Loading the source document.
-                        oConverter.LoadFromFile(FilePath, GdPicture14.DocumentFormat.DocumentFormatXLSX)
-                        ' Saving as the PDF document.
-                        oConverter.SaveAsPDF("output.pdf", PdfConformance.PDF1_5)
-                    End Using
 
-                    _docPath = "output.pdf"
+                Case ".XLSX", ".XLS", "CSV"
+                    Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
+
+                    Select Case oExtension.ToUpper
+                        Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
+                        Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
+                        Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
+                    End Select
+
+                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
 
-                    GdViewer.DisplayFromFile(_docPath)
                 Case Else
-                    _docPath = FilePath
+                    mainToolStrip.Visible = True
 
-                    GdViewer.DisplayFromFile(_docPath)
+                    GdViewer.DisplayFromFile(FilePath)
-
-                    RichEditControl1.Visible = False
-                    RichEditControl1.Dock = DockStyle.None
             End Select
         Catch ex As Exception
             _logger.Error(ex)
@@ -157,8 +183,6 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnOpen_Click(sender As Object, e As EventArgs)
-        CloseDocument()
-
         GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
         GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
 
@@ -170,38 +194,26 @@ Public Class DocumentViewer
         UpdateMainUi()
     End Sub
 
-    Private Function GetDocumentTypeLabel() As String
+    ''' <summary>
-        Dim result As String = ""
+    ''' Configures the viewer to hide the file path to the end-user.
-        Select Case GdViewer.GetDocumentType()
+    ''' </summary>
-            Case DocumentType.DocumentTypeBitmap
+    ''' <param name="ViewOnly">
-                result = "Imagefile"
+    ''' True means that all file info should be hidden from the end-user
-            Case DocumentType.DocumentTypeMetaFile
+    ''' False means the end user may see the filepath or other info about the file
-                result = "Metafile"
+    ''' </param>
-            Case DocumentType.DocumentTypePDF
+    Public Sub RightOnlyView(ViewOnly As Boolean)
-                result = "PDF"
+        If ViewOnly Then
-            Case DocumentType.DocumentTypeSVG
-                result = "SVG"
-            Case DocumentType.DocumentTypeTXT
-                result = "textfile"
-            Case DocumentType.DocumentTypeUnknown
-                result = "Unknown"
-        End Select
-        Return result
-    End Function
-
-    Public Sub RightOnlyView(oValueRight As Boolean)
-        If oValueRight = True Then
             btnPrint.Visible = False
         Else
             btnPrint.Visible = True
         End If
 
+        _hide_file_info_from_user = Not ViewOnly
     End Sub
     Private Sub UpdateMainUi()
         Exit Sub
 
         If GdViewer.PageCount = 0 Then
-            'btnOpen.Enabled = True
             btnPrint.Enabled = False
             btnFirstPage.Enabled = False
             btnPreviousPage.Enabled = False
@@ -222,7 +234,6 @@ Public Class DocumentViewer
             lblPageCount.Text = "/ 0"
             cbZoom.SelectedIndex = -1
         Else
-            'btnOpen.Enabled = False
             btnPrint.Enabled = True
             btnFirstPage.Enabled = True
             btnPreviousPage.Enabled = True
@@ -466,24 +477,6 @@ Public Class DocumentViewer
             btnLastPage.Enabled = True
         End If
         cbZoom.Text = String.Format(CultureInfo.InvariantCulture, "{0:#0.##%}", GdViewer.Zoom)
-
-
-        Dim widthInches, heightInches As Double
-
-        If GdViewer.GetDocumentType = DocumentType.DocumentTypePDF Then
-            widthInches = GdViewer.PdfGetPageWidth / 72
-            heightInches = GdViewer.PdfGetPageHeight / 72
-        Else
-            widthInches = GdViewer.PageWidth / GdViewer.HorizontalResolution
-            heightInches = GdViewer.PageHeight / GdViewer.VerticalResolution
-        End If
-
-        Me.infoLabel.Text = "Type: " + GetDocumentTypeLabel() + "  -  " +
-                                        "Pagesize (zoll): " + Trim(Str(Math.Round(widthInches, 2))) + " × " + Trim(Str(Math.Round(heightInches, 2))) + "  -  " +
-                                        "Pagesize (pixel): " + Trim(Str(GdViewer.PageWidth)) + " × " + Trim(Str(GdViewer.PageHeight)) + "  -  " +
-                                        "Horizontal resolution: " + Trim(Str(Math.Round(GdViewer.HorizontalResolution, 2))) + " DPI  -  " +
-                                        "Vertical resolution: " + Trim(Str(Math.Round(GdViewer.VerticalResolution, 2))) + " DPI"
-
     End Sub
 
     Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click
@@ -544,7 +537,9 @@ Public Class DocumentViewer
         GdViewer.Focus()
     End Sub
 
-    Private Sub DocumentViewer_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed
+    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
-        GdViewer.Dispose()
+        Dim oControlWidth = RichEditControl1.Width - 100
+        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
+        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
     End Sub
 End Class

Controls.DocumentViewer/DocumentViewer.vbproj

@@ -48,28 +48,37 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Images.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Spreadsheet.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="GdPicture.NET.14">
       <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\14_11_19_MIME_UTF_ENCODING\Independentsoft.Msg.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

Controls.DocumentViewer/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.2.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

Controls.DocumentViewer/My Project/licenses.licx

@@ -1 +1,2 @@
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.DocumentViewer/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

Controls.LookupGrid/LookupControl.vbproj

@@ -48,34 +48,27 @@
     </Reference>
     <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Pdf.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.RichEdit.v19.2.Export, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Controls.LookupGrid/LookupControl2.vb

@@ -80,6 +80,7 @@ Public Class LookupControl2
 
         Properties.Buttons.Item(0).Tag = TAG_DROPDOWN
         Properties.Buttons.AddRange({_LookupFormButton})
+        Properties.NullText = TEXT_NO_RECORDS
 
         AddHandler ButtonClick, AddressOf HandleButtonClick
         AddHandler EditValueChanging, AddressOf HandleEditValueChanging

Controls.LookupGrid/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("0.0.2.0")>
+<Assembly: AssemblyVersion("1.0.2.2")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

Controls.LookupGrid/My Project/licenses.licx

@@ -1 +1,3 @@
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.LookupGrid/frmLookupGrid.vb

@@ -157,9 +157,19 @@ Public Class frmLookupGrid
     End Sub
 
     Private Sub gridLookup_KeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.KeyUp
+        HandleCustomKeys(e)
+    End Sub
+
+    Private Sub gridLookup_EditorKeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.EditorKeyUp
+        HandleCustomKeys(e)
+    End Sub
+
+    Private Sub HandleCustomKeys(e As KeyEventArgs)
         If e.KeyCode = Keys.Escape Then
             Close()
         ElseIf e.KeyCode = Keys.F2 Then
+            ' Make sure the currently focused row's state is saved
+            viewLookup.PostEditor()
             SaveSelectedValues()
 
             DialogResult = DialogResult.OK

DDEmailService/DDEmailService.vbproj

@@ -52,7 +52,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

DDEmailService/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

DDLicenseService/DDEDMLicenseService.vbproj

@@ -49,7 +49,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -125,9 +125,7 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config">
+    <None Include="packages.config" />
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Modules.Database\Database.vbproj">

DDLicenseService/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

DDMonorepo.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.27703.2000
+VisualStudioVersion = 16.0.29728.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}"
 EndProject
@@ -104,6 +104,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.DocumentViewerTes
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "DDEmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebServices", "WebServices", "{D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -270,6 +274,10 @@ Global
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -315,6 +323,7 @@ Global
 		{609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{FD50590A-59C1-4798-AD90-419A588DCE76} = {D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}

DDZUGFeRDService/App.config

@@ -37,6 +37,9 @@
             <setting name="MSSQL_ENABLED" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="GDPICTURE_KEY" serializeAs="String">
+                <value>1234567890_EXAMPLE_KEY</value>
+            </setting>
         </DDZUGFeRDService.My.MySettings>
     </applicationSettings>
 <system.data>

DDZUGFeRDService/DDZUGFeRDService.vbproj

@@ -52,7 +52,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

DDZUGFeRDService/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.1.0.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

DDZUGFeRDService/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -134,6 +134,15 @@ Namespace My
                 Return CType(Me("MSSQL_ENABLED"),Boolean)
             End Get
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("1234567890_EXAMPLE_KEY")>  _
+        Public ReadOnly Property GDPICTURE_KEY() As String
+            Get
+                Return CType(Me("GDPICTURE_KEY"),String)
+            End Get
+        End Property
     End Class
 End Namespace
 

DDZUGFeRDService/My Project/Settings.settings

@@ -29,5 +29,8 @@
     <Setting Name="MSSQL_ENABLED" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="GDPICTURE_KEY" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">1234567890_EXAMPLE_KEY</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

DDZUGFeRDService/ThreadRunner.vb

@@ -31,7 +31,6 @@ Public Class ThreadRunner
         _logConfig = LogConfig
         _logger = _logConfig.GetLogger()
         _firebird = Firebird
-        _zugferd = New ZUGFeRDInterface(_logConfig)
         _mssql = MSSQL
 
         Dim args As New WorkerArgs()
@@ -113,25 +112,6 @@ Public Class ThreadRunner
             Dim args As WorkerArgs = e.Argument
 
             _logger.Debug("Background worker running..")
-            ' Use MSSQL Server if available
-            If Not IsNothing(_mssql) Then
-                'Checking if documents have bee´n rejected
-                Dim oSQL As String = "Select * from TBEDMI_DOC_REJECTED WHERE MD5_UPDATE = 0"
-                'Dim oDT As DataTable = _mssql.GetDatatable(oSQL)
-                'If Not IsNothing(oDT) Then
-                '    For Each oRow As DataRow In oDT.Rows
-                '        oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET REJECTED = TRUE WHERE MESSAGE_ID = '{oRow.Item("MESSAGE_ID")}'"
-                '        If _firebird.ExecuteNonQuery(oSQL) = True Then
-                '            oSQL = $"UPDATE TBEDMI_DOC_REJECTED SET MD5_UPDATE = 1 WHERE GUID = '{oRow.Item("GUID")}'"
-                '            If _mssql.ExecuteNonQuery(oSQL) = True Then
-                '                _logger.Debug($"Refreshed the Rejected Info for messageid [{oRow.Item("MESSAGE_ID")}]")
-                '            End If
-                '        End If
-                '    Next
-                'Else
-                '    _logger.Warn("oDTTBEDMI_DOC_REJECTED is nothing...")
-                'End If
-            End If
             Dim job As New ImportZUGFeRDFiles(_logConfig, _firebird, _mssql)
             job.Start(args)
         Catch ex As Exception

DDZUGFeRDService/ZUGFeRDService.vb

@@ -24,6 +24,7 @@ Public Class ZUGFeRDService
         Dim oJobInterval As Integer = My.Settings.JOB_INTERVAL
         Dim oMSSQLConnectionString As String = My.Settings.MSSQL_CONNECTIONSTRING
         Dim oMSSQLEnabled As Boolean = My.Settings.MSSQL_ENABLED
+        Dim oGDPictureKey As String = My.Settings.GDPICTURE_KEY
 
         _firebird = New Firebird(_logConfig, oDataSource, oDatabase, oUser, oPassword)
 
@@ -37,7 +38,7 @@ Public Class ZUGFeRDService
         End If
 
         Try
-            _threadRunner = New ThreadRunner(_logConfig, _firebird, _mssql)
+            _threadRunner = New ThreadRunner(_logConfig, oGDPictureKey, _firebird, _mssql)
             _threadRunner.Start(oJobInterval)
         Catch ex As Exception
             _logger.Error(ex)

DDZUGFeRDService/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

EDMI.File/Archive.vb

@@ -0,0 +1,11 @@
+Imports DigitalData.Modules.Logging
+
+Public Class Archive
+    Private _LogConfig As LogConfig
+    Private _Logger As Logger
+
+    Public Sub New(LogConfig As LogConfig)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+    End Sub
+End Class

EDMI.File/EDMI.File.vbproj

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1477032D-7A02-4C5F-B026-A7117DA4BC6B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Modules.EDMI.File</RootNamespace>
+    <AssemblyName>DigitalData.Modules.EDMI.File</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.EDMI.File.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.EDMI.File.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Archive.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

EDMI.File/My Project/Application.Designer.vb

@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     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.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+

EDMI.File/My Project/Application.myapp

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>

EDMI.File/My Project/AssemblyInfo.vb

@@ -0,0 +1,35 @@
+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
+
+<Assembly: AssemblyTitle("EDMI.File")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("EDMI.File")>
+<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyTrademark("")>
+
+<Assembly: ComVisible(False)>
+
+'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird.
+<Assembly: Guid("2a4f6a80-e6e0-4764-ba6e-91484bda887f")>
+
+' 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:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.0.0")>

EDMI.File/My Project/Resources.Designer.vb

@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     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.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+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.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        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.Modules.EDMI.File.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace

EDMI.File/My Project/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

EDMI.File/My Project/Settings.Designer.vb

@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     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.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    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
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    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
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMI.File.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.EDMI.File.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace

EDMI.File/My Project/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

EDMI.File/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="4.7.0" targetFramework="net472" />
+</packages>

GUIs.ClientSuite/App.config

@@ -30,7 +30,7 @@
   <applicationSettings>
     <DigitalData.GUIs.ClientSuite.My.MySettings>
       <setting name="IDBNetworkServiceAddress" serializeAs="String">
-        <value>net.tcp://172.24.12.67:9000/DigitalData/Services/Main</value>
+        <value>net.tcp://172.24.12.39:9000/DigitalData/Services/Main</value>
       </setting>
     </DigitalData.GUIs.ClientSuite.My.MySettings>
     <ClientSuite.My.MySettings>

GUIs.ClientSuite/ClassService.vb

@@ -1,8 +1,10 @@
 Imports System.ServiceModel
 Imports System.ServiceModel.Channels
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.EDMIAPI
 Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
 Imports DigitalData.GUIs.ClientSuite.Base
+Imports System.ServiceModel.Security
 
 Public Class ClassService
     Inherits BaseClass
@@ -11,6 +13,7 @@ Public Class ClassService
         Successful
         NotFound
         EmptyURI
+        Authentication
         Unknown
     End Enum
 
@@ -60,6 +63,9 @@ Public Class ClassService
                                                Catch ex As UriFormatException
                                                    Logger.Error(ex)
                                                    Return ConnectionTestResult.EmptyURI
+                                               Catch ex As SecurityNegotiationException
+                                                   Logger.Error(ex)
+                                                   Return ConnectionTestResult.Authentication
                                                Catch ex As Exception
                                                    Logger.Error(ex)
                                                    Return ConnectionTestResult.Unknown
@@ -93,5 +99,4 @@ Public Class ClassService
 
         Return oBinding
     End Function
-
 End Class

GUIs.ClientSuite/ClientSuite.vbproj

@@ -89,7 +89,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
@@ -496,9 +496,9 @@
       <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Modules.EDMIAPI\EDMIAPI.vbproj">
+    <ProjectReference Include="..\Modules.EDMIAPI\EDMI.API.vbproj">
       <Project>{5b1171dc-fffe-4813-a20d-786aae47b320}</Project>
-      <Name>EDMIAPI</Name>
+      <Name>EDMI.API</Name>
     </ProjectReference>
     <ProjectReference Include="..\Modules.Language\Language.vbproj">
       <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
@@ -512,9 +512,9 @@
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
       <Name>Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\IDBService.vbproj">
+    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\EDMIService.vbproj">
       <Project>{A8C3F298-76AB-4359-AB3C-986E313B4336}</Project>
-      <Name>IDBService</Name>
+      <Name>EDMIService</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

GUIs.ClientSuite/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Public NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -56,7 +56,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.67:9000/DigitalData/Services/Main")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.39:9000/DigitalData/Services/Main")>  _
         Public ReadOnly Property IDBNetworkServiceAddress() As String
             Get
                 Return CType(Me("IDBNetworkServiceAddress"),String)

GUIs.ClientSuite/My Project/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="IDBNetworkServiceAddress" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">net.tcp://172.24.12.67:9000/DigitalData/Services/Main</Value>
+      <Value Profile="(Default)">net.tcp://172.24.12.39:9000/DigitalData/Services/Main</Value>
     </Setting>
   </Settings>
 </SettingsFile>

GUIs.ClientSuite/My Project/licenses.licx

@@ -1,3 +1,10 @@
 DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.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
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.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
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, 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.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClientSuite/_TEST/frmFileTest.Designer.vb

@@ -26,13 +26,6 @@ Partial Class frmFileTest
     Private Sub InitializeComponent()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.listboxLog = New System.Windows.Forms.ListBox()
-        Me.btnDocByDocId = New System.Windows.Forms.Button()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.btnDocByContainerId = New System.Windows.Forms.Button()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
-        Me.TextBox3 = New System.Windows.Forms.TextBox()
-        Me.TextBox4 = New System.Windows.Forms.TextBox()
-        Me.Button2 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'Button1
@@ -46,96 +39,26 @@ Partial Class frmFileTest
         '
         'listboxLog
         '
-        Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Right
         Me.listboxLog.FormattingEnabled = True
-        Me.listboxLog.Location = New System.Drawing.Point(0, 225)
+        Me.listboxLog.Location = New System.Drawing.Point(165, 0)
         Me.listboxLog.Name = "listboxLog"
-        Me.listboxLog.Size = New System.Drawing.Size(800, 225)
+        Me.listboxLog.Size = New System.Drawing.Size(635, 450)
         Me.listboxLog.TabIndex = 1
         '
-        'btnDocByDocId
-        '
-        Me.btnDocByDocId.Location = New System.Drawing.Point(655, 12)
-        Me.btnDocByDocId.Name = "btnDocByDocId"
-        Me.btnDocByDocId.Size = New System.Drawing.Size(133, 32)
-        Me.btnDocByDocId.TabIndex = 2
-        Me.btnDocByDocId.Text = "GetDocByDocId"
-        Me.btnDocByDocId.UseVisualStyleBackColor = True
-        '
-        'TextBox1
-        '
-        Me.TextBox1.Location = New System.Drawing.Point(425, 24)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox1.TabIndex = 3
-        '
-        'btnDocByContainerId
-        '
-        Me.btnDocByContainerId.Location = New System.Drawing.Point(655, 50)
-        Me.btnDocByContainerId.Name = "btnDocByContainerId"
-        Me.btnDocByContainerId.Size = New System.Drawing.Size(133, 32)
-        Me.btnDocByContainerId.TabIndex = 4
-        Me.btnDocByContainerId.Text = "GetDocByContainerId"
-        Me.btnDocByContainerId.UseVisualStyleBackColor = True
-        '
-        'TextBox2
-        '
-        Me.TextBox2.Location = New System.Drawing.Point(425, 62)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox2.TabIndex = 3
-        '
-        'TextBox3
-        '
-        Me.TextBox3.Location = New System.Drawing.Point(425, 138)
-        Me.TextBox3.Name = "TextBox3"
-        Me.TextBox3.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox3.TabIndex = 5
-        '
-        'TextBox4
-        '
-        Me.TextBox4.Location = New System.Drawing.Point(425, 112)
-        Me.TextBox4.Name = "TextBox4"
-        Me.TextBox4.Size = New System.Drawing.Size(224, 20)
-        Me.TextBox4.TabIndex = 5
-        '
-        'Button2
-        '
-        Me.Button2.Location = New System.Drawing.Point(655, 126)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(133, 32)
-        Me.Button2.TabIndex = 4
-        Me.Button2.Text = "GetDocByContainerId"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
         'frmFileTest
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
-        Me.Controls.Add(Me.TextBox4)
-        Me.Controls.Add(Me.TextBox3)
-        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.btnDocByContainerId)
-        Me.Controls.Add(Me.TextBox2)
-        Me.Controls.Add(Me.TextBox1)
-        Me.Controls.Add(Me.btnDocByDocId)
         Me.Controls.Add(Me.listboxLog)
         Me.Controls.Add(Me.Button1)
         Me.Name = "frmFileTest"
         Me.Text = "frmFileTest"
         Me.ResumeLayout(False)
-        Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents Button1 As Button
     Friend WithEvents listboxLog As ListBox
-    Friend WithEvents btnDocByDocId As Button
-    Friend WithEvents TextBox1 As TextBox
-    Friend WithEvents btnDocByContainerId As Button
-    Friend WithEvents TextBox2 As TextBox
-    Friend WithEvents TextBox3 As TextBox
-    Friend WithEvents TextBox4 As TextBox
-    Friend WithEvents Button2 As Button
 End Class

GUIs.ClientSuite/_TEST/frmFileTest.vb

@@ -1,6 +1,5 @@
 Imports System.IO
 Imports DigitalData.Modules.EDMIAPI
-Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Logging
 
 Public Class frmFileTest
@@ -16,73 +15,81 @@ Public Class frmFileTest
     End Sub
 
     Private Async Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oDialog = New OpenFileDialog()
+        Dim oDialog = New OpenFileDialog() With {
-        Dim oDialogResult = oDialog.ShowDialog()
+            .Multiselect = True
+        }
 
-        If oDialogResult <> DialogResult.OK Then
+        If oDialog.ShowDialog() <> DialogResult.OK Then
             Exit Sub
         End If
 
+        For Each oFileName In oDialog.FileNames
             Try
-            Dim oResult = Await _fileOp.ImportFileAsync(oDialog.FileName)
+                Dim oSW As New Stopwatch()
+                oSW.Start()
+
+                Dim oResult = Await _fileOp.ImportFile2(oFileName)
+
+                oSW.Stop()
 
                 If oResult.OK = False Then
-                MsgBox(oResult.ErrorMessage)
+                    listboxLog.Items.Add($"Document upload failed! Reason: '{oResult.ErrorMessage}'")
                     Exit Sub
                 End If
 
                 listboxLog.Items.Add($"Document uploaded!")
-            listboxLog.Items.Add($"DocId: {oResult.Document.DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oResult.Document.ContainerId}")
                 listboxLog.Items.Add($"Filename: {oResult.Document.FileName}")
+                listboxLog.Items.Add($"Time in milliseconds: {oSW.ElapsedMilliseconds}")
                 listboxLog.Items.Add($"----------------------------------------------------------")
             Catch ex As Exception
-            ShowErrorMessage(ex)
+                listboxLog.Items.Add($"Document upload failed! Reason: '{ex.Message}'")
                 Logger.Error(ex)
             End Try
+        Next
+
     End Sub
 
-    Private Sub btnDocByDocId_Click(sender As Object, e As EventArgs) Handles btnDocByDocId.Click
+    'Private Sub btnDocByDocId_Click(sender As Object, e As EventArgs)
-        Try
+    '    Try
-            Dim oDocId As Int64 = Int64.Parse(TextBox1.Text)
+    '        Dim oDocId As Int64 = Int64.Parse(TextBox1.Text)
-            Dim oResult = _fileOp.GetDocumentByDocumentId(oDocId)
+    '        Dim oResult = _fileOp.GetDocumentByDocumentId(oDocId)
 
-            If Not oResult.OK Then
+    '        If Not oResult.OK Then
-                MsgBox(oResult.ErrorMessage)
+    '            MsgBox(oResult.ErrorMessage)
-                Exit Sub
+    '            Exit Sub
-            End If
+    '        End If
 
-            Dim oDocObject = oResult.Document
+    '        Dim oDocObject = oResult.Document
 
-            listboxLog.Items.Add($"Document fetched!")
+    '        listboxLog.Items.Add($"Document fetched!")
-            listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
+    '        listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
+    '        listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
-            listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
+    '        listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
-            listboxLog.Items.Add($"----------------------------------------------------------")
+    '        listboxLog.Items.Add($"----------------------------------------------------------")
-        Catch ex As Exception
+    '    Catch ex As Exception
-            ShowErrorMessage(ex)
+    '        ShowErrorMessage(ex)
-        End Try
+    '    End Try
-    End Sub
+    'End Sub
 
-    Private Sub btnDocByContainerId_Click(sender As Object, e As EventArgs) Handles btnDocByContainerId.Click, Button2.Click
+    'Private Sub btnDocByContainerId_Click(sender As Object, e As EventArgs)
-        Try
+    '    Try
-            Dim oContainerId As Int64 = Int64.Parse(TextBox2.Text)
+    '        Dim oContainerId As Int64 = Int64.Parse(TextBox2.Text)
-            Dim oResult = _fileOp.GetDocumentByContainerId(oContainerId)
+    '        Dim oResult = _fileOp.GetDocumentByContainerId(oContainerId)
 
-            If Not oResult.OK Then
+    '        If Not oResult.OK Then
-                MsgBox(oResult.ErrorMessage)
+    '            MsgBox(oResult.ErrorMessage)
-                Exit Sub
+    '            Exit Sub
-            End If
+    '        End If
 
-            Dim oDocObject = oResult.Document
+    '        Dim oDocObject = oResult.Document
 
-            listboxLog.Items.Add($"Document fetched!")
+    '        listboxLog.Items.Add($"Document fetched!")
-            listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
+    '        listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
+    '        listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
-            listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
+    '        listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
-            listboxLog.Items.Add($"----------------------------------------------------------")
+    '        listboxLog.Items.Add($"----------------------------------------------------------")
-        Catch ex As Exception
+    '    Catch ex As Exception
-            ShowErrorMessage(ex)
+    '        ShowErrorMessage(ex)
-        End Try
+    '    End Try
-    End Sub
+    'End Sub
 End Class

GUIs.ClientSuite/frmConfigService.vb

@@ -40,6 +40,8 @@ Public Class frmConfigService
                         lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port."
                     Case ClassService.ConnectionTestResult.EmptyURI
                         lblStatus.Text = "Bitte tragen Sie eine gültige Dienst Adresse ein."
+                    Case ClassService.ConnectionTestResult.Authentication
+                        lblStatus.Text = "Authentifizierungsfehler. Prüfen Sie, ob sich Ihr Gerät in der korrekten Domäne befindet."
                     Case Else
                         lblStatus.Text = "Unbekannter Fehler."
                 End Select

GUIs.ClientSuite/packages.config

@@ -3,6 +3,6 @@
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
   <package id="FirebirdSql.EntityFrameworkCore.Firebird" version="6.4.0" targetFramework="net461" />
   <package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
   <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
 </packages>

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj

@@ -43,22 +43,19 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Data.v18.1.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Utils.v18.1.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraEditors.v18.1.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj.bak

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Modules.ClipboardWatcher</RootNamespace>
+    <AssemblyName>DigitalData.Modules.ClipboardWatcher</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.ClipboardWatcher.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.Modules.ClipboardWatcher.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Data.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Utils.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraEditors.v18.1.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="frmMatch.Designer.vb">
+      <DependentUpon>frmMatch.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmMatch.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmTreeView.Designer.vb">
+      <DependentUpon>frmTreeView.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmTreeView.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="ProfileFilter.vb" />
+    <Compile Include="ProfileMatch.vb" />
+    <Compile Include="ProfileSearches.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="frmMatch.resx">
+      <DependentUpon>frmMatch.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmTreeView.resx">
+      <DependentUpon>frmTreeView.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GUIs.Common\Common.vbproj">
+      <Project>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Patterns\Patterns.vbproj">
+      <Project>{7c3b0c7e-59fe-4e1a-a655-27ae119f9444}</Project>
+      <Name>Patterns</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.ZooFlow\ZooFlow.vbproj">
+      <Project>{81cac44f-3711-4c8f-ae98-e02a7448782a}</Project>
+      <Name>ZooFlow</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Windows\Windows.vbproj">
+      <Project>{5efaef9b-90b9-4f05-9f70-f79ad77fff86}</Project>
+      <Name>Windows</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

GUIs.ClipboardWatcher/My Project/licenses.licx

@@ -1,2 +0,0 @@
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClipboardWatcher/My Project/licenses.licx.bak

@@ -0,0 +1 @@
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ClipboardWatcher/frmMatch.vb

@@ -55,13 +55,6 @@ Public Class frmMatch
         _Params = Params
     End Sub
 
-    Public Sub ShowTreeView()
-        Dim oForm As New frmTreeView(_Params.MatchTreeView.Nodes) With {
-            .StartPosition = FormStartPosition.CenterScreen
-        }
-        oForm.ShowDialog()
-    End Sub
-
     Private Async Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Dim oCreatedTiles = CreateTiles()
 
@@ -205,7 +198,10 @@ Public Class frmMatch
     End Function
 
     Private Sub Label2_Click(sender As Object, e As EventArgs) Handles Label2.Click
-        ShowTreeView()
+        Dim oForm As New frmTreeView(_Params.MatchTreeView.Nodes) With {
+            .StartPosition = FormStartPosition.CenterScreen
+        }
+        oForm.ShowDialog()
     End Sub
 
     Private Async Sub TileControlMatch_ItemClick(sender As Object, e As TileItemEventArgs) Handles TileControlMatch.ItemClick

GUIs.ClipboardWatcher/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

GUIs.Common/Common.vbproj

@@ -43,17 +43,17 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Dialogs.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraDialogs.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraDialogs.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Controls.DocumentViewer">
       <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
@@ -62,7 +62,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.Common/Common.vbproj.bak

@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.GUIs.Common</RootNamespace>
+    <AssemblyName>DigitalData.GUIs.Common</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.GUIs.Common.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>DigitalData.GUIs.Common.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraDialogs.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14">
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Base\BaseErrorHandler.vb" />
+    <Compile Include="Base\BaseRibbonForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Constants.vb" />
+    <Compile Include="DataResultList\DataResultConfig.vb" />
+    <Compile Include="DataResultList\DataResultParams.vb" />
+    <Compile Include="DataResultList\frmDataResultList.Designer.vb">
+      <DependentUpon>frmDataResultList.vb</DependentUpon>
+    </Compile>
+    <Compile Include="DataResultList\frmDataResultList.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DocumentResultList\DocumentResultConfig.vb" />
+    <Compile Include="DocumentResultList\DocumentResultParams.vb" />
+    <Compile Include="DocumentResultList\frmDocumentResultList.Designer.vb">
+      <DependentUpon>frmDocumentResultList.vb</DependentUpon>
+    </Compile>
+    <Compile Include="DocumentResultList\frmDocumentResultList.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IResultForm.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DataResultList\frmDataResultList.resx">
+      <DependentUpon>frmDataResultList.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DocumentResultList\frmDocumentResultList.resx">
+      <DependentUpon>frmDocumentResultList.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Modules.Config\Config.vbproj">
+      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.ZooFlow\ZooFlow.vbproj">
+      <Project>{81cac44f-3711-4c8f-ae98-e02a7448782a}</Project>
+      <Name>ZooFlow</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\txt.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\pdf.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\doc.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\xls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ppt.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\dwg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\dxf.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\tiff.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\jpg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\_blank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\_page.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\png.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Article_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Open_32x32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Copy_32x32.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

GUIs.Common/My Project/licenses.licx

@@ -1,4 +0,0 @@
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.Common/My Project/licenses.licx.bak

@@ -0,0 +1,4 @@
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.Common/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

GUIs.Test.ADSyncTest/ADSyncTest.vbproj

@@ -49,7 +49,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.Test.ADSyncTest/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

GUIs.Test.DocumentViewerTest/Form1.Designer.vb

@@ -27,6 +27,7 @@ Partial Class Form1
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'TextBox1
@@ -67,11 +68,21 @@ Partial Class Form1
         Me.Button3.Text = "Load Form4"
         Me.Button3.UseVisualStyleBackColor = True
         '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(12, 96)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(637, 23)
+        Me.Button4.TabIndex = 3
+        Me.Button4.Text = "Extract Files from PDF"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
         'Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.Button4)
         Me.Controls.Add(Me.Button3)
         Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.Button1)
@@ -87,4 +98,5 @@ Partial Class Form1
     Friend WithEvents Button1 As Button
     Friend WithEvents Button2 As Button
     Friend WithEvents Button3 As Button
+    Friend WithEvents Button4 As Button
 End Class

GUIs.Test.DocumentViewerTest/Form1.vb

@@ -1,8 +1,21 @@
 Imports DigitalData.Modules.Logging
+Imports GdPicture14
 
 Public Class Form1
     Private oSubform As Form3
 
+    Private LogConfig As LogConfig
+
+    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
+        Dim oLogConfig As New LogConfig(LogConfig.PathType.CustomPath,
+                                            Application.StartupPath,
+                                            Nothing,
+                                            My.Application.Info.CompanyName,
+                                            My.Application.Info.ProductName)
+
+        LogConfig = oLogConfig
+    End Sub
+
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         Dim oResult = OpenFileDialog1.ShowDialog()
 
@@ -13,8 +26,7 @@ Public Class Form1
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Try
             Dim oKey = "0467389434974657969312056"
-            Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory)
+            Dim oSubform As New Form3(LogConfig, oKey)
-            Dim oSubform As New Form3(oLogConfig, oKey)
 
             oSubform.FilePath = TextBox1.Text
             oSubform.Show()
@@ -26,8 +38,7 @@ Public Class Form1
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
         Try
             Dim oKey = "0467389434974657969312056"
-            Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory)
+            Dim oSubform As New Form4(LogConfig, oKey)
-            Dim oSubform As New Form4(oLogConfig, oKey)
 
             oSubform.FilePath = TextBox1.Text
             oSubform.Show()
@@ -35,4 +46,46 @@ Public Class Form1
             MsgBox(ex.Message)
         End Try
     End Sub
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        Using oGdPicturePDF As GdPicturePDF = New GdPicturePDF()
+            If oGdPicturePDF.LoadFromFile(TextBox1.Text, False) = GdPictureStatus.OK Then
+                Dim embeddedFileCount As Integer = oGdPicturePDF.GetEmbeddedFileCount()
+                If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
+                    If embeddedFileCount > 0 Then
+                        Dim FileName As String = oGdPicturePDF.GetEmbeddedFileName(0)
+                        If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
+                            Dim FileSize As Integer = oGdPicturePDF.GetEmbeddedFileSize(0)
+                            If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
+                                Dim FileData As Byte() = New Byte(FileSize) {}
+                                Dim status As GdPictureStatus = oGdPicturePDF.ExtractEmbeddedFile(0, FileData)
+                                If status = GdPictureStatus.OK Then
+                                    MessageBox.Show("The content of the first embedded file has been extracted successfully.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                                    Dim oFileStream As System.IO.FileStream = Nothing
+                                    oFileStream = New System.IO.FileStream(FileName + "_content.dat", System.IO.FileMode.Create)
+                                    oFileStream.Write(FileData, 0, FileData.Length)
+                                    oFileStream.Close()
+                                    MessageBox.Show("The content of the embedded file has been saved successfully.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                                Else
+                                    MessageBox.Show("The embedded file has failed to extract. Status: " + status.ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                                End If
+                            Else
+                                MessageBox.Show("An error occurred getting the file size. Status: " + oGdPicturePDF.GetStat().ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                            End If
+                        Else
+                            MessageBox.Show("An error occurred getting the file name. Status: " + oGdPicturePDF.GetStat().ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                        End If
+                    Else
+                        MessageBox.Show("This PDF file does not contain embedded files.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                    End If
+                Else
+                    MessageBox.Show("An error occurred getting the number of embedded files. Status: " + oGdPicturePDF.GetStat().ToString(), "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                End If
+            Else
+                MessageBox.Show("The file can't be loaded.", "Example: Emdedded files (Attachments)", MessageBoxButtons.OK, MessageBoxIcon.Error)
+            End If
+        End Using
+    End Sub
+
+
 End Class

GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj

@@ -50,13 +50,9 @@
     <Reference Include="GdPicture.NET.14">
       <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
     </Reference>
-    <Reference Include="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\14_11_19_MIME_UTF_ENCODING\Independentsoft.Msg.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.Test.DocumentViewerTest/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj

@@ -52,7 +52,7 @@
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.Test.GraphQLTest/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

GUIs.Test.TestGUI/TestGUI.vbproj

@@ -172,7 +172,7 @@
       <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Filesystem\Filesystem.vbproj">
+    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
       <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
       <Name>Filesystem</Name>
     </ProjectReference>

GUIs.Test.ZUGFeRDTest/App.config

@@ -32,6 +32,9 @@
             <setting name="MD5Cheksum" serializeAs="String">
                 <value />
             </setting>
+            <setting name="MSSQL_CONNECTIONSTRING" serializeAs="String">
+                <value>Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd</value>
+            </setting>
         </ZUGFeRDTest.My.MySettings>
     </userSettings>
   <runtime>

GUIs.Test.ZUGFeRDTest/Form1.Designer.vb

@@ -32,6 +32,7 @@ Partial Class Form1
         Me.Button5 = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.Button7 = New System.Windows.Forms.Button()
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
         Me.txtPropName = New System.Windows.Forms.TextBox()
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
@@ -60,7 +61,7 @@ Partial Class Form1
         Me.ListBox1.FormattingEnabled = True
         Me.ListBox1.Location = New System.Drawing.Point(378, 12)
         Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(526, 407)
+        Me.ListBox1.Size = New System.Drawing.Size(526, 472)
         Me.ListBox1.TabIndex = 1
         '
         'Button2
@@ -122,19 +123,29 @@ Partial Class Form1
         'GroupBox2
         '
         Me.GroupBox2.Controls.Add(Me.Button2)
+        Me.GroupBox2.Controls.Add(Me.Button7)
         Me.GroupBox2.Controls.Add(Me.Button3)
         Me.GroupBox2.Location = New System.Drawing.Point(12, 110)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(360, 90)
+        Me.GroupBox2.Size = New System.Drawing.Size(360, 155)
         Me.GroupBox2.TabIndex = 8
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
         '
+        'Button7
+        '
+        Me.Button7.Location = New System.Drawing.Point(6, 77)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(221, 23)
+        Me.Button7.TabIndex = 3
+        Me.Button7.Text = "Extract PDF Attachments"
+        Me.Button7.UseVisualStyleBackColor = True
+        '
         'GroupBox3
         '
         Me.GroupBox3.Controls.Add(Me.Button4)
         Me.GroupBox3.Controls.Add(Me.txtMD5Checksum)
-        Me.GroupBox3.Location = New System.Drawing.Point(12, 206)
+        Me.GroupBox3.Location = New System.Drawing.Point(12, 271)
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.Size = New System.Drawing.Size(360, 85)
         Me.GroupBox3.TabIndex = 9
@@ -152,7 +163,7 @@ Partial Class Form1
         '
         Me.GroupBox4.Controls.Add(Me.Button6)
         Me.GroupBox4.Controls.Add(Me.txtPropName)
-        Me.GroupBox4.Location = New System.Drawing.Point(12, 297)
+        Me.GroupBox4.Location = New System.Drawing.Point(12, 362)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(360, 122)
         Me.GroupBox4.TabIndex = 11
@@ -172,7 +183,7 @@ Partial Class Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(916, 435)
+        Me.ClientSize = New System.Drawing.Size(916, 492)
         Me.Controls.Add(Me.GroupBox4)
         Me.Controls.Add(Me.GroupBox3)
         Me.Controls.Add(Me.GroupBox2)
@@ -204,4 +215,5 @@ Partial Class Form1
     Friend WithEvents txtPropName As TextBox
     Friend WithEvents GroupBox4 As GroupBox
     Friend WithEvents Button6 As Button
+    Friend WithEvents Button7 As Button
 End Class

GUIs.Test.ZUGFeRDTest/Form1.vb

@@ -13,6 +13,7 @@ Imports DigitalData.Modules.Logging
 Public Class Form1
     Private _logConfig As LogConfig
     Private _firebird As Firebird
+    Private _mssql As MSSQLServer
     Private _zugferd As ZUGFeRDInterface
 
     Private PropertyMap As New Dictionary(Of String, XmlItemProperty)
@@ -22,8 +23,9 @@ Public Class Form1
         _logConfig = New LogConfig(LogConfig.PathType.CurrentDirectory)
         _logConfig.Debug = True
         _firebird = New Firebird(_logConfig, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PASS)
+        _mssql = New MSSQLServer(_logConfig, My.Settings.MSSQL_CONNECTIONSTRING)
 
-        _zugferd = New ZUGFeRDInterface(_logConfig)
+        _zugferd = New ZUGFeRDInterface(_logConfig, "")
     End Sub
 
     Private Function LoadFolderConfig(args As WorkerArgs)
@@ -86,7 +88,7 @@ Public Class Form1
         args = LoadFolderConfig(args)
         args = LoadPropertyMapFor(args, "DEFAULT")
 
-        Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird)
+        Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, _mssql)
 
         job.Start(args)
     End Sub
@@ -138,7 +140,7 @@ Public Class Form1
     End Function
 
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
-        Process.Start("\\dd-sto01\DD-STO01-A2\SharedObjects\Public\Projekte\Test\Import\ZUGFerD\Email_in")
+        Process.Start("\\dd-sto01\DD-DFSR01\SharedObjects\Public\Projekte\Test\Import\ZUGFerD\Email_in")
     End Sub
 
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
@@ -160,4 +162,13 @@ Public Class Form1
             End Try
         End If
     End Sub
+
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
+        Dim oExtractor = New PDFAttachments(_logConfig)
+        Dim oResult = OpenFileDialog1.ShowDialog()
+
+        If oResult = DialogResult.OK Then
+            oExtractor.Extract(OpenFileDialog1.FileName, AllowedExtensions:=New List(Of String) From {"docx", "doc", "pdf", "xls", "xlsx", "ppt", "pptx", "txt"})
+        End If
+    End Sub
 End Class

GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -107,6 +107,18 @@ Namespace My
                 Me("MD5Cheksum") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd")>  _
+        Public Property MSSQL_CONNECTIONSTRING() As String
+            Get
+                Return CType(Me("MSSQL_CONNECTIONSTRING"),String)
+            End Get
+            Set
+                Me("MSSQL_CONNECTIONSTRING") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

GUIs.Test.ZUGFeRDTest/My Project/Settings.settings

@@ -17,5 +17,8 @@
     <Setting Name="MD5Cheksum" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="MSSQL_CONNECTIONSTRING" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj

@@ -52,7 +52,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.Test.ZUGFeRDTest/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

GUIs.ZooFlow/My Project/licenses.licx

@@ -1,9 +0,0 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ZooFlow/My Project/licenses.licx.bak

@@ -0,0 +1,9 @@
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.ZooFlow/ZooFlow.vbproj

@@ -43,19 +43,19 @@
     <StartupObject>DigitalData.GUIs.ZooFlow.My.MyApplication</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.BonusSkins.v18.1" />
+    <Reference Include="DevExpress.BonusSkins.v19.2" />
-    <Reference Include="DevExpress.Data.v18.1" />
+    <Reference Include="DevExpress.Data.v19.2" />
-    <Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v18.1.Core" />
+    <Reference Include="DevExpress.Printing.v19.2.Core" />
-    <Reference Include="DevExpress.Utils.v18.1" />
+    <Reference Include="DevExpress.Utils.v19.2" />
-    <Reference Include="DevExpress.XtraBars.v18.1" />
+    <Reference Include="DevExpress.XtraBars.v19.2" />
-    <Reference Include="DevExpress.Sparkline.v18.1.Core" />
+    <Reference Include="DevExpress.Sparkline.v19.2.Core" />
-    <Reference Include="DevExpress.XtraEditors.v18.1" />
+    <Reference Include="DevExpress.XtraEditors.v19.2" />
-    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

GUIs.ZooFlow/ZooFlow.vbproj.bak

@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D0FB36EB-783D-40E1-B71E-A0B84B2FE567}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>DigitalData.GUIs.ZooFlow</RootNamespace>
+    <AssemblyName>DigitalData.GUIs.ZooFlow</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <StartupObject>ZooFlow.Program</StartupObject>
+    <FileAlignment>512</FileAlignment>
+    <OptionExplicit>On</OptionExplicit>
+    <OptionCompare>Binary</OptionCompare>
+    <OptionStrict>Off</OptionStrict>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MyType>WindowsForms</MyType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>DigitalData.GUIs.ZooFlow.My.MyApplication</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.BonusSkins.v18.1" />
+    <Reference Include="DevExpress.Data.v18.1" />
+    <Reference Include="DevExpress.DataAccess.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v18.1.Core" />
+    <Reference Include="DevExpress.Utils.v18.1" />
+    <Reference Include="DevExpress.XtraBars.v18.1" />
+    <Reference Include="DevExpress.Sparkline.v18.1.Core" />
+    <Reference Include="DevExpress.XtraEditors.v18.1" />
+    <Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
+    <Compile Include="Base\BaseClass.vb" />
+    <Compile Include="ClassClipboardWatcher.vb" />
+    <Compile Include="ClassInit.vb" />
+    <Compile Include="ClipboardWatcher\State.vb" />
+    <Compile Include="Events\OnFlowFormInteractionEvent.vb" />
+    <Compile Include="Events\OnFlowFormStateChangedEvent.vb" />
+    <Compile Include="Queries\ClassClipboardWatcherQueries.vb" />
+    <Compile Include="Queries\ClassCommonQueries.vb" />
+    <Compile Include="Config\ClassConfig.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="ClassEnvironment.vb" />
+    <Compile Include="ClassFlowForm.vb" />
+    <Compile Include="ClassInitLoader.vb" />
+    <Compile Include="Config\ClassUIConfig.vb" />
+    <Compile Include="frmConfigDatabase.Designer.vb">
+      <DependentUpon>frmConfigDatabase.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmConfigDatabase.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAdmin.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAdmin.Designer.vb">
+      <DependentUpon>frmAdmin.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFlowForm.Designer.vb">
+      <DependentUpon>frmFlowForm.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFlowForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmSettings.Designer.vb">
+      <DependentUpon>frmSettings.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSettings.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmSplash.Designer.vb">
+      <DependentUpon>frmSplash.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSplash.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="MyApplication.vb" />
+    <Compile Include="Queries\ClassQueries.vb" />
+    <EmbeddedResource Include="frmConfigDatabase.resx">
+      <DependentUpon>frmConfigDatabase.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmAdmin.resx">
+      <DependentUpon>frmAdmin.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmFlowForm.resx">
+      <DependentUpon>frmFlowForm.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSettings.resx">
+      <DependentUpon>frmSettings.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSplash.resx">
+      <DependentUpon>frmSplash.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="My Project\DataSources\ZooFlow.State.ClassUserState.datasource" />
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GUIs.ClipboardWatcher\ClipboardWatcher.vbproj">
+      <Project>{b7d465a2-ae31-4cdf-a8b2-34b42d3ea84e}</Project>
+      <Name>ClipboardWatcher</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Config\Config.vbproj">
+      <Project>{44982F9B-6116-44E2-85D0-F39650B1EF99}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
+      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
+      <Name>Database</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
+      <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
+      <Name>Filesystem</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Messaging\Messaging.vbproj">
+      <Project>{af664d85-0a4b-4bab-a2f8-83110c06553a}</Project>
+      <Name>Messaging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Patterns\Patterns.vbproj">
+      <Project>{7c3b0c7e-59fe-4e1a-a655-27ae119f9444}</Project>
+      <Name>Patterns</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.ZooFlow\ZooFlow.vbproj">
+      <Project>{81cac44f-3711-4c8f-ae98-e02a7448782a}</Project>
+      <Name>ZooFlow</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Windows\Windows.vbproj">
+      <Project>{5efaef9b-90b9-4f05-9f70-f79ad77fff86}</Project>
+      <Name>Windows</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\CW_GEFUNDEN_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CW_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GLOBIX_GEFUNDEN_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GLOBIX_klein.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ZOOFLOW_Home_klein.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

GUIs.ZooFlow/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

Modules.Config/Config.vbproj

@@ -45,7 +45,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

Modules.Config/ConfigManager.vb

@@ -32,7 +32,7 @@ Public Class ConfigManager(Of T)
         GetType(GlobalSettingAttribute)
     }
 
-    Private _ForceUserConfig As Boolean = False
+    Private _WriteAllValuesToUserConfig As Boolean = False
 
     ''' <summary>
     ''' Returns the currently loaded config object
@@ -74,7 +74,7 @@ Public Class ConfigManager(Of T)
     ''' <param name="ComputerConfigPath">The path to check for a computer config file, eg. ProgramData (Usually Application.CommonAppDataPath)</param>
     ''' <param name="ApplicationStartupPath">The path to check for a third config file. This is useful when running the Application in an environment where AppData/ProgramData directories are not available</param>
     ''' <param name="ForceUserConfig">Override values from ComputerConfig with UserConfig</param>
-    Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, ApplicationStartupPath As String, Optional ForceUserConfig As Boolean = False)
+    Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, Optional ApplicationStartupPath As String = "", Optional ForceUserConfig As Boolean = False)
         _LogConfig = LogConfig
         _Logger = LogConfig.GetLogger()
         _File = New Filesystem.File(_LogConfig)
@@ -84,13 +84,17 @@ Public Class ConfigManager(Of T)
         _Serializer = New XmlSerializer(_BlueprintType)
 
         _UserDirectory = _File.CreateDirectory(UserConfigPath)
-        _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
-        _AppConfigDirectory = _File.CreateDirectory(ApplicationStartupPath)
-        _ForceUserConfig = ForceUserConfig
-
         _UserConfigPath = Path.Combine(_UserDirectory, USER_CONFIG_NAME)
+
+        _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
         _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
+
+        If ApplicationStartupPath <> String.Empty Then
+            _AppConfigDirectory = _File.CreateDirectory(ApplicationStartupPath)
             _AppConfigPath = Path.Combine(_AppConfigDirectory, APP_CONFIG_NAME)
+        End If
+
+        _WriteAllValuesToUserConfig = ForceUserConfig
 
         Config = LoadConfig()
     End Sub
@@ -100,8 +104,8 @@ Public Class ConfigManager(Of T)
     ''' </summary>
     ''' <param name="LogConfig">LogConfig instance</param>
     ''' <param name="ConfigPath">The path to check for a user config file, eg. AppData (Usually Application.UserAppDataPath or Application.LocalUserAppDataPath)</param>
-    Public Sub New(LogConfig As LogConfig, ConfigPath As String, ApplicationStartupPath As String)
+    Public Sub New(LogConfig As LogConfig, ConfigPath As String)
-        MyClass.New(LogConfig, ConfigPath, ConfigPath, ApplicationStartupPath, ForceUserConfig:=True)
+        MyClass.New(LogConfig, ConfigPath, String.Empty, String.Empty, ForceUserConfig:=True)
     End Sub
 
     ''' <summary>
@@ -168,14 +172,10 @@ Public Class ConfigManager(Of T)
         Dim oConfig = Activator.CreateInstance(_BlueprintType)
 
         ' try to load the special app config
-        ' returns nothing if app was not found or could not be loaded
         oConfig = LoadAppConfig(oConfig)
 
-        If oConfig Is Nothing Then
+        ' try to load the computer config
-            oConfig = Activator.CreateInstance(_BlueprintType)
-            ' then Try to load computer config
         oConfig = LoadComputerConfig(oConfig)
-        End If
 
         ' now try to load userconfig
         oConfig = LoadUserConfig(oConfig)
@@ -183,19 +183,18 @@ Public Class ConfigManager(Of T)
     End Function
 
     Private Function LoadAppConfig(ByVal Config As T) As T
-        If File.Exists(_AppConfigPath) Then
+        If Not String.IsNullOrEmpty(_AppConfigPath) AndAlso File.Exists(_AppConfigPath) Then
             Try
                 Dim oAppConfig = ReadFromFile(_AppConfigPath)
                 CopyValues(oAppConfig, Config)
             Catch ex As Exception
                 _Logger.Error(ex)
                 _Logger.Warn("ApplicationConfig could not be loaded!")
-                Return Nothing
             End Try
+            _WriteAllValuesToUserConfig = False
         Else
             _Logger.Debug("ApplicationConfig does not exist.")
-            _ForceUserConfig = True
+            _WriteAllValuesToUserConfig = True
-            Return Nothing
         End If
 
         Return Config
@@ -210,9 +209,10 @@ Public Class ConfigManager(Of T)
                 _Logger.Error(ex)
                 _Logger.Warn("Computer config could not be loaded!")
             End Try
+            _WriteAllValuesToUserConfig = False
         Else
             _Logger.Debug("Computer config does not exist.")
-            _ForceUserConfig = True
+            _WriteAllValuesToUserConfig = True
         End If
 
         Return Config
@@ -228,7 +228,7 @@ Public Class ConfigManager(Of T)
                     Dim oExcludedAttributes As New List(Of Type)
 
                     ' Copy values from user config to final config
-                    If _ForceUserConfig Then
+                    If _WriteAllValuesToUserConfig Then
                         CopyValues(oUserConfig, Config, New List(Of Type))
                     Else
                         CopyValues(oUserConfig, Config, _ExcludedAttributes)
@@ -285,7 +285,7 @@ Public Class ConfigManager(Of T)
 
             ' If config was loaded from computer config, 
             ' DO NOT save connection string, etc. to user config
-            If _ForceUserConfig = False And ForceAll = False Then
+            If _WriteAllValuesToUserConfig = False And ForceAll = False Then
                 Data = FilterValues(Data, _ExcludedAttributes)
             End If
 

Modules.Config/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("0.0.6.0")>
+<Assembly: AssemblyVersion("0.0.7.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

Modules.Config/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

Modules.Database/Database.vbproj

@@ -59,7 +59,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>

Modules.Database/packages.config

@@ -3,5 +3,5 @@
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net461" />
   <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>

Modules.EDMIAPI/Channel.vb

@@ -2,7 +2,7 @@
 Imports System.Xml
 
 Public Class Channel
-    Public Shared Function GetBinding() As NetTcpBinding
+    Public Shared Function GetBinding(Optional AuthenticationMode As TcpClientCredentialType = TcpClientCredentialType.Windows) As NetTcpBinding
         Return New NetTcpBinding() With {
                 .MaxReceivedMessageSize = Constants.MAX_RECEIVED_MESSAGE_SIZE,
                 .MaxBufferSize = Constants.MAX_BUFFER_SIZE,
@@ -11,7 +11,7 @@ Public Class Channel
                 .Security = New NetTcpSecurity() With {
                     .Mode = SecurityMode.Transport,
                     .Transport = New TcpTransportSecurity() With {
-                        .ClientCredentialType = TcpClientCredentialType.Windows
+                        .ClientCredentialType = AuthenticationMode
                     }
                 },
                 .ReaderQuotas = New XmlDictionaryReaderQuotas() With {

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentResult2" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="IndexResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="NonQueryResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="ScalarResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="TableResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentResult2" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl

@@ -8,6 +8,7 @@
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
     </xsd:schema>
   </wsdl:types>
   <wsdl:message name="IIDBService_Heartbeat_InputMessage">
@@ -70,6 +71,12 @@
   <wsdl:message name="IIDBService_DeleteFile_OutputMessage">
     <wsdl:part name="parameters" element="tns:DeleteFileResponse" />
   </wsdl:message>
+  <wsdl:message name="IIDBService_ImportFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:ImportFile" />
+  </wsdl:message>
+  <wsdl:message name="IIDBService_ImportFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:ImportFileResponse" />
+  </wsdl:message>
   <wsdl:message name="IIDBService_GetDocumentByDocumentId_InputMessage">
     <wsdl:part name="parameters" element="tns:GetDocumentByDocumentId" />
   </wsdl:message>
@@ -129,6 +136,10 @@
       <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/DeleteFile" message="tns:IIDBService_DeleteFile_InputMessage" />
       <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse" message="tns:IIDBService_DeleteFile_OutputMessage" />
     </wsdl:operation>
+    <wsdl:operation name="ImportFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ImportFile" message="tns:IIDBService_ImportFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse" message="tns:IIDBService_ImportFile_OutputMessage" />
+    </wsdl:operation>
     <wsdl:operation name="GetDocumentByDocumentId">
       <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId" message="tns:IIDBService_GetDocumentByDocumentId_InputMessage" />
       <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdResponse" message="tns:IIDBService_GetDocumentByDocumentId_OutputMessage" />

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd

@@ -2,6 +2,7 @@
 <xs:schema xmlns:tns="http://DigitalData.Services.IDBService" elementFormDefault="qualified" targetNamespace="http://DigitalData.Services.IDBService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" />
   <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
   <xs:element name="Heartbeat">
     <xs:complexType>
       <xs:sequence />
@@ -139,6 +140,23 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="ImportFile">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/System.IO" minOccurs="0" name="FileInfo" nillable="true" type="q10:FileInfo" />
+        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
+        <xs:element minOccurs="0" name="ReadOnly" type="xs:boolean" />
+        <xs:element minOccurs="0" name="RetentionTime" type="xs:int" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ImportFileResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ImportFileResult" nillable="true" type="q11:DocumentResult2" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="GetDocumentByDocumentId">
     <xs:complexType>
       <xs:sequence>
@@ -149,7 +167,7 @@
   <xs:element name="GetDocumentByDocumentIdResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q10:DocumentResult" />
+        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q12:DocumentResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -163,14 +181,14 @@
   <xs:element name="GetDocumentByContainerIdResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q11:DocumentResult" />
+        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q13:DocumentResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="NewFileIndex">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q12:DocumentObject" />
+        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q14:DocumentObject" />
         <xs:element minOccurs="0" name="Syskey" nillable="true" type="xs:string" />
         <xs:element minOccurs="0" name="LanguageCode" nillable="true" type="xs:string" />
         <xs:element minOccurs="0" name="Value" nillable="true" type="xs:string" />
@@ -180,7 +198,7 @@
   <xs:element name="NewFileIndexResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q13:IndexResult" />
+        <xs:element xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q15:IndexResult" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>

Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd

@@ -61,6 +61,24 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:element name="DocumentResult" nillable="true" type="tns:DocumentResult" />
+  <xs:complexType name="DocumentResult2">
+    <xs:complexContent mixed="false">
+      <xs:extension base="tns:BaseResult">
+        <xs:sequence>
+          <xs:element name="Contents" nillable="true" type="xs:base64Binary" />
+          <xs:element name="Document" nillable="true" type="tns:DocumentResult2.DocumentObject" />
+          <xs:element name="HasContents" type="xs:boolean" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="DocumentResult2" nillable="true" type="tns:DocumentResult2" />
+  <xs:complexType name="DocumentResult2.DocumentObject">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="DocumentResult2.DocumentObject" nillable="true" type="tns:DocumentResult2.DocumentObject" />
   <xs:complexType name="IndexResult">
     <xs:complexContent mixed="false">
       <xs:extension base="tns:BaseResult">

Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.svcmap

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="8f70695e-bfc8-468e-9319-fcee52ab7587" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
+<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="1b516c6d-d2d0-4dfc-9557-3dd0593fa624" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
   <ClientOptions>
     <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
     <GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
@@ -19,17 +19,18 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" Protocol="mex" SourceId="1" />
+    <MetadataSource Address="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" Protocol="mex" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="DigitalData.Services.IDBService.wsdl" MetadataType="Wsdl" ID="971f6710-be91-4872-b6b5-ee7a9fff400f" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.IDBService.wsdl" MetadataType="Wsdl" ID="c1a28c67-687c-489e-a78c-ad8254acdb1a" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="10e64723-f4ba-4d9f-bf18-1e69717f4592" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="63e6618a-fa84-4922-b771-92728dee5bd0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.IDBService.xsd" MetadataType="Schema" ID="95252953-3cc6-400e-8e27-760bd5a4af4d" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.IDBService.xsd" MetadataType="Schema" ID="bf8a7780-bd95-4c01-8532-928e7d65f528" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="e3578761-b797-44ca-b8c5-3c9c25394c73" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="1d0f216a-7f01-4129-a6bf-26e91c5e631d" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.IDBService1.xsd" MetadataType="Schema" ID="6c450d04-bf5d-45e9-a72a-953d1e192e55" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.IDBService1.xsd" MetadataType="Schema" ID="7e8d682f-5a2c-4dd4-a7e3-fb3e0b95a585" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="d73cd0a9-b834-4be2-9d31-4d8175f9e00c" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="e0db7004-6943-4cf8-b88f-4811ed14a341" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="726d8c80-557e-49ba-9cfd-3da491f48c1e" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="6c7bdb47-eea4-4d03-bc52-9747c865bbf0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Modules.Filesystem.xsd" MetadataType="Schema" ID="72dd325b-17bf-4ec7-8a3e-933c17eca5d5" SourceId="1" SourceUrl="net.tcp://172.24.12.67:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Modules.Filesystem.xsd" MetadataType="Schema" ID="cfa7fe70-b4f1-4a12-a957-d0134a8e6279" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="System.IO.xsd" MetadataType="Schema" ID="2af2d8d2-0bc4-42bc-a200-42cecb5bf98e" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />

Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.vb

@@ -16,59 +16,60 @@ Imports System.Runtime.Serialization
 
 Namespace IDBServiceReference
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute(),
+     System.SerializableAttribute(),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.ScalarResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.ScalarResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult))>
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult))>  _
     Partial Public Class BaseResult
         Inherits Object
         Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
         
-        <System.NonSerializedAttribute()>
+        <System.NonSerializedAttribute()>  _
         Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
         
-        <System.Runtime.Serialization.OptionalFieldAttribute()>
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
         Private ErrorMessageField As String
         
-        <System.Runtime.Serialization.OptionalFieldAttribute()>
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
         Private OKField As Boolean
         
-        <Global.System.ComponentModel.BrowsableAttribute(False)>
+        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
         Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
             Get
                 Return Me.extensionDataField
             End Get
             Set
-                Me.extensionDataField = Value
+                Me.extensionDataField = value
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute()>
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
         Public Property ErrorMessage() As String
             Get
                 Return Me.ErrorMessageField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.ErrorMessageField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then
-                    Me.ErrorMessageField = Value
+                    Me.ErrorMessageField = value
                     Me.RaisePropertyChanged("ErrorMessage")
                 End If
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute()>
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
         Public Property OK() As Boolean
             Get
                 Return Me.OKField
             End Get
             Set
-                If (Me.OKField.Equals(Value) <> True) Then
+                If (Me.OKField.Equals(value) <> true) Then
-                    Me.OKField = Value
+                    Me.OKField = value
                     Me.RaisePropertyChanged("OK")
                 End If
             End Set
@@ -84,49 +85,53 @@ Namespace IDBServiceReference
         End Sub
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute(),
+     System.SerializableAttribute(),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.BaseResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.BaseResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2.DocumentObject)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentObject))>
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentObject)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileInfo)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileSystemInfo))>  _
     Partial Public Class ScalarResult
         Inherits IDBServiceReference.BaseResult
         
-        <System.Runtime.Serialization.OptionalFieldAttribute()>
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
         Private ScalarField As Object
         
-        <System.Runtime.Serialization.DataMemberAttribute()>
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
         Public Property Scalar() As Object
             Get
                 Return Me.ScalarField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.ScalarField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.ScalarField, value) <> true) Then
-                    Me.ScalarField = Value
+                    Me.ScalarField = value
                     Me.RaisePropertyChanged("Scalar")
                 End If
             End Set
         End Property
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>
+     System.SerializableAttribute()>  _
     Partial Public Class NonQueryResult
         Inherits IDBServiceReference.BaseResult
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>
+     System.SerializableAttribute()>  _
     Partial Public Class DocumentResult
         Inherits IDBServiceReference.BaseResult
         
@@ -136,102 +141,201 @@ Namespace IDBServiceReference
         
         Private HasContentsField As Boolean
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property Contents() As Byte()
             Get
                 Return Me.ContentsField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.ContentsField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then
-                    Me.ContentsField = Value
+                    Me.ContentsField = value
                     Me.RaisePropertyChanged("Contents")
                 End If
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property Document() As IDBServiceReference.DocumentObject
             Get
                 Return Me.DocumentField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.DocumentField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then
-                    Me.DocumentField = Value
+                    Me.DocumentField = value
                     Me.RaisePropertyChanged("Document")
                 End If
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property HasContents() As Boolean
             Get
                 Return Me.HasContentsField
             End Get
             Set
-                If (Me.HasContentsField.Equals(Value) <> True) Then
+                If (Me.HasContentsField.Equals(value) <> true) Then
-                    Me.HasContentsField = Value
+                    Me.HasContentsField = value
                     Me.RaisePropertyChanged("HasContents")
                 End If
             End Set
         End Property
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>
+     System.SerializableAttribute()>  _
+    Partial Public Class DocumentResult2
+        Inherits IDBServiceReference.BaseResult
+        
+        Private ContentsField() As Byte
+        
+        Private DocumentField As IDBServiceReference.DocumentResult2.DocumentObject
+        
+        Private HasContentsField As Boolean
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property Contents() As Byte()
+            Get
+                Return Me.ContentsField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then
+                    Me.ContentsField = value
+                    Me.RaisePropertyChanged("Contents")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property Document() As IDBServiceReference.DocumentResult2.DocumentObject
+            Get
+                Return Me.DocumentField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then
+                    Me.DocumentField = value
+                    Me.RaisePropertyChanged("Document")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property HasContents() As Boolean
+            Get
+                Return Me.HasContentsField
+            End Get
+            Set
+                If (Me.HasContentsField.Equals(value) <> true) Then
+                    Me.HasContentsField = value
+                    Me.RaisePropertyChanged("HasContents")
+                End If
+            End Set
+        End Property
+        
+        <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+         System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+         System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2.DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+         System.SerializableAttribute()>  _
+        Partial Public Class DocumentObject
+            Inherits Object
+            Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+            
+            <System.NonSerializedAttribute()>  _
+            Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
+            
+            <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+            Private FileNameField As String
+            
+            Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
+                Get
+                    Return Me.extensionDataField
+                End Get
+                Set
+                    Me.extensionDataField = value
+                End Set
+            End Property
+            
+            <System.Runtime.Serialization.DataMemberAttribute()>  _
+            Public Property FileName() As String
+                Get
+                    Return Me.FileNameField
+                End Get
+                Set
+                    If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
+                        Me.FileNameField = value
+                        Me.RaisePropertyChanged("FileName")
+                    End If
+                End Set
+            End Property
+            
+            Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
+            
+            Protected Sub RaisePropertyChanged(ByVal propertyName As String)
+                Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
+                If (Not (propertyChanged) Is Nothing) Then
+                    propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
+                End If
+            End Sub
+        End Class
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
+     System.SerializableAttribute()>  _
     Partial Public Class IndexResult
         Inherits IDBServiceReference.BaseResult
         
         Private IndexIdField As Long
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property IndexId() As Long
             Get
                 Return Me.IndexIdField
             End Get
             Set
-                If (Me.IndexIdField.Equals(Value) <> True) Then
+                If (Me.IndexIdField.Equals(value) <> true) Then
-                    Me.IndexIdField = Value
+                    Me.IndexIdField = value
                     Me.RaisePropertyChanged("IndexId")
                 End If
             End Set
         End Property
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>
+     System.SerializableAttribute()>  _
     Partial Public Class TableResult
         Inherits IDBServiceReference.BaseResult
         
-        <System.Runtime.Serialization.OptionalFieldAttribute()>
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
         Private TableField As System.Data.DataTable
         
-        <System.Runtime.Serialization.DataMemberAttribute()>
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
         Public Property Table() As System.Data.DataTable
             Get
                 Return Me.TableField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.TableField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.TableField, value) <> true) Then
-                    Me.TableField = Value
+                    Me.TableField = value
                     Me.RaisePropertyChanged("Table")
                 End If
             End Set
         End Property
     End Class
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem"),
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem"),  _
-     System.SerializableAttribute()>
+     System.SerializableAttribute()>  _
     Partial Public Class DocumentObject
         Inherits Object
         Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
         
-        <System.NonSerializedAttribute()>
+        <System.NonSerializedAttribute()>  _
         Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
         
         Private ContainerIdField As String
@@ -240,50 +344,50 @@ Namespace IDBServiceReference
         
         Private FileNameField As String
         
-        <Global.System.ComponentModel.BrowsableAttribute(False)>
+        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
         Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
             Get
                 Return Me.extensionDataField
             End Get
             Set
-                Me.extensionDataField = Value
+                Me.extensionDataField = value
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property ContainerId() As String
             Get
                 Return Me.ContainerIdField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.ContainerIdField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.ContainerIdField, value) <> true) Then
-                    Me.ContainerIdField = Value
+                    Me.ContainerIdField = value
                     Me.RaisePropertyChanged("ContainerId")
                 End If
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property DocumentId() As Long
             Get
                 Return Me.DocumentIdField
             End Get
             Set
-                If (Me.DocumentIdField.Equals(Value) <> True) Then
+                If (Me.DocumentIdField.Equals(value) <> true) Then
-                    Me.DocumentIdField = Value
+                    Me.DocumentIdField = value
                     Me.RaisePropertyChanged("DocumentId")
                 End If
             End Set
         End Property
         
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=True)>
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
         Public Property FileName() As String
             Get
                 Return Me.FileNameField
             End Get
             Set
-                If (Object.ReferenceEquals(Me.FileNameField, Value) <> True) Then
+                If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
-                    Me.FileNameField = Value
+                    Me.FileNameField = value
                     Me.RaisePropertyChanged("FileName")
                 End If
             End Set
@@ -299,100 +403,106 @@ Namespace IDBServiceReference
         End Sub
     End Class
     
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.IDBService", ConfigurationName:="IDBServiceReference.IIDBService")>
+     System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.IDBService", ConfigurationName:="IDBServiceReference.IIDBService")>  _
     Public Interface IIDBService
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
         Function Heartbeat() As Boolean
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
         Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
         Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
         Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
         Sub CloseDatabaseRequest()
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
         Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>  _
         Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>  _
         Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>  _
         Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>  _
         Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>  _
         Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>  _
         Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>  _
         Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>  _
         Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>  _
         Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>  _
         Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>  _
         Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>  _
         Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>  _
         Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>  _
         Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons" &
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ImportFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse")>  _
-            "e")>
+        Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ImportFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse")>  _
+        Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons"& _ 
+            "e")>  _
         Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons" &
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons"& _ 
-            "e")>
+            "e")>  _
         Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon" &
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon"& _ 
-            "se")>
+            "se")>  _
         Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon" &
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon"& _ 
-            "se")>
+            "se")>  _
         Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>  _
         Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult
         
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>  _
         Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult)
     End Interface
     
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
     Public Interface IIDBServiceChannel
         Inherits IDBServiceReference.IIDBService, System.ServiceModel.IClientChannel
     End Interface
     
-    <System.Diagnostics.DebuggerStepThroughAttribute(),
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
     Partial Public Class IDBServiceClient
         Inherits System.ServiceModel.ClientBase(Of IDBServiceReference.IIDBService)
         Implements IDBServiceReference.IIDBService
@@ -434,7 +544,7 @@ Namespace IDBServiceReference
         End Function
         
         Public Sub CloseDatabaseRequest() Implements IDBServiceReference.IIDBService.CloseDatabaseRequest
-            MyBase.Channel.CloseDatabaseRequest()
+            MyBase.Channel.CloseDatabaseRequest
         End Sub
         
         Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements IDBServiceReference.IIDBService.CloseDatabaseRequestAsync
@@ -497,6 +607,14 @@ Namespace IDBServiceReference
             Return MyBase.Channel.DeleteFileAsync(DocObject)
         End Function
         
+        Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2 Implements IDBServiceReference.IIDBService.ImportFile
+            Return MyBase.Channel.ImportFile(FileInfo, Contents, [ReadOnly], RetentionTime)
+        End Function
+        
+        Public Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2) Implements IDBServiceReference.IIDBService.ImportFileAsync
+            Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime)
+        End Function
+        
         Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByDocumentId
             Return MyBase.Channel.GetDocumentByDocumentId(DocumentId)
         End Function

Modules.EDMIAPI/Connected Services/IDBServiceReference/System.IO.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:tns="http://schemas.datacontract.org/2004/07/System.IO" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/System.IO" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+  <xs:complexType name="FileInfo">
+    <xs:complexContent mixed="false">
+      <xs:extension base="tns:FileSystemInfo" />
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="FileInfo" nillable="true" type="tns:FileInfo" />
+  <xs:complexType name="FileSystemInfo">
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##local" processContents="skip" />
+    </xs:sequence>
+    <xs:attribute ref="ser:FactoryType" />
+  </xs:complexType>
+  <xs:element name="FileSystemInfo" nillable="true" type="tns:FileSystemInfo" />
+</xs:schema>

Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration.svcinfo

@@ -2,7 +2,7 @@
 <configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
   <behaviors />
   <bindings>
-    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;tcpBinding&quot; /&gt;" bindingType="netTcpBinding" name="tcpBinding" />
+    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;tcpBinding&quot;&gt;&lt;security&gt;&lt;transport sslProtocols=&quot;None&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="tcpBinding" />
   </bindings>
   <endpoints>
     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;IDBServiceReference.IIDBService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;IDBServiceReference.IIDBService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="IDBServiceReference.IIDBService" name="tcpBinding" />

Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration91.svcinfo

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="fq6ZABYBBZDTG2RPQCA7uj4nPro=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="gcZhEvE0dzQnwKubt3MrVgLmByo=">
   <bindingConfigurations>
     <bindingConfiguration bindingType="netTcpBinding" name="tcpBinding">
       <properties>
@@ -105,8 +105,8 @@
         <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>(Sammlung)</serializedValue>
         </property>
-        <property path="/security/transport/sslProtocols" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.SslProtocols, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <property path="/security/transport/sslProtocols" isComplexType="false" isExplicitlyDefined="true" clrType="System.Security.Authentication.SslProtocols, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>Tls, Tls11, Tls12</serializedValue>
+          <serializedValue>None</serializedValue>
         </property>
         <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.MessageSecurityOverTcpElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>System.ServiceModel.Configuration.MessageSecurityOverTcpElement</serializedValue>

Modules.EDMIAPI/Connected Services/IDBServiceReference/service.wsdl

@@ -129,6 +129,15 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="ImportFile">
+      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ImportFile" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="GetDocumentByDocumentId">
       <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId" style="document" />
       <wsdl:input>