diff --git a/Controls.DocumentViewer/Classes/Annotations.vb b/Controls.DocumentViewer/Classes/Annotations.vb index 56c72d13..6bef5107 100644 --- a/Controls.DocumentViewer/Classes/Annotations.vb +++ b/Controls.DocumentViewer/Classes/Annotations.vb @@ -1,4 +1,5 @@ -Imports DigitalData.Modules.Base +Imports System.Drawing +Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports GdPicture14 Imports GdPicture14.Annotations diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index e08d99f5..5abc7b62 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -1,4 +1,7 @@ - +Imports System.Windows.Controls +Imports System.Windows.Forms + + Partial Class DocumentViewer Inherits System.Windows.Forms.UserControl @@ -504,7 +507,7 @@ Partial Class DocumentViewer Friend WithEvents GdViewer As GdPicture14.GdViewer Friend WithEvents OpenFileDialog As OpenFileDialog Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl - Friend WithEvents PrintDocument1 As Printing.PrintDocument + Friend WithEvents PrintDocument1 As Drawing.Printing.PrintDocument Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager Friend WithEvents ToolbarDocumentViewer As DevExpress.XtraBars.Bar Friend WithEvents buttonPrint As DevExpress.XtraBars.BarButtonItem @@ -541,5 +544,5 @@ Partial Class DocumentViewer Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl - Friend WithEvents lblInfo As Label + Friend WithEvents lblInfo As System.Windows.Forms.Label End Class diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 89d0633b..73776a38 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -7,6 +7,8 @@ Imports GdPicture14 Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.Config +Imports System.Windows.Forms +Imports System.Drawing Public Class DocumentViewer Private Enum ZoomMode diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 48003a15..bbbc8e8d 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -1,363 +1,133 @@ - - - + - Debug - AnyCPU - {0958CDDF-4A16-41F6-8837-8335F71D599C} - Library - - DigitalData.Controls.DocumentViewer - DigitalData.Controls.DocumentViewer - 512 + net8.0-windows + true + true Windows - v4.6.2 - true - - - - - - AnyCPU - true - full - true - true - bin\Debug\ - DigitalData.Controls.DocumentViewer.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.DocumentViewer.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On + true + Library + DigitalData.Controls.DocumentViewer + Provides the documentviewer for Digital Data products + Digital Data GmbH, Heuchelheim + enable + $(AssemblyName) + $(AssemblyName) + 2.5.0 + 2.5.0 - - ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll - - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\DDModules\Base\bin\Debug\net8.0-windows\DigitalData.Modules.Base.dll - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll - ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + ..\..\DDModules\Messaging\bin\Debug\net8.0-windows\DigitalData.Modules.Messaging.dll - - ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll - - - ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll - - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll - True - - - ..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll - - - - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - - ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - - ..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll - - - - - ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll - - - ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll - - - ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll - - - - ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - - ..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll - - - ..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll - - - - - - - - ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll - - - - ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll - - - ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - - - ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll - - - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.DataAccess.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Images.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Office.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Pdf.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Printing.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.RichEdit.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.DataVisualization.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Spreadsheet.v21.2.Core.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Data.Desktop.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Utils.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraBars.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.XtraCharts.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraEditors.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraGrid.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraLayout.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraNavBar.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraPrinting.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraRichEdit.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraSpreadsheet.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraTreeList.v21.2.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - DocumentViewer.vb - - - UserControl - - - frmViewerSettings.vb - - - Form - - - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - DocumentViewer.vb - - - frmViewerSettings.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - \ No newline at end of file diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index a41fb1e0..e74a75f7 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -1,35 +1,9 @@ Imports System Imports System.Reflection Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' übernehmen, indem Sie "*" eingeben: -' - - - diff --git a/Controls.DocumentViewer/frmViewerSettings.Designer.vb b/Controls.DocumentViewer/frmViewerSettings.Designer.vb index 37e0efc6..5bfd4cd7 100644 --- a/Controls.DocumentViewer/frmViewerSettings.Designer.vb +++ b/Controls.DocumentViewer/frmViewerSettings.Designer.vb @@ -1,4 +1,6 @@ - _ +Imports System.Windows.Forms + + Partial Class frmViewerSettings Inherits System.Windows.Forms.Form diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config deleted file mode 100644 index 4c46deb2..00000000 --- a/Controls.DocumentViewer/packages.config +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl.vbproj b/Controls.LookupGrid/LookupControl.vbproj index 948806fa..5e20567c 100644 --- a/Controls.LookupGrid/LookupControl.vbproj +++ b/Controls.LookupGrid/LookupControl.vbproj @@ -1,188 +1,44 @@ - - - + - Debug - AnyCPU - {3DCD6D1A-C830-4241-B7E4-27430E7EA483} - Library DigitalData.Controls.LookupGrid - DigitalData.Controls.LookupGrid - 512 + net8.0-windows + true Windows - v4.6.2 - - - - true - full - true - true - bin\Debug\ - DigitalData.Controls.LookupGrid.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.LookupGrid.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On + true + Library + DigitalData.Controls.LookupGrid + Provides functionality of LookUpGrid for DD products + Digital Data GmbH + $(AssemblyName) + $(AssemblyName) + 3.5.0 + 3.5.0 - - False + + ..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll - - False - - - False - - - False - - - False - - - False - - - - - - - False - - - False - - - - - - - - - - - - - - - - - - - + - - frmLookupGrid.vb - - - Form - - - - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - LookupControl3.vb - - - Component - - - Strings.en.resx - True - True - - - True - True - Strings.resx - + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Data.Desktop.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Utils.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraEditors.v21.2.dll + + + D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraGrid.v21.2.dll + - - - frmLookupGrid.vb - - - frmLookupGrid.vb - - - frmLookupGrid.vb - - - frmLookupGrid.vb - Designer - - - LookupControl3.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - ResXFileCodeGenerator - Strings.en.Designer.vb - My.Resources - - - - My.Resources - ResXFileCodeGenerator - Strings.Designer.vb - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - + + \ No newline at end of file diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index fd017a90..b89c4441 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -10,6 +10,7 @@ Imports DevExpress.Accessibility Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Columns +Imports System.Data Public Class LookupControl3 @@ -274,7 +275,7 @@ Public Class RepositoryItemLookupControl3 Using oForm = GetLookupForm() Dim oResult = oForm.ShowDialog() - If oResult = Windows.Forms.DialogResult.OK Then + If oResult = System.Windows.Forms.DialogResult.OK Then Dim oValues = oForm.SelectedValues UpdateSelectedValues(oValues) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 400e317f..ddcbc265 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -1,35 +1,9 @@ Imports System Imports System.Reflection Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' übernehmen, indem Sie "*" eingeben: -' - - - diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb index f89699ec..c3df0a0e 100644 --- a/Controls.LookupGrid/frmLookupGrid.Designer.vb +++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb @@ -91,7 +91,7 @@ Partial Class frmLookupGrid Friend WithEvents gridLookup As DevExpress.XtraGrid.GridControl Friend WithEvents viewLookup As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents Panel1 As Windows.Forms.Panel - Friend WithEvents btnOK As Windows.Forms.Button - Friend WithEvents btnClear As Windows.Forms.Button + Friend WithEvents Panel1 As System.Windows.Forms.Panel + Friend WithEvents btnOK As System.Windows.Forms.Button + Friend WithEvents btnClear As System.Windows.Forms.Button End Class diff --git a/Controls.LookupGrid/frmLookupGrid.vb b/Controls.LookupGrid/frmLookupGrid.vb index ffad6cc9..754284eb 100644 --- a/Controls.LookupGrid/frmLookupGrid.vb +++ b/Controls.LookupGrid/frmLookupGrid.vb @@ -1,4 +1,5 @@ -Imports System.Windows.Forms +Imports System.Data +Imports System.Windows.Forms Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Base diff --git a/Controls.SnapPanel/My Project/AssemblyInfo.vb b/Controls.SnapPanel/My Project/AssemblyInfo.vb index becaa04b..ffe3e168 100644 --- a/Controls.SnapPanel/My Project/AssemblyInfo.vb +++ b/Controls.SnapPanel/My Project/AssemblyInfo.vb @@ -1,35 +1,9 @@ Imports System Imports System.Reflection Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - 'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' indem Sie "*" wie unten gezeigt eingeben: -' - - - diff --git a/Controls.SnapPanel/SnapPanel.vbproj b/Controls.SnapPanel/SnapPanel.vbproj index 67683bde..134d9e0a 100644 --- a/Controls.SnapPanel/SnapPanel.vbproj +++ b/Controls.SnapPanel/SnapPanel.vbproj @@ -1,110 +1,17 @@ - - - + - Debug - AnyCPU - {3E19C413-3197-4635-944E-558FC04C3475} - Library DigitalData.Controls.SnapPanel - DigitalData.Controls.SnapPanel - 512 + net8.0-windows + true Windows - v4.6.2 - true - + true + Library + DigitalData.Controls.SnapPanel + $(AssemblyName) + Provides a snappanel for designing forms + Digital Data GmbH, Heuchelheim + $(AssemblyName) + 2.2 + 2.2 - - true - full - true - true - bin\Debug\ - DigitalData.Controls.SnapPanel.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.Controls.SnapPanel.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - - - - - - - - - - - - - True - Application.myapp - True - - - True - True - Resources.resx - - - True - Settings.settings - True - - - Component - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - \ No newline at end of file diff --git a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj index eb36d078..dcfe9c67 100644 --- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj +++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj @@ -1,161 +1,48 @@ - - - + - Debug - AnyCPU - {7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} + net8.0-windows WinExe - DDZUGFeRDService.ZUGFeRDService DDZUGFeRDService - DDZUGFeRDService - 512 - Console - v4.6.2 - true - - - - AnyCPU - true - full - true - true - bin\Debug\ - DDZUGFeRDService.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - DDZUGFeRDService.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - + DDZUGFeRDService.ZUGFeRDService + true + true + enable + DDZUGFeRDService + Digital Data GmbH, Heuchelheim + DDZUGFeRDService + 3.0.0 + 3.0.0 + + - - False - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll - - False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll - - False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\..\DDModules\Database\bin\Debug\net8.0-windows\DigitalData.Modules.Database.dll - - False - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + + ..\..\DDModules\Interfaces\bin\Debug\net8.0-windows\DigitalData.Modules.Interfaces.dll - - False - ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll + + ..\..\DDModules\Jobs\bin\Debug\net8.0-windows\DigitalData.Modules.Jobs.dll - - False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll - - - ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - True - Application.myapp - True - - - Component - - - - Component - - - ZUGFeRDService.vb - - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - ZUGFeRDService.vb - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - + \ No newline at end of file diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index b418d86d..ebd9df95 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -1,35 +1,9 @@ Imports System Imports System.Reflection Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' übernehmen, indem Sie "*" eingeben: -' - - - diff --git a/Services.ZUGFeRDService/Program.cs b/Services.ZUGFeRDService/Program.cs new file mode 100644 index 00000000..3e953e10 --- /dev/null +++ b/Services.ZUGFeRDService/Program.cs @@ -0,0 +1,21 @@ +using CoreWCF.Configuration; +using CoreWCF.Description; + +var builder = WebApplication.CreateBuilder(args); + +// Add CoreWCF services +builder.Services.AddServiceModelServices(); +builder.Services.AddServiceModelMetadata(); +builder.Services.AddSingleton(); + +var app = builder.Build(); + +app.UseServiceModel(builder => +{ + // TODO add here service endpoints and behaviors +}); + +var serviceMetadataBehavior = app.Services.GetRequiredService(); +serviceMetadataBehavior.HttpGetEnabled = true; + +app.Run(); diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index 96982dbe..796f143b 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel +Imports System.Data Imports System.IO Imports System.Timers Imports DigitalData.Modules.Config diff --git a/Services.ZUGFeRDService/ZUGFeRDService.vb b/Services.ZUGFeRDService/ZUGFeRDService.vb index a1fdcc86..51949ff9 100644 --- a/Services.ZUGFeRDService/ZUGFeRDService.vb +++ b/Services.ZUGFeRDService/ZUGFeRDService.vb @@ -9,7 +9,7 @@ Public Class ZUGFeRDService Private Logger As Logger Private ThreadRunner As ThreadRunner - Protected Overrides Sub OnStart(args() As String) + Protected Sub OnStart(args() As String) Try LogConfig = New LogConfig(PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "DDZUGFeRDService") Dim oConfig = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath) @@ -37,10 +37,12 @@ Public Class ZUGFeRDService End Try End Sub - Protected Overrides Sub OnStop() + Protected Sub OnStop() Logger.Info($"{Constants.SERVICE_NAME} is stopping.") ThreadRunner.Stop() Logger.Info($"{Constants.SERVICE_NAME} stopped.") End Sub + + End Class