diff --git a/EB_Creator/App.config b/EB_Creator/App.config index 8d5572b..faaa243 100644 --- a/EB_Creator/App.config +++ b/EB_Creator/App.config @@ -1,8 +1,8 @@ - + - -
+ +
@@ -10,7 +10,7 @@ providerName="System.Data.SqlClient" /> - + @@ -46,4 +46,4 @@ - \ No newline at end of file + diff --git a/EB_Creator/EB_Creator.vbproj b/EB_Creator/EB_Creator.vbproj index 4af8e51..913089b 100644 --- a/EB_Creator/EB_Creator.vbproj +++ b/EB_Creator/EB_Creator.vbproj @@ -11,9 +11,10 @@ EB_Creator 512 Console - v4.6.1 + v4.8 true true + AnyCPU @@ -69,23 +70,27 @@ - + + False ..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll - - ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + + False + ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll - - ..\..\..\DDMonorepo\Modules.Config\bin\Debug\NLog.dll + + ..\packages\NLog.5.0.5\lib\net46\NLog.dll + + @@ -108,6 +113,7 @@ True Application.myapp + True Component @@ -187,6 +193,7 @@ Settings.Designer.vb + \ No newline at end of file diff --git a/EB_Creator/My Project/Application.Designer.vb b/EB_Creator/My Project/Application.Designer.vb index 88dd01c..8ab460b 100644 --- a/EB_Creator/My Project/Application.Designer.vb +++ b/EB_Creator/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/EB_Creator/My Project/AssemblyInfo.vb b/EB_Creator/My Project/AssemblyInfo.vb index 0058258..b9e3192 100644 --- a/EB_Creator/My Project/AssemblyInfo.vb +++ b/EB_Creator/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - - + + diff --git a/EB_Creator/My Project/Resources.Designer.vb b/EB_Creator/My Project/Resources.Designer.vb index ecf7da1..7b4a52f 100644 --- a/EB_Creator/My Project/Resources.Designer.vb +++ b/EB_Creator/My Project/Resources.Designer.vb @@ -1,40 +1,41 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + + '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. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -44,17 +45,17 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/EB_Creator/My Project/Settings.Designer.vb b/EB_Creator/My Project/Settings.Designer.vb index e29fc52..9040166 100644 --- a/EB_Creator/My Project/Settings.Designer.vb +++ b/EB_Creator/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -54,17 +54,6 @@ Namespace My End Get End Property - _ - Public ReadOnly Property MyConnectionString() As String - Get - Return CType(Me("MyConnectionString"),String) - End Get - End Property - _ @@ -156,6 +145,17 @@ Namespace My Return CType(Me("oSQLThread2"),String) End Get End Property + + _ + Public ReadOnly Property MyConnectionString() As String + Get + Return CType(Me("MyConnectionString"),String) + End Get + End Property End Class End Namespace diff --git a/EB_Creator/My Project/Settings.settings b/EB_Creator/My Project/Settings.settings index 4f5cc96..3e39971 100644 --- a/EB_Creator/My Project/Settings.settings +++ b/EB_Creator/My Project/Settings.settings @@ -2,14 +2,6 @@ - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - False @@ -40,5 +32,13 @@ select distinct Top 2 DOC_ID,'STANDARD' as Outputfilename from VWCUST_RPTPM_UNION order by DOC_ID DESC + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> +</SerializableConnectionString> + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + \ No newline at end of file diff --git a/EB_Creator/MyService.vb b/EB_Creator/MyService.vb index 39b86c9..f5b4f94 100644 --- a/EB_Creator/MyService.vb +++ b/EB_Creator/MyService.vb @@ -299,7 +299,7 @@ Public Class MyService MyFreigabebericht = oMyErgebnisbericht Dim oOriginFile As String - Dim osql = $"select dbo.FNDD_GET_WINDREAM_FILE_PATH ({pDocID},{My.Settings.FNDD_GET_WM_FPATH_VARIANT})" + Dim osql = $"select dbo.FNDD_GET_WINDREAM_FILE_PATH ({pDocID},{My.Settings.FNDD_GET_WM_FPATH_VARIANT},0)" oOriginFile = MyDatabase.GetScalarValue(osql) If File.Exists(oOriginFile) = False Then Logger.Warn($"File.Exists = false ### [{oOriginFile}] is not existing. Check Your security-permissions [{osql}]!") diff --git a/EB_Creator/packages.config b/EB_Creator/packages.config new file mode 100644 index 0000000..83b20bb --- /dev/null +++ b/EB_Creator/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file