diff --git a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db index aa5d6e1..a17f4c1 100644 Binary files a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db and b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db differ diff --git a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-shm b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-shm index db1c586..c9fcadf 100644 Binary files a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-shm and b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-shm differ diff --git a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-wal b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-wal index d8dc43e..cf63c98 100644 Binary files a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-wal and b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/CodeChunks.db-wal differ diff --git a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db index 330f6d0..ab9afeb 100644 Binary files a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db and b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db differ diff --git a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-shm b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-shm index 3124e5d..790d170 100644 Binary files a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-shm and b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-shm differ diff --git a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-wal b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-wal index ab048f3..ea7bd64 100644 Binary files a/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-wal and b/.vs/ToolCollection/CopilotIndices/17.14.1577.30250/SemanticSymbols.db-wal differ diff --git a/ToolCollection/ClassNIDatenbankzugriff.vb b/ToolCollection/ClassNIDatenbankzugriff.vb index ff58c76..ac932cf 100644 --- a/ToolCollection/ClassNIDatenbankzugriff.vb +++ b/ToolCollection/ClassNIDatenbankzugriff.vb @@ -13,7 +13,6 @@ Public Class ClassNIDatenbankzugriff Private Shared _LastStep, _SQL As String Private Shared aTimerCount As Integer = 0 Private Shared aTimer As System.Timers.Timer - Private Shared Oracle_Conn As New OracleConnection Private _firebird As Firebird Sub New(LogConf As DigitalData.Modules.Logging.LogConfig) @@ -26,427 +25,14 @@ Public Class ClassNIDatenbankzugriff End Sub - ''' - ''' Start the timer. - ''' - Shared Sub Timer_Start() - aTimerCount = 0 - aTimer = New System.Timers.Timer(1000) - AddHandler aTimer.Elapsed, AddressOf OnTimedEvent - aTimer.Enabled = True - End Sub - ''' - ''' Start the timer. - ''' Shared Sub Timer_Stop() aTimer.Enabled = False aTimerCount = 0 End Sub - ' Specify what you want to happen when the Elapsed event is - ' raised. - Private Shared Sub OnTimedEvent(source As Object, e As ElapsedEventArgs) - aTimerCount = aTimerCount + 1 - If aTimerCount > 60 Then - _Logger.Warn("ClassNIDatenbankzugriff.OnTimedEvent-Die Maximaldauer (60sec) wurde überschritten!") - _Logger.Warn("OracleConnection.StatementCacheSize: " & Oracle_Conn.StatementCacheSize) - _Logger.Warn("Last Step: " & _LastStep) - _Logger.Warn("OracleConnection.Connection State: " & Oracle_Conn.State.ToString) - _Logger.Warn("OracleSQLCommand: " & _SQL) - Oracle_Conn.Close() - frmNIHauptseite.Abbruch_NI("Abbruch aufgrund Timeout Oracle", False, False) - _Logger.Info("INDEXIERUNG WIRD NEUGESTARTET") - 'und Neustart - frmNIHauptseite.Profile_Durchlaufen() - aTimer.Enabled = False - 'Else - ' If My.Settings.vLogErrorsonly = False Then - ' _Logger.Debug("OracleConnection.StatementCacheSize: " & Oracle_Conn.StatementCacheSize) - ' End If - End If - End Sub - ' führt eine SQL-Anweisung auf der DB aus - Public Function GetValueFromOracleDb(Profilname As String, ByVal selectAnweisung As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String, ByVal myDS As DataSet, Optional ByVal Indexname As String = "", Optional ByVal QuellVektor As Boolean = False) - Dim swGvfO As New ClassStopwatch("GetValueFromOracleDb") - _SQL = selectAnweisung - 'MsgBox(selectAnweisung) - _Logger.Debug("GetValueFromOracleDb: " & selectAnweisung) - Try - 'die nötigen Variablen definieren - Dim result As Object = Nothing - 'MsgBox("TestM: " & selectAnweisung) - - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If host <> "" And servicename <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - servicename & ")));User Id=" & User & ";Password=" & pw & ";" - Else - conn.DataSource = host - conn.StatementCacheSize = 1 - conn.UserID = User - conn.Password = pw - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - - Oracle_Conn = New OracleConnection(connstr) - - Dim Oracle_Command As OracleCommand = Nothing - Dim DataAdapter As OracleDataAdapter = Nothing - - Dim DataSet As DataSet = Nothing - 'ConnectionString.DataSource = datasource - 'ConnectionString. = User - 'ConnectionString.Password = pw - - - ' Verbindung zur Datenbank aufbauen - Try - _LastStep = "OracleCon wird geöffnet" - Oracle_Conn.Open() - _LastStep = "OracleCon.State: " & Oracle_Conn.State.ToString - Catch ex As Exception - _Logger.Error(ex) - - ' DB-Connection schliessen - Me.CloseOracleDb(Oracle_Conn) - Return Nothing - End Try - - - ' SQL-Abfrage definieren - Try - Oracle_Command = New OracleCommand(selectAnweisung, Oracle_Conn) 'OracleCommand(selectAnweisung, Connection) - Oracle_Command.AddToStatementCache = True - _LastStep = "ORACLE Command definiert" - Catch ex As Exception - _Logger.Error(ex) - - ' DB-Connection schliessen - Me.CloseOracleDb(Oracle_Conn) - Return Nothing - End Try - - ' *** ÜBER EIN DATASET *** - If Command() IsNot Nothing Then - Try - 'Datenadapter laden - DataAdapter = New OracleDataAdapter(Oracle_Command) 'OracleDataAdapter(Command) - - ' DataSet erzeugen - DataSet = New DataSet() - ' DataSet mit Daten füllen - Dim count As Integer = 0 - _LastStep = "Ausführung ORACLE DataAdapter......" - DataAdapter.Fill(DataSet) - _LastStep = "ORACLE DataAdapter ausgeführt" - 'Do While DataAdapter.Fill(DataSet) - ' count += 1 - ' If count > 2000 Then - ' _Logger.Debug(">> ORACLE DataAdapter > 2000") - ' _Logger.Debug(">> DataAdapter.Requery = " & DataAdapter.Requery.ToString) - ' _Logger.Info(sw.Done()) - ' Return Nothing - ' End If - 'Loop - 'DataAdapter.Fill(DataSet) - Oracle_Conn.Close() - ' DB-Connection schliessen - _LastStep = "DataSet wird durchlaufen" - If DataSet.Tables(0).Rows.Count > 1 Or QuellVektor = True Then - 'Beginne mit 0 - Dim Index As Integer = 0 - For Each Row As DataRow In DataSet.Tables(0).Rows - Dim Row1 As DataRow - Row1 = myDS.Tables("TBVEKTOR_ARRAY").NewRow() - 'filling the row with values. Item property is used to set the field value. - Row1.Item("IndexName") = Indexname - Row1.Item("Value") = CStr(Row.Item(0)) - myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(Row1) - ' ds.Tables("TBVEKTOR_ARRAYDataTable").Rows.Add(Temptable.Rows(0)) - Index = Index + 1 - Next - _LastStep = "DataSet wurde durchlaufen" - Dim msg = swGvfO.Done - If msg <> "" Then _Logger.Debug($"SWResult: {msg}") - Return Index - Else - If DataSet.Tables(0).Rows.Count = 1 Then - _LastStep = "Rows.Count = 1" - ' einen einzigen relevanten Wert zurückgeben (sollten keine mehrfachen Einträge auftauchen) - _Logger.Debug("PLSQL-Ergebnis: '" & DataSet.Tables(0).Rows(0).Item(0) & "'") - ' MsgBox("TestM: Wert: " & DataSet.Tables(0).Rows(0).Item(0).ToString) - Dim msg = swGvfO.Done - If msg <> "" Then _Logger.Debug($"SWResult: {msg}") - Return DataSet.Tables(0).Rows(0).Item(0) - Else - _LastStep = "Rows.Count = 0" - 'If My.Settings.vLogErrorsonly = False Then _Logger.Info("Dataadapter Rows count = 0") - Dim msg = swGvfO.Done - If msg <> "" Then _Logger.Debug($"SWResult: {msg}") - Return Nothing - End If - End If - Catch ex As Exception - ' bei einem Fehler einen Eintrag in der Logdatei erzeugen - _Logger.Error(ex) - _Logger.Warn($"Unexpected error in GetValueFromOracleDB - Oracle-Command: {selectAnweisung}") - ' DB-Connection schliessen - Oracle_Conn.Close() - Dim msg = swGvfO.Done - If msg <> "" Then _Logger.Debug($"SWResult: {msg}") - Return Nothing - End Try - - Else - ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte - ' Eintrag in Logdatei machen - _Logger.Warn("ClassNIDatenbankzugriff.GetValueFromOracleDb", "SQL-Anweisung ist ungültig. Command-Objekt konnte nicht erstellt werden. (SQL: " & selectAnweisung & ")") - Dim msg = swGvfO.Done - If msg <> "" Then _Logger.Debug($"SWResult: {msg}") - Return Nothing - End If - - - Catch ex As Exception - _Logger.Error(ex) - _Logger.Warn($"Unexpected error in GetValueFromOracleDB: [{ex.Message}] -Oracle-Command: " & selectAnweisung) - ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden - Dim msg = swGvfO.Done - If msg <> "" Then _Logger.Debug($"SWResult: {msg}") - Return Nothing - End Try - - End Function - ' führt eine SQL-Anweisung auf der DB aus - Public Function ExecuteonOracleDb(Profilname As String, ByVal plsqlcommand As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String) - Try - ' die nötigen Variablen definieren - Dim result As Object = Nothing - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If host <> "" And servicename <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - servicename & ")));User Id=" & User & ";Password=" & pw & ";" - Else - conn.DataSource = host - conn.UserID = User - conn.Password = pw - conn.Pooling = True - conn.StatementCacheSize = 1 - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - - - Oracle_Conn = New OracleConnection(connstr) - Dim Oracle_Command As OracleCommand = Nothing - Dim DataAdapter As OracleDataAdapter = Nothing - - ' Verbindung zur Datenbank aufbauen - Try - Oracle_Conn.Open() - Catch ex As Exception - _Logger.Error(ex) - ' DB-Connection schliessen - Me.CloseOracleDb(Oracle_Conn) - Return 0 - End Try - - - ' SQL-Abfrage definieren - Try - Oracle_Command = New OracleCommand(plsqlcommand, Oracle_Conn) - Oracle_Command.AddToStatementCache = True - _Logger.Debug(">> Oracle-Command: " & plsqlcommand) - Catch ex As Exception - _Logger.Error(ex) - ' DB-Connection schliessen - Me.CloseOracleDb(Oracle_Conn) - Return 0 - End Try - - - ' *** Ausführen des Command *** - If Command() IsNot Nothing Then - - Try - Oracle_Command.ExecuteNonQuery() - ' DB-Connection schliessen - Me.CloseOracleDb(Oracle_Conn) - Return 1 - - Catch ex As Exception - ' bei einem Fehler einen Eintrag in der Logdatei erzeugen - _Logger.Error(ex) - ' DB-Connection schliessen - Me.CloseOracleDb(Oracle_Conn) - Return 0 - End Try - - Else - ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte - ' Eintrag in Logdatei machen - _Logger.Warn("ClassNIDatenbankzugriff.ExecuteonOracleDb", "SQL-Command ist ungültig bzw konnte nicht erstellt werden (SQL: " & plsqlcommand & ")") - Timer_Stop() - Return 0 - End If - - - Catch ex As Exception - ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden - _Logger.Error(ex) - - Timer_Stop() - Return 0 - End Try - - End Function - Public Function ExecuteonOracleClient(Profilname As String, ByVal plsqlcommand As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String) - Try - ' die nötigen Variablen definieren - Dim result As Object = Nothing - - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If host <> "" And servicename <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - servicename & ")));User Id=" & User & ";Password=" & pw & ";" - Else - conn.DataSource = host - conn.UserID = User - conn.StatementCacheSize = 1 - conn.Password = pw - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - Oracle_Conn = New OracleConnection(conn.ConnectionString) - Dim Oracle_Command As OracleCommand = Nothing - Dim DataAdapter As OracleDataAdapter = Nothing - - ' Verbindung zur Datenbank aufbauen - Try - Oracle_Conn.Open() - Catch ex As Exception - _Logger.Error(ex) - - ' DB-Connection schliessen - Oracle_Conn.Close() - Timer_Stop() - Return 0 - End Try - - - ' SQL-Abfrage definieren - Try - Oracle_Command = New OracleCommand(plsqlcommand, Oracle_Conn) - Oracle_Command.AddToStatementCache = True - _Logger.Debug(">> Oracle-Command: " & plsqlcommand) - Catch ex As Exception - _Logger.Error(ex) - - ' DB-Connection schliessen - Oracle_Conn.Close() - Timer_Stop() - Return 0 - End Try - - - ' *** Ausführen des Command *** - If Command() IsNot Nothing Then - - Try - Oracle_Command.ExecuteNonQuery() - 'Dim count = 1 - 'Do While Oracle_Command.ExecuteNonQuery() - ' count += 1 - ' If count > 2000 Then - ' _Logger.Debug(">> Oracle_Command.ExecuteNonQuery > 2000") - ' Oracle_Conn.Close() - ' Timer_Stop() - ' Return 0 - ' End If - 'Loop - - ' DB-Connection schliessen - Oracle_Conn.Close() - Timer_Stop() - Return 1 - - Catch ex As Exception - ' bei einem Fehler einen Eintrag in der Logdatei erzeugen - _Logger.Error(ex) - ' DB-Connection schliessen - Oracle_Conn.Close() - Timer_Stop() - Return 0 - End Try - - Else - ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte - ' Eintrag in Logdatei machen - _Logger.Warn("ClassNIDatenbankzugriff.ExecuteonOracleClient", "SQL-Command ist ungültig bzw konnte nicht erstellt werden (SQL: " & plsqlcommand & ")") - Timer_Stop() - Return 0 - End If - - - Catch ex As Exception - ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden - _Logger.Error(ex) - Timer_Stop() - Return 0 - End Try - - End Function ' Überprüft den Indexwert und gibt 0 oder mehr zurück - Public Function CheckIndex_oracle(ByVal _scalar_select As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String) - Try - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If host <> "" And servicename <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - servicename & ")));User Id=" & User & ";Password=" & pw & ";" - - Else - conn.DataSource = host - conn.UserID = User - conn.Password = pw - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - Dim Oracle_Connection As New OracleConnection(connstr) - - Try - Oracle_Connection.Open() - Catch ex As Exception - _Logger.Error(ex) - ' DB-Connection schliessen - Return 99 - Oracle_Connection.Close() - End Try - Dim Command As OracleCommand - ' Verbindung zur Datenbank aufbauen - - ' SQL-Abfrage definieren - - Command = New OracleCommand(_scalar_select, Oracle_Connection) - Dim ergebnis As String = Command.ExecuteScalar.ToString - Return CLng(ergebnis) - Catch ex As Exception - ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden - _Logger.Error(ex) - - Return 0 - End Try - End Function Public Function CheckIndex_mssql(Profilname As String, ByVal scalarselect As String, ByVal datasource As String, ByVal User As String, ByVal pw As String, ByVal myDS As DataSet, ByVal init_Cata As String) Try Dim Connection As SqlConnection = Nothing @@ -485,16 +71,7 @@ Public Class ClassNIDatenbankzugriff End Try End Function - Private Sub CloseOracleDb(ByRef Connection As OracleConnection) 'OracleConnection) - Timer_Stop() - ' wenn eine Datenbank-Connection aufgebaut ist - If Connection IsNot Nothing Then - ' diese schliessen - Connection.Close() - Connection = Nothing - End If - End Sub Private Sub CloseMssqlDb(ByRef Connection As SqlConnection) ' wenn eine Datenbank-Connection aufgebaut ist If Connection IsNot Nothing Then diff --git a/ToolCollection/ToolCollection.vbproj b/ToolCollection/ToolCollection.vbproj index 0d44927..0ad7e04 100644 --- a/ToolCollection/ToolCollection.vbproj +++ b/ToolCollection/ToolCollection.vbproj @@ -98,16 +98,13 @@ - ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - - - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll + ..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll packages\EntityFramework.6.0.2\lib\net45\EntityFramework.dll @@ -137,10 +134,7 @@ - ..\packages\NLog.5.0.2\lib\net46\NLog.dll - - - M:\App&Service\0 Partner Bibliotheken\Oracle.ManagedDataAccess.dll + ..\packages\NLog.5.0.5\lib\net46\NLog.dll diff --git a/ToolCollection/clsNI_DB.vb b/ToolCollection/clsNI_DB.vb index b6f3adf..cb8df72 100644 --- a/ToolCollection/clsNI_DB.vb +++ b/ToolCollection/clsNI_DB.vb @@ -18,7 +18,8 @@ Public Class clsNI_DB _Logger.Info("Check Deskriptiven Index-Value - Select Scalar: " & _vsql) If _dbTyp = "Oracle" Then - Dim ergebnis As Integer = CheckIndex_oracle(_vsql, datasource, initialcatalog, userid, pw) + _Logger.Warn("ORACLE SQL-Command nicht integriert!") + Dim ergebnis As Integer = 0 If ergebnis = 1 Then Return 1 Else @@ -49,52 +50,7 @@ Public Class clsNI_DB End Try End Function ' Überprüft den Indexwert und gibt 0 oder mehr zurück - Public Shared Function CheckIndex_oracle(ByVal _scalar_select As String, ByVal host As String, ByVal servicename As String, ByVal User As String, ByVal pw As String) As Integer - Try - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If host <> "" And servicename <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & host & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - servicename & ")));User Id=" & User & ";Password=" & pw & ";" - Else - conn.DataSource = host - conn.UserID = User - conn.Password = pw - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - Dim Oracle_Connection As New OracleConnection(connstr) - - Try - Oracle_Connection.Open() - Catch ex As Exception - _Logger.Error(ex) - - ' DB-Connection schliessen - Return 99 - Oracle_Connection.Close() - End Try - Dim Command As OracleCommand - ' Verbindung zur Datenbank aufbauen - - ' SQL-Abfrage definieren - - Command = New OracleCommand(_scalar_select, Oracle_Connection) - Dim ergebnis As String = Command.ExecuteScalar.ToString - Return CLng(ergebnis) - Catch ex As Exception - If ex.Message.Contains("ORA-00904") Then - _Logger.Info("Error in CheckIndex_Oracle: " & ex.Message) - Else - _Logger.Warn(ex) - End If - ' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden - - Return 0 - End Try - End Function Public Shared Function CheckIndex_MSSSQL(ByVal scalar_select As String, ByVal datasource As String, ByVal User As String, ByVal pw As String, ByVal init_Cata As String) As Integer Try _Logger.Info("MSSQL-Command: " & scalar_select) diff --git a/ToolCollection/clsNI_WorkFile.vb b/ToolCollection/clsNI_WorkFile.vb index bb6ff69..6c4965f 100644 --- a/ToolCollection/clsNI_WorkFile.vb +++ b/ToolCollection/clsNI_WorkFile.vb @@ -312,7 +312,8 @@ Public Class clsNI_WorkFile _Logger.Debug("- Check Deskriptiven Index-Value - Select Scalar: " & _vsql) If aktivesProfil.DbArt = "Oracle" Then - Dim ergebnis As Integer = clsNI_DB.CheckIndex_oracle(_vsql, aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password) + _Logger.Warn("ORACLE nicht integriert! 315") + Dim ergebnis As Integer = 0 If ergebnis = 1 Then Return 1 Else @@ -484,7 +485,7 @@ Public Class clsNI_WorkFile 'MessageBox.Show("Select: " & vbNewLine & selectArray(i)) ' die SQL-Abfrage durchführen (liefert den Wert der in den windream-Index geschrieben werden soll) If aktivesProfil.DbArt = "Oracle" Then - _NidxWert = database.GetValueFromOracleDb(aktivesProfil.Profilname, selectArray(i), aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, _Index) + _NidxWert = Nothing ElseIf aktivesProfil.DbArt = "MS-SQL" Then _NidxWert = database.GetValueFromMssqlDb(_WDFileINWORK.aName, aktivesProfil.Profilname, selectArray(i), aktivesProfil.DataSource, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, aktivesProfil.InitialCatalog, _Index) ElseIf aktivesProfil.DbArt = "ODBC" Then diff --git a/ToolCollection/frmNIHauptseite.vb b/ToolCollection/frmNIHauptseite.vb index e89d54a..76c29d5 100644 --- a/ToolCollection/frmNIHauptseite.vb +++ b/ToolCollection/frmNIHauptseite.vb @@ -41,7 +41,6 @@ Public Class frmNIHauptseite Public debug As Boolean = True Private Shared _Instance As frmNIHauptseite = Nothing Private _validModules() - Private licenseManager As ClassLicenseManager = Nothing Public Shared _windream As ClassWindream_allgemein Private Const ConstWMEntityDocument = 1 ''WINDREAMLib.WMEntity.WMEntityDocument Public Shared Function Instance() As frmNIHauptseite @@ -113,9 +112,9 @@ Public Class frmNIHauptseite _MyLogger.Debug = False End If - If My.Settings.NI_RUNNING = True Then + If My.Settings.vNIRunning = True Then - _Logger.Info("Nachindexierungslauf wird wieder gestartet - My.Settings.NI_RUNNING = True") + _Logger.Info("Nachindexierungslauf wird wieder gestartet - My.Settings.vNIRunning = True") Start_NachindexierungThreads() Else _Logger.Info("Nachindexierung Hauptformular wurde geladen - Nachindexierungslauf wird NICHT gestartet.") @@ -1145,7 +1144,8 @@ Public Class frmNIHauptseite 'MessageBox.Show("Select: " & vbNewLine & selectArray(i)) ' die SQL-Abfrage durchführen (liefert den Wert der in den windream-Index geschrieben werden soll) If Me.aktivesProfil.DbArt = "Oracle" Then - oResultNachindexierung = database.GetValueFromOracleDb(aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, INDEX_SQL_BEFEHL.Index, Quelle_is_vektor) + _Logger.Warn("ORACLE SQL-Command nicht integriert!") + oResultNachindexierung = "" ElseIf Me.aktivesProfil.DbArt = "MS-SQL" Then _Logger.Debug($"Executing MSSQL ...") oResultNachindexierung = database.GetValueFromMssqlDb(pMyWMDoc.aName, aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, aktivesProfil.InitialCatalog, INDEX_SQL_BEFEHL.Index, Quelle_is_vektor) @@ -1568,9 +1568,7 @@ Public Class frmNIHauptseite Next If Me.aktivesProfil.DbArt = "Oracle" Then - If database.ExecuteonOracleDb(aktivesProfil.Profilname, Sqlcommand, aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password) = 1 Then - _Logger.Debug("ORACLE SQL-Command erfolgreich ausgeführt!") - End If + _Logger.Warn("ORACLE SQL-Command nicht integriert!") ElseIf Me.aktivesProfil.DbArt = "MS-SQL" Then _Logger.Debug("MSSQL-Command will be executed now.....") _Logger.Debug("Sqlcommand: " & Sqlcommand) @@ -1692,16 +1690,9 @@ Public Class frmNIHauptseite End If 'Move and Rename ausführen - If LICENSE_MoveRename = True And Not oUnexpectedError And unvollstaendig = False Then + If Not oUnexpectedError And unvollstaendig = False Then oUnexpectedError = FNMoveRename(pMyWMDoc) - Else - If LICENSE_MoveRename = True And oUnexpectedError = True Or unvollstaendig = True Then - _Logger.Info("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True") - _Logger.Debug("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True") - End If - - End If 'Indexierung gegen die Indizes des Ordners @@ -1916,8 +1907,21 @@ Public Class frmNIHauptseite Return True End If - 'schonmal den gesamten Pfad laden - Dim oNamenkonvention As String = oTargetpath & "\" & oDT_TBTC_MOVE_RENAME.Rows(0).Item("NAMECONVENTION") & oExtension + 'schonmal den gesamten Pfad laden - OHNE Extension zuerst + Dim oNamenkonvention As String = oTargetpath & "\" & oDT_TBTC_MOVE_RENAME.Rows(0).Item("NAMECONVENTION") + + ' Prüfen ob NAMECONVENTION bereits eine Extension enthält + Dim oNameConventionHasExtension As Boolean = False + If Not String.IsNullOrEmpty(Path.GetExtension(oNamenkonvention)) Then + oNameConventionHasExtension = True + _Logger.Debug("NAMECONVENTION enthält bereits eine Dateiendung") + End If + + ' Extension nur hinzufügen wenn noch nicht vorhanden + If Not oNameConventionHasExtension Then + oNamenkonvention = oNamenkonvention & oExtension + End If + ' einen Regulären Ausdruck laden Dim oRegularExpression As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(oPRegex) ' die Vorkommen im SQL-String auslesen @@ -1929,7 +1933,7 @@ Public Class frmNIHauptseite ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen For Each oElement As System.Text.RegularExpressions.Match In oMatchelements Select Case oElement.Value.Substring(2, 1) - 'Manueller Indexwert + 'Manueller Indexwert Case "m" Dim oWMIndexname = oElement.Value.Substring(3, oElement.Value.Length - 4) @@ -1990,11 +1994,8 @@ Public Class frmNIHauptseite Case "DDMMYYYY" oDatetemp = oDay & oMonth & My.Computer.Clock.LocalTime.Year Case "OFilename" + ' Original Dateiname OHNE Extension verwenden oNamenkonvention = oNamenkonvention.Replace(oElement.Value, System.IO.Path.GetFileNameWithoutExtension(oActWMPath)) - 'Case "Username".ToUpper - ' oNamenkonvention = oNamenkonvention.Replace(oElement.Value, Environment.UserName) - 'Case "Usercode".ToUpper - ' oNamenkonvention = oNamenkonvention.Replace(oElement.Value, USER_SHORT_NAME) Case "" End Select If oDatetemp <> "" Then @@ -2009,16 +2010,21 @@ Public Class frmNIHauptseite Dim oNeuerName As String = oNamenkonvention.Replace(oElement.Value, "") oStammname = oNeuerName.Replace("~", "") oNeuerName = oNeuerName.Replace("~", "") - 'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "") + + ' Extension für Überprüfung extrahieren + Dim oCheckExtension As String = Path.GetExtension(oNeuerName) + Dim oNeuerNameOhneExt As String = Path.GetFileNameWithoutExtension(oNeuerName) + Dim oStammnameOhneExt As String = Path.GetFileNameWithoutExtension(oStammname) + 'Überprüfen ob File existiert - If File.Exists(oNeuerName & oExtension) = False Then + If File.Exists(oNeuerName) = False Then oNewFileName = oNeuerName oNamenkonvention = oNewFileName Else - Do While File.Exists(oNeuerName & oExtension) + Do While File.Exists(oNeuerNameOhneExt & oCheckExtension) oVersion = oVersion + 1 - oNeuerName = oStammname & "~" & oVersion - oNewFileName = oNeuerName + oNeuerNameOhneExt = oStammnameOhneExt & "~" & oVersion + oNewFileName = oNeuerNameOhneExt & oCheckExtension Loop oNamenkonvention = oNewFileName End If @@ -2038,12 +2044,12 @@ Public Class frmNIHauptseite Else oReturnString = oActWMPath End If - - - - End If - Dim oOldFilename = oReturnString.Substring(oReturnString.LastIndexOf("\") + 1) + + ' Extension aus oReturnString für weitere Verarbeitung extrahieren + Dim oFinalExtension As String = Path.GetExtension(oReturnString) + Dim oOldFilename = Path.GetFileName(oReturnString) + _Logger.Debug($"oOldFilename: {oOldFilename}") Dim oCleanFileName As String = String.Join("", oOldFilename.Split(Path.GetInvalidFileNameChars())) If oCleanFileName <> oOldFilename Then @@ -2058,8 +2064,8 @@ Public Class frmNIHauptseite oReturnString = oReturnString.Replace(oOriginalPath, oCleanPathName) End If - Dim oPathFile As String = oReturnString.Replace(oExtension, "") - Dim oNewPathFilename = oPathFile + oExtension + Dim oPathFile As String = oReturnString.Replace(oFinalExtension, "") + Dim oNewPathFilename = oPathFile + oFinalExtension 'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "") If oVERSIONOFF = True Then @@ -2077,7 +2083,7 @@ Public Class frmNIHauptseite Do While File.Exists(oNewPathFilename) oNewVersion = oNewVersion + 1 - oNewPathFilename = oPathFile & "~" & oNewVersion & oExtension + oNewPathFilename = oPathFile & "~" & oNewVersion & oFinalExtension Loop If oNewPathFilename <> oReturnString Then @@ -2559,7 +2565,8 @@ Public Class frmNIHauptseite _Logger.Debug("Check_DeskIndexValue - Select Scalar: " & _vsql) If aktivesProfil.DbArt = "Oracle" Then - Dim ergebnis As Integer = database.CheckIndex_oracle(_vsql, aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password) + Dim ergebnis As Integer = 0 + _Logger.Warn("ORACLE SQL-Command nicht integriert!") If ergebnis = 1 Then Return 1 Else @@ -2670,7 +2677,7 @@ Public Class frmNIHauptseite bwDatei.WorkerReportsProgress = True bwDatei.WorkerSupportsCancellation = True - My.Settings.NI_RUNNING = True + My.Settings.vNIRunning = True My.Settings.Save() ' den Indexierungsvorgang direkt (zum ersten Mal) durchführen Me.Profile_Durchlaufen() @@ -2712,7 +2719,7 @@ Public Class frmNIHauptseite If keeprunning = False Then _Logger.Debug("keeprunning = False - Zurücksetzen") 'Abbruch der Nachindexierung - My.Settings.NI_RUNNING = False + My.Settings.vNIRunning = False Me.numIntervall.Enabled = True Me.pnlInfos.Visible = False Me.tslblStatus.Visible = False diff --git a/ToolCollection/frmNIProfileigenschaften.vb b/ToolCollection/frmNIProfileigenschaften.vb index a80a62d..682c67f 100644 --- a/ToolCollection/frmNIProfileigenschaften.vb +++ b/ToolCollection/frmNIProfileigenschaften.vb @@ -1014,24 +1014,8 @@ Public Class frmNIProfileigenschaften My.Settings.Save() Case "Oracle" Try - Dim conn As New OracleConnectionStringBuilder - If chkOR_ohne_TNS.Checked Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & txtDataSource1.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - txtDataSource2.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";" - Else - conn.DataSource = txtDataSource2.Text - conn.UserID = txtUserId.Text - conn.Password = txtPassword.Text - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If + _Logger.Warn("ORACLE SQL-Command nicht integriert!") - Dim connection As New OracleConnection(connstr) - connection.Open() - - MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, "Erfolg:") - My.Settings.Save() Catch ex As Exception MsgBox(ex.Message & vbNewLine & vbNewLine & connstr, MsgBoxStyle.Critical, "Fehler bei Verbindungsaufbau Oracle:") diff --git a/ToolCollection/frmNIProfilhinzufuegen.vb b/ToolCollection/frmNIProfilhinzufuegen.vb index 5f6ec28..373128d 100644 --- a/ToolCollection/frmNIProfilhinzufuegen.vb +++ b/ToolCollection/frmNIProfilhinzufuegen.vb @@ -337,25 +337,7 @@ Public Class frmNIProfilhinzufuegen My.Settings.Save() Dim connstr As String Try - Dim conn As New OracleConnectionStringBuilder - If chkOR_ohne_TNS.Checked Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & txtDataSource.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - txtInitialCatalog.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";" - Else - conn.DataSource = txtInitialCatalog.Text - conn.UserID = txtUserId.Text - conn.Password = txtPassword.Text - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - - Dim connection As New OracleConnection(connstr) - connection.Open() - - MsgBox("Die Verbindung wurde erfolgreich aufgebaut!", MsgBoxStyle.Information, "Erfolg:") - My.Settings.Save() Catch ex As Exception MsgBox(ex.Message & vbNewLine & vbNewLine & connstr, MsgBoxStyle.Critical, "Fehler bei Verbindungsaufbau Oracle:") diff --git a/ToolCollection/frmNIVerknuepfungen.vb b/ToolCollection/frmNIVerknuepfungen.vb index 7df898f..0a76933 100644 --- a/ToolCollection/frmNIVerknuepfungen.vb +++ b/ToolCollection/frmNIVerknuepfungen.vb @@ -342,7 +342,8 @@ Public Class frmNIVerknuepfungen Dim dataviews() As String = Nothing If Me._selectedProfil.DbArt = "Oracle" Then - dataviews = Me.GetOracleDataviews(Me.rbViews.Checked) + _Logger.Warn("ORACLE nicht integriert!") + dataviews = Nothing ElseIf Me._selectedProfil.DbArt = "MS-SQL" Then dataviews = Me.GetMsSqlDataviews(Me.rbViews.Checked) ElseIf Me._selectedProfil.DbArt = "ODBC" Then @@ -527,7 +528,7 @@ Public Class frmNIVerknuepfungen ' wenn es sich um die Oracle Version handelt If Me._selectedProfil.DbArt = "Oracle" Then ' alle Spalten aus Oracle auslesen - columns = Me.GetOracleColumnsByTable(words(0)) + columns = Nothing ElseIf Me._selectedProfil.DbArt = "MS-SQL" Then ' alle Spalten aus Oracle auslesen If rbFunctionsSc.Checked Or rbFunctionsTb.Checked Then @@ -893,140 +894,10 @@ Public Class frmNIVerknuepfungen Return Nothing End Try End Function - ''' - ''' Liest alle Datenbankviews aus, die in der Datenbank des gewählten Profils gespeichert sind - ''' - ''' Liefert eine Liste mit den Namen der Datenbankviews - ''' - Private Function GetOracleDataviews(Optional ByVal return_views As Boolean = True) As String() - Try - Dim SqlString As String - Dim DataViews() As String - Dim i As Integer = 0 - - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If Me._selectedProfil.DataSource <> "" And Me._selectedProfil.InitialCatalog <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & _selectedProfil.DataSource & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - _selectedProfil.InitialCatalog & ")));User Id=" & Me._selectedProfil.UserId & ";Password=" & Me._selectedProfil.Password & ";" - Else - conn.DataSource = Me._selectedProfil.DataSource - conn.UserID = Me._selectedProfil.UserId - conn.Password = Me._selectedProfil.Password - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - Dim Oracle_Connection As New OracleConnection(connstr) - - Dim Oracle_Command As OracleCommand = Nothing - Dim DataAdapter As OracleDataAdapter = Nothing - - Dim DataSet As DataSet = New DataSet() - - Oracle_Connection.Open() - - If return_views Then - ' DB-Abfrage für alle Views definieren - SqlString = "select VIEW_NAME from USER_VIEWS" - Else - ' DB-Abfrage für alle Tables definieren - SqlString = "select TABLE_NAME from USER_TABLES" - End If - - ' die DB-Abfrage erzeugen - Oracle_Command = New OracleCommand(SqlString, Oracle_Connection) - - ' die DB-Abfrage durchführen - DataAdapter = New OracleDataAdapter(Oracle_Command) - - ' das DataSet mit den Daten füllen - DataAdapter.Fill(DataSet) - - ' Arraygrösse anpassen - ReDim DataViews(DataSet.Tables(0).Rows.Count - 1) - - If DataSet.Tables(0).Rows.Count > 0 Then - ' alle Ergebnisse (VIEWs) durchlaufen - For Each row As DataRow In DataSet.Tables(0).Rows - - ' View in Array schreiben - DataViews(i) = row.Item(0) - i += 1 - Next - - ' Array zurückgeben - Return DataViews - Else - Return Nothing - End If - - Catch ex As Exception - MsgBox("Die Datenansichten der Datenbank konnten nicht fehlerfrei ausgelesen werden." & vbNewLine & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Fehler beim Auslesen der Datenansichten Oracle:") - Return Nothing - End Try - End Function - ''' - ''' Liest alle Spalten eines Datenbankviews oder einer Tabelle aus - ''' - ''' Name des Datenbankviews oder der Tabelle - ''' Liefert eine Liste mit Namen aller Spalten in dem View oder der Tabelle - ''' - Private Function GetOracleColumnsByTable(ByVal table As String) As String() - Try - Dim Columns() As String - Dim i As Integer = 0 - - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If Me._selectedProfil.DataSource <> "" And Me._selectedProfil.InitialCatalog <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & _selectedProfil.DataSource & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & - _selectedProfil.InitialCatalog & ")));User Id=" & Me._selectedProfil.UserId & ";Password=" & Me._selectedProfil.Password & ";" - Else - conn.DataSource = Me._selectedProfil.DataSource - conn.UserID = Me._selectedProfil.UserId - conn.Password = Me._selectedProfil.Password - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - Dim Oracle_Connection As New OracleConnection(connstr) - Dim Oracle_Command As OracleCommand = Nothing - Dim DataAdapter As OracleDataAdapter = Nothing - Dim DataSet As DataSet = Nothing - - Oracle_Connection.Open() - - Dim query As String = "select COLUMN_NAME from USER_TAB_COLS where TABLE_NAME='" & table & "'" - - Oracle_Command = New OracleCommand(query, Oracle_Connection) - - Dim da As OracleDataAdapter = New OracleDataAdapter(Oracle_Command) - Dim ds As DataSet = New DataSet() - da.Fill(ds) - - ReDim Columns(ds.Tables(0).Rows.Count - 1) - - If ds.Tables(0).Rows.Count > 0 Then - For Each row As DataRow In ds.Tables(0).Rows - Columns(i) = row.Item(0) - i += 1 - Next - - Return Columns - Else - Return Nothing - End If - - Catch ex As Exception - MsgBox("Die Spalten aus dem View '" & table & "' konnten nicht fehlerfrei ausgelesen werden." & vbNewLine & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Fehler beim Auslesen der Datenbankspalten") - Return Nothing - End Try - End Function @@ -1764,7 +1635,7 @@ Public Class frmNIVerknuepfungen ' wenn es sich um die Oracle Version handelt If Me._selectedProfil.DbArt = "Oracle" Then ' alle Spalten aus Oracle auslesen - columns = Me.GetOracleColumnsByTable(words(0)) + columns = Nothing ElseIf Me._selectedProfil.DbArt = "MS-SQL" Then ' alle Spalten aus MS-SQL auslesen Try @@ -2132,7 +2003,7 @@ Public Class frmNIVerknuepfungen ' View- oder Tabellenliste Dim dataviews() As String = Nothing If Me._selectedProfil.DbArt = "Oracle" Then - dataviews = Me.GetOracleDataviews(Me.rbViews.Checked) + dataviews = Nothing ElseIf Me._selectedProfil.DbArt = "MS-SQL" Then dataviews = Me.GetMsSqlDataviews(Me.rbViews.Checked) ElseIf Me._selectedProfil.DbArt = "ODBC" Then @@ -2769,7 +2640,8 @@ Public Class frmNIVerknuepfungen Dim sql As String = Me.txtCheckIndexSQL.Text vSQL = sql.Replace("[%" & Me.txteindeutigerIndex.Text & "]", txtTestwert_checkindex.Text) If _selectedProfil.DbArt = "Oracle" Then - Dim ergebnis As Integer = database.CheckIndex_oracle(vSQL, _selectedProfil.DataSource, _selectedProfil.InitialCatalog, _selectedProfil.UserId, _selectedProfil.Password) + _Logger.Warn("ORACLE nicht integriert! 2643") + Dim ergebnis As Integer = 0 If ergebnis = 1 Then MsgBox("Der ausgeführte SQL-Befehl ist gültig: " & vbNewLine & vSQL & vbNewLine & vbNewLine & diff --git a/ToolCollection/frmNI_SQLTest.vb b/ToolCollection/frmNI_SQLTest.vb index a4810a3..58b63f3 100644 --- a/ToolCollection/frmNI_SQLTest.vb +++ b/ToolCollection/frmNI_SQLTest.vb @@ -47,7 +47,7 @@ Public Class frmNI_SQLTest Public Sub Aktualisieren() 'Try If vDB_Art.ToString = "Oracle" Then - GetDataFromOracle() + ElseIf vDB_Art.ToString = "MS-SQL" Then Dim typ As Data.SqlDbType If IsNumeric(txtStartwert.Text) Then @@ -67,96 +67,7 @@ Public Class frmNI_SQLTest End Sub - Sub GetDataFromOracle() - Try - ' OracleConnection = Nothing - ' ConnectionString aufbauen (aus Settings auslesen) - Dim conn As New OracleConnectionStringBuilder - Dim connstr As String - If vdatasource <> "" And vInitialCatalog <> "" Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & vdatasource & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _ - vInitialCatalog & ")));User Id=" & vUserID & ";Password=" & vPassword & ";" - Else - conn.DataSource = vdatasource - conn.UserID = vUserID - conn.Password = vPassword - conn.PersistSecurityInfo = True - conn.ConnectionTimeout = 120 - connstr = conn.ConnectionString - End If - - Dim Oracle_Connection As New OracleConnection(connstr) - - - ' Dim ConnectionString As OracleConnectionStringBuilder = Nothing - Dim Command As OracleCommand = Nothing - Dim DataAdapter As OracleDataAdapter = Nothing - - ' ConnectionString aufbauen (aus Settings auslesen) - 'ConnectionString = New OracleConnectionStringBuilder() - 'ConnectionString.DataSource = vdatasource - 'ConnectionString.UserID = vUserID - 'ConnectionString.Password = vPassword - - - ' Verbindung zur Datenbank aufbauen - Try - ' Connection = New OracleConnection(ConnectionString.ConnectionString) - Oracle_Connection.Open() - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Verbindung zur Datenbank aufbauen:") - ' DB-Connection schliessen - Oracle_Connection.Close() - End Try - ' SQL-Abfrage definieren - - - - 'Command.Parameters.Add(":Startwert", OracleDbType.Int32) - 'Command.Parameters(":Startwert").Value = Me.txtStartwert.Text - Me.txtSQL_String.Text = vSQL.Replace(frmNIVerknuepfungen.vReplace, Me.txtStartwert.Text) - vSQL = txtSQL_String.Text - Command = New OracleCommand(vSQL, Oracle_Connection) 'OracleCommand(vSQL, Connection) - 'Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Oracle SQL-Abfrage definieren:") - ' DB-Connection schliessen - ' Me.CloseOracleDb(Connection) - 'End Try - If Command IsNot Nothing Then - - 'Try - ' Datenadapter laden - DataAdapter = New OracleDataAdapter(Command) 'OracleDataAdapter(Command) - MyDataset.Tables("TBErgebnis").Clear() - ' DataSet erzeugen - Dim DataSet = New DataSet() - ListBox1.Items.Clear() - ' DataSet mit Daten füllen - DataAdapter.Fill(DataSet) - For Each Row As DataRow In DataSet.Tables(0).Rows - ListBox1.Items.Add(Row.Item(0)) - Next - Me.BindingSource1.ResumeBinding() - ' DB-Connection schliessen - Oracle_Connection.Close() - ' Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Daten auslesen:") - ' ' DB-Connection schliessen - ' Me.CloseOracleDb(Connection) - 'End Try - - Else - ' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte - MsgBox(vSQL, MsgBoxStyle.Critical, "Oracle SQL-Anweisung ist ungültig. Command-Objekt konnte nicht erstellt werden:") - End If - - - Catch ex As Exception - 'an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden - MsgBox(ex.Message, MsgBoxStyle.Critical, "Ein unbekannter Fehler in GetDataFromOracle:") - End Try - End Sub Sub GetDataFromMSSQL(ByVal _typ As Data.SqlDbType) Try Dim Connection As SqlConnection = Nothing diff --git a/ToolCollection/packages.config b/ToolCollection/packages.config index 2bfa20a..5bb02c3 100644 --- a/ToolCollection/packages.config +++ b/ToolCollection/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/packages/NLog.5.0.2/.signature.p7s b/packages/NLog.5.0.2/.signature.p7s deleted file mode 100644 index 77e5597..0000000 Binary files a/packages/NLog.5.0.2/.signature.p7s and /dev/null differ diff --git a/packages/NLog.5.0.2/NLog.5.0.2.nupkg b/packages/NLog.5.0.2/NLog.5.0.2.nupkg deleted file mode 100644 index a0ca139..0000000 Binary files a/packages/NLog.5.0.2/NLog.5.0.2.nupkg and /dev/null differ diff --git a/packages/NLog.5.0.2/lib/net35/NLog.dll b/packages/NLog.5.0.2/lib/net35/NLog.dll deleted file mode 100644 index 0168a86..0000000 Binary files a/packages/NLog.5.0.2/lib/net35/NLog.dll and /dev/null differ diff --git a/packages/NLog.5.0.2/lib/net45/NLog.dll b/packages/NLog.5.0.2/lib/net45/NLog.dll deleted file mode 100644 index 00d5aec..0000000 Binary files a/packages/NLog.5.0.2/lib/net45/NLog.dll and /dev/null differ diff --git a/packages/NLog.5.0.2/lib/net46/NLog.dll b/packages/NLog.5.0.2/lib/net46/NLog.dll deleted file mode 100644 index 2f2b3d5..0000000 Binary files a/packages/NLog.5.0.2/lib/net46/NLog.dll and /dev/null differ diff --git a/packages/NLog.5.0.2/lib/netstandard1.3/NLog.dll b/packages/NLog.5.0.2/lib/netstandard1.3/NLog.dll deleted file mode 100644 index 92020f1..0000000 Binary files a/packages/NLog.5.0.2/lib/netstandard1.3/NLog.dll and /dev/null differ diff --git a/packages/NLog.5.0.2/lib/netstandard1.5/NLog.dll b/packages/NLog.5.0.2/lib/netstandard1.5/NLog.dll deleted file mode 100644 index 9a211c9..0000000 Binary files a/packages/NLog.5.0.2/lib/netstandard1.5/NLog.dll and /dev/null differ diff --git a/packages/NLog.5.0.2/lib/netstandard2.0/NLog.dll b/packages/NLog.5.0.2/lib/netstandard2.0/NLog.dll deleted file mode 100644 index 87abc74..0000000 Binary files a/packages/NLog.5.0.2/lib/netstandard2.0/NLog.dll and /dev/null differ diff --git a/packages/NLog.5.0.5/.signature.p7s b/packages/NLog.5.0.5/.signature.p7s new file mode 100644 index 0000000..276707d Binary files /dev/null and b/packages/NLog.5.0.5/.signature.p7s differ diff --git a/packages/NLog.5.0.2/N.png b/packages/NLog.5.0.5/N.png similarity index 100% rename from packages/NLog.5.0.2/N.png rename to packages/NLog.5.0.5/N.png diff --git a/packages/NLog.5.0.5/NLog.5.0.5.nupkg b/packages/NLog.5.0.5/NLog.5.0.5.nupkg new file mode 100644 index 0000000..6e947df Binary files /dev/null and b/packages/NLog.5.0.5/NLog.5.0.5.nupkg differ diff --git a/packages/NLog.5.0.5/lib/net35/NLog.dll b/packages/NLog.5.0.5/lib/net35/NLog.dll new file mode 100644 index 0000000..a83dd44 Binary files /dev/null and b/packages/NLog.5.0.5/lib/net35/NLog.dll differ diff --git a/packages/NLog.5.0.2/lib/net35/NLog.xml b/packages/NLog.5.0.5/lib/net35/NLog.xml similarity index 99% rename from packages/NLog.5.0.2/lib/net35/NLog.xml rename to packages/NLog.5.0.5/lib/net35/NLog.xml index 6a2aa00..d4549f1 100644 --- a/packages/NLog.5.0.2/lib/net35/NLog.xml +++ b/packages/NLog.5.0.5/lib/net35/NLog.xml @@ -2594,7 +2594,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -4025,10 +4025,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4088,10 +4085,7 @@ The layout. - - Returns a string representation of this expression. - - String literal in single quotes. + @@ -4107,10 +4101,7 @@ - - Returns a string representation of the expression. - - The 'level' string. + @@ -4137,10 +4128,7 @@ The literal value. - - Returns a string representation of the expression. - - The literal value. + @@ -4155,10 +4143,7 @@ - - Returns a string representation of this expression. - - A logger string. + @@ -4173,10 +4158,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4210,9 +4192,7 @@ - - Returns a string representation of the expression. - + @@ -4239,9 +4219,7 @@ The expression. - - Returns a string representation of the expression. - + @@ -4271,9 +4249,7 @@ The right expression. - - Returns a string representation of the expression. - + @@ -4315,9 +4291,7 @@ The operator. - - Returns a string representation of the expression. - + @@ -4930,11 +4904,7 @@ - - Registers a single type definition. - - The item name. - The type of the item. + @@ -4946,27 +4916,13 @@ The item name prefix. - - Tries to get registered item definition. - - Name of the item. - Reference to a variable which will store the item definition. - Item definition. + - - Tries to create an item instance. - - Name of the item. - The result. - True if instance was created successfully, false otherwise. + - - Creates an item instance. - - The name of the item. - Created item. + @@ -8928,14 +8884,22 @@ The bytes. + + + Writes the specified bytes to a file. + + The bytes array. + The bytes array offset. + The number of bytes. + - Flushes this instance. + Flushes this file-appender instance. - Closes this instance. + Closes this file-appender instance. @@ -8992,10 +8956,7 @@ The mutex for archiving. - - Releases unmanaged and - optionally - managed resources. - - True to release both managed and unmanaged resources; false to release only unmanaged resources. + @@ -9018,35 +8979,19 @@ The parameters. - - Closes this instance of the appender. - + - - Flushes this current appender. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + - - Writes the specified bytes to a file. - - The bytes array. - The bytes array offset. - The number of bytes. + @@ -9054,14 +8999,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9327,35 +9265,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9363,14 +9285,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9385,14 +9300,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9408,35 +9316,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9444,14 +9336,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9466,35 +9351,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9502,14 +9371,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9533,28 +9395,19 @@ File to create or open - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + + + + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9562,14 +9415,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -10525,9 +10371,9 @@ value to append - + - Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time) + Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time) @@ -11875,6 +11721,20 @@ + + + Renders the nested states from like a callstack + + + + + Gets or sets the indent token. + + + + + + Renders the nested states from like a callstack @@ -12845,6 +12705,11 @@ Render the first character of the level. + + + Render the first character of the level. + + Render the ordinal (aka number) for the level. @@ -12855,6 +12720,11 @@ Render the LogLevel full name, expanding Warn / Info abbreviations + + + Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl) + + The log level. @@ -13465,6 +13335,12 @@ Only outputs the inner layout when exception has been defined for log message. + + + If is not found, print this layout. + + + @@ -13479,6 +13355,12 @@ ${onhasproperties:, Properties\: ${all-event-properties}} + + + If is not found, print this layout. + + + @@ -15541,6 +15423,12 @@ The full path of the source file that contains the caller. This is set at by the compiler. The line number in the source file at which the method is called. This is set at by the compiler. + + + Writes the log event to the underlying logger. + + Type of custom Logger wrapper. + Represents the logging event. @@ -19434,7 +19322,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -20775,7 +20663,7 @@ - Register a custom Target. + Register a custom NLog Target. Type of the Target. Fluent interface parameter. @@ -20783,15 +20671,31 @@ - Register a custom Target. + Register a custom NLog Target. Fluent interface parameter. Type name of the Target The target type-alias for use in NLog configuration + + + Register a custom NLog Layout. + + Type of the layout renderer. + Fluent interface parameter. + The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned. + + + + Register a custom NLog Layout. + + Fluent interface parameter. + Type of the layout. + The layout type-alias for use in NLog configuration + - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Type of the layout renderer. Fluent interface parameter. @@ -20799,7 +20703,7 @@ - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Fluent interface parameter. Type of the layout renderer. @@ -20807,7 +20711,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20815,7 +20719,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20823,7 +20727,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20832,7 +20736,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -25665,10 +25569,7 @@ The logging event. - - Flush any pending log messages asynchronously (in case of asynchronous targets). - - The asynchronous continuation. + @@ -26279,10 +26180,7 @@ - - Writes logging event to the log target. - - Logging event to be written out. + @@ -27006,10 +26904,7 @@ - - Flush any pending log messages (in case of asynchronous targets). - - The asynchronous continuation. + diff --git a/packages/NLog.5.0.5/lib/net45/NLog.dll b/packages/NLog.5.0.5/lib/net45/NLog.dll new file mode 100644 index 0000000..c3d0381 Binary files /dev/null and b/packages/NLog.5.0.5/lib/net45/NLog.dll differ diff --git a/packages/NLog.5.0.2/lib/net46/NLog.xml b/packages/NLog.5.0.5/lib/net45/NLog.xml similarity index 99% rename from packages/NLog.5.0.2/lib/net46/NLog.xml rename to packages/NLog.5.0.5/lib/net45/NLog.xml index a5323b4..2786bbb 100644 --- a/packages/NLog.5.0.2/lib/net46/NLog.xml +++ b/packages/NLog.5.0.5/lib/net45/NLog.xml @@ -2594,7 +2594,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -4065,10 +4065,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4128,10 +4125,7 @@ The layout. - - Returns a string representation of this expression. - - String literal in single quotes. + @@ -4147,10 +4141,7 @@ - - Returns a string representation of the expression. - - The 'level' string. + @@ -4177,10 +4168,7 @@ The literal value. - - Returns a string representation of the expression. - - The literal value. + @@ -4195,10 +4183,7 @@ - - Returns a string representation of this expression. - - A logger string. + @@ -4213,10 +4198,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4250,9 +4232,7 @@ - - Returns a string representation of the expression. - + @@ -4279,9 +4259,7 @@ The expression. - - Returns a string representation of the expression. - + @@ -4311,9 +4289,7 @@ The right expression. - - Returns a string representation of the expression. - + @@ -4355,9 +4331,7 @@ The operator. - - Returns a string representation of the expression. - + @@ -4970,11 +4944,7 @@ - - Registers a single type definition. - - The item name. - The type of the item. + @@ -4986,27 +4956,13 @@ The item name prefix. - - Tries to get registered item definition. - - Name of the item. - Reference to a variable which will store the item definition. - Item definition. + - - Tries to create an item instance. - - Name of the item. - The result. - True if instance was created successfully, false otherwise. + - - Creates an item instance. - - The name of the item. - Created item. + @@ -7270,11 +7226,6 @@ Scope Duration Time - - - Special bookmark that can restore original parent, after scopes has been collapsed - - Matches when the specified condition is met. @@ -9066,14 +9017,22 @@ The bytes. + + + Writes the specified bytes to a file. + + The bytes array. + The bytes array offset. + The number of bytes. + - Flushes this instance. + Flushes this file-appender instance. - Closes this instance. + Closes this file-appender instance. @@ -9130,10 +9089,7 @@ The mutex for archiving. - - Releases unmanaged and - optionally - managed resources. - - True to release both managed and unmanaged resources; false to release only unmanaged resources. + @@ -9156,35 +9112,19 @@ The parameters. - - Closes this instance of the appender. - + - - Flushes this current appender. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + - - Writes the specified bytes to a file. - - The bytes array. - The bytes array offset. - The number of bytes. + @@ -9192,14 +9132,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9465,35 +9398,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9501,14 +9418,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9523,14 +9433,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9546,35 +9449,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9582,14 +9469,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9604,35 +9484,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9640,14 +9504,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9671,28 +9528,19 @@ File to create or open - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + + + + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9700,14 +9548,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -10502,41 +10343,6 @@ Macintosh Mac OSX - - - Immutable state that combines ScopeContext MDLC + NDLC for - - - - - Immutable state that combines ScopeContext MDLC + NDLC for - - - - - Immutable state for ScopeContext Mapped Context (MDLC) - - - - - Immutable state for ScopeContext Nested State (NDLC) - - - - - Immutable state for ScopeContext Single Property (MDLC) - - - - - Immutable state for ScopeContext Multiple Properties (MDLC) - - - - - Immutable state for ScopeContext handling legacy MDLC + NDLC operations - - @@ -10701,9 +10507,9 @@ value to append - + - Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time) + Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time) @@ -12058,6 +11864,20 @@ + + + Renders the nested states from like a callstack + + + + + Gets or sets the indent token. + + + + + + Renders the nested states from like a callstack @@ -13028,6 +12848,11 @@ Render the first character of the level. + + + Render the first character of the level. + + Render the ordinal (aka number) for the level. @@ -13038,6 +12863,11 @@ Render the LogLevel full name, expanding Warn / Info abbreviations + + + Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl) + + The log level. @@ -13648,6 +13478,12 @@ Only outputs the inner layout when exception has been defined for log message. + + + If is not found, print this layout. + + + @@ -13662,6 +13498,12 @@ ${onhasproperties:, Properties\: ${all-event-properties}} + + + If is not found, print this layout. + + + @@ -15724,6 +15566,12 @@ The full path of the source file that contains the caller. This is set at by the compiler. The line number in the source file at which the method is called. This is set at by the compiler. + + + Writes the log event to the underlying logger. + + Type of custom Logger wrapper. + Represents the logging event. @@ -19642,7 +19490,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -21022,7 +20870,7 @@ - Register a custom Target. + Register a custom NLog Target. Type of the Target. Fluent interface parameter. @@ -21030,15 +20878,31 @@ - Register a custom Target. + Register a custom NLog Target. Fluent interface parameter. Type name of the Target The target type-alias for use in NLog configuration + + + Register a custom NLog Layout. + + Type of the layout renderer. + Fluent interface parameter. + The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned. + + + + Register a custom NLog Layout. + + Fluent interface parameter. + Type of the layout. + The layout type-alias for use in NLog configuration + - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Type of the layout renderer. Fluent interface parameter. @@ -21046,7 +20910,7 @@ - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Fluent interface parameter. Type of the layout renderer. @@ -21054,7 +20918,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -21062,7 +20926,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -21070,7 +20934,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -21079,7 +20943,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -26129,10 +25993,7 @@ The logging event. - - Flush any pending log messages asynchronously (in case of asynchronous targets). - - The asynchronous continuation. + @@ -26743,10 +26604,7 @@ - - Writes logging event to the log target. - - Logging event to be written out. + @@ -27518,10 +27376,7 @@ - - Flush any pending log messages (in case of asynchronous targets). - - The asynchronous continuation. + diff --git a/packages/NLog.5.0.5/lib/net46/NLog.dll b/packages/NLog.5.0.5/lib/net46/NLog.dll new file mode 100644 index 0000000..c33852d Binary files /dev/null and b/packages/NLog.5.0.5/lib/net46/NLog.dll differ diff --git a/packages/NLog.5.0.2/lib/net45/NLog.xml b/packages/NLog.5.0.5/lib/net46/NLog.xml similarity index 99% rename from packages/NLog.5.0.2/lib/net45/NLog.xml rename to packages/NLog.5.0.5/lib/net46/NLog.xml index 8c2e1d2..0de84d3 100644 --- a/packages/NLog.5.0.2/lib/net45/NLog.xml +++ b/packages/NLog.5.0.5/lib/net46/NLog.xml @@ -2594,7 +2594,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -4065,10 +4065,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4128,10 +4125,7 @@ The layout. - - Returns a string representation of this expression. - - String literal in single quotes. + @@ -4147,10 +4141,7 @@ - - Returns a string representation of the expression. - - The 'level' string. + @@ -4177,10 +4168,7 @@ The literal value. - - Returns a string representation of the expression. - - The literal value. + @@ -4195,10 +4183,7 @@ - - Returns a string representation of this expression. - - A logger string. + @@ -4213,10 +4198,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4250,9 +4232,7 @@ - - Returns a string representation of the expression. - + @@ -4279,9 +4259,7 @@ The expression. - - Returns a string representation of the expression. - + @@ -4311,9 +4289,7 @@ The right expression. - - Returns a string representation of the expression. - + @@ -4355,9 +4331,7 @@ The operator. - - Returns a string representation of the expression. - + @@ -4970,11 +4944,7 @@ - - Registers a single type definition. - - The item name. - The type of the item. + @@ -4986,27 +4956,13 @@ The item name prefix. - - Tries to get registered item definition. - - Name of the item. - Reference to a variable which will store the item definition. - Item definition. + - - Tries to create an item instance. - - Name of the item. - The result. - True if instance was created successfully, false otherwise. + - - Creates an item instance. - - The name of the item. - Created item. + @@ -7270,6 +7226,11 @@ Scope Duration Time + + + Special bookmark that can restore original parent, after scopes has been collapsed + + Matches when the specified condition is met. @@ -9061,14 +9022,22 @@ The bytes. + + + Writes the specified bytes to a file. + + The bytes array. + The bytes array offset. + The number of bytes. + - Flushes this instance. + Flushes this file-appender instance. - Closes this instance. + Closes this file-appender instance. @@ -9125,10 +9094,7 @@ The mutex for archiving. - - Releases unmanaged and - optionally - managed resources. - - True to release both managed and unmanaged resources; false to release only unmanaged resources. + @@ -9151,35 +9117,19 @@ The parameters. - - Closes this instance of the appender. - + - - Flushes this current appender. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + - - Writes the specified bytes to a file. - - The bytes array. - The bytes array offset. - The number of bytes. + @@ -9187,14 +9137,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9460,35 +9403,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9496,14 +9423,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9518,14 +9438,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9541,35 +9454,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9577,14 +9474,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9599,35 +9489,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9635,14 +9509,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9666,28 +9533,19 @@ File to create or open - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + + + + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9695,14 +9553,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -10497,6 +10348,41 @@ Macintosh Mac OSX + + + Immutable state that combines ScopeContext MDLC + NDLC for + + + + + Immutable state that combines ScopeContext MDLC + NDLC for + + + + + Immutable state for ScopeContext Mapped Context (MDLC) + + + + + Immutable state for ScopeContext Nested State (NDLC) + + + + + Immutable state for ScopeContext Single Property (MDLC) + + + + + Immutable state for ScopeContext Multiple Properties (MDLC) + + + + + Immutable state for ScopeContext handling legacy MDLC + NDLC operations + + @@ -10661,9 +10547,9 @@ value to append - + - Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time) + Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time) @@ -12018,6 +11904,20 @@ + + + Renders the nested states from like a callstack + + + + + Gets or sets the indent token. + + + + + + Renders the nested states from like a callstack @@ -12988,6 +12888,11 @@ Render the first character of the level. + + + Render the first character of the level. + + Render the ordinal (aka number) for the level. @@ -12998,6 +12903,11 @@ Render the LogLevel full name, expanding Warn / Info abbreviations + + + Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl) + + The log level. @@ -13608,6 +13518,12 @@ Only outputs the inner layout when exception has been defined for log message. + + + If is not found, print this layout. + + + @@ -13622,6 +13538,12 @@ ${onhasproperties:, Properties\: ${all-event-properties}} + + + If is not found, print this layout. + + + @@ -15684,6 +15606,12 @@ The full path of the source file that contains the caller. This is set at by the compiler. The line number in the source file at which the method is called. This is set at by the compiler. + + + Writes the log event to the underlying logger. + + Type of custom Logger wrapper. + Represents the logging event. @@ -19602,7 +19530,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -20982,7 +20910,7 @@ - Register a custom Target. + Register a custom NLog Target. Type of the Target. Fluent interface parameter. @@ -20990,15 +20918,31 @@ - Register a custom Target. + Register a custom NLog Target. Fluent interface parameter. Type name of the Target The target type-alias for use in NLog configuration + + + Register a custom NLog Layout. + + Type of the layout renderer. + Fluent interface parameter. + The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned. + + + + Register a custom NLog Layout. + + Fluent interface parameter. + Type of the layout. + The layout type-alias for use in NLog configuration + - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Type of the layout renderer. Fluent interface parameter. @@ -21006,7 +20950,7 @@ - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Fluent interface parameter. Type of the layout renderer. @@ -21014,7 +20958,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -21022,7 +20966,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -21030,7 +20974,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -21039,7 +20983,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -26089,10 +26033,7 @@ The logging event. - - Flush any pending log messages asynchronously (in case of asynchronous targets). - - The asynchronous continuation. + @@ -26703,10 +26644,7 @@ - - Writes logging event to the log target. - - Logging event to be written out. + @@ -27478,10 +27416,7 @@ - - Flush any pending log messages (in case of asynchronous targets). - - The asynchronous continuation. + diff --git a/packages/NLog.5.0.5/lib/netstandard1.3/NLog.dll b/packages/NLog.5.0.5/lib/netstandard1.3/NLog.dll new file mode 100644 index 0000000..8f192ea Binary files /dev/null and b/packages/NLog.5.0.5/lib/netstandard1.3/NLog.dll differ diff --git a/packages/NLog.5.0.2/lib/netstandard1.3/NLog.xml b/packages/NLog.5.0.5/lib/netstandard1.3/NLog.xml similarity index 99% rename from packages/NLog.5.0.2/lib/netstandard1.3/NLog.xml rename to packages/NLog.5.0.5/lib/netstandard1.3/NLog.xml index bf77ee8..66d733b 100644 --- a/packages/NLog.5.0.2/lib/netstandard1.3/NLog.xml +++ b/packages/NLog.5.0.5/lib/netstandard1.3/NLog.xml @@ -2594,7 +2594,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -4007,10 +4007,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4070,10 +4067,7 @@ The layout. - - Returns a string representation of this expression. - - String literal in single quotes. + @@ -4089,10 +4083,7 @@ - - Returns a string representation of the expression. - - The 'level' string. + @@ -4119,10 +4110,7 @@ The literal value. - - Returns a string representation of the expression. - - The literal value. + @@ -4137,10 +4125,7 @@ - - Returns a string representation of this expression. - - A logger string. + @@ -4155,10 +4140,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4192,9 +4174,7 @@ - - Returns a string representation of the expression. - + @@ -4221,9 +4201,7 @@ The expression. - - Returns a string representation of the expression. - + @@ -4253,9 +4231,7 @@ The right expression. - - Returns a string representation of the expression. - + @@ -4297,9 +4273,7 @@ The operator. - - Returns a string representation of the expression. - + @@ -4888,11 +4862,7 @@ - - Registers a single type definition. - - The item name. - The type of the item. + @@ -4904,27 +4874,13 @@ The item name prefix. - - Tries to get registered item definition. - - Name of the item. - Reference to a variable which will store the item definition. - Item definition. + - - Tries to create an item instance. - - Name of the item. - The result. - True if instance was created successfully, false otherwise. + - - Creates an item instance. - - The name of the item. - Created item. + @@ -8866,14 +8822,22 @@ The bytes. + + + Writes the specified bytes to a file. + + The bytes array. + The bytes array offset. + The number of bytes. + - Flushes this instance. + Flushes this file-appender instance. - Closes this instance. + Closes this file-appender instance. @@ -8937,35 +8901,19 @@ The parameters. - - Closes this instance of the appender. - + - - Flushes this current appender. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + - - Writes the specified bytes to a file. - - The bytes array. - The bytes array offset. - The number of bytes. + @@ -8973,14 +8921,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9218,14 +9159,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9241,35 +9175,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9277,14 +9195,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9299,35 +9210,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9335,14 +9230,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -10204,9 +10092,9 @@ value to append - + - Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time) + Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time) @@ -11413,6 +11301,20 @@ + + + Renders the nested states from like a callstack + + + + + Gets or sets the indent token. + + + + + + Renders the nested states from like a callstack @@ -12218,6 +12120,11 @@ Render the first character of the level. + + + Render the first character of the level. + + Render the ordinal (aka number) for the level. @@ -12228,6 +12135,11 @@ Render the LogLevel full name, expanding Warn / Info abbreviations + + + Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl) + + The log level. @@ -12815,6 +12727,12 @@ Only outputs the inner layout when exception has been defined for log message. + + + If is not found, print this layout. + + + @@ -12829,6 +12747,12 @@ ${onhasproperties:, Properties\: ${all-event-properties}} + + + If is not found, print this layout. + + + @@ -14891,6 +14815,12 @@ The full path of the source file that contains the caller. This is set at by the compiler. The line number in the source file at which the method is called. This is set at by the compiler. + + + Writes the log event to the underlying logger. + + Type of custom Logger wrapper. + Represents the logging event. @@ -18793,7 +18723,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -19978,7 +19908,7 @@ - Register a custom Target. + Register a custom NLog Target. Type of the Target. Fluent interface parameter. @@ -19986,15 +19916,31 @@ - Register a custom Target. + Register a custom NLog Target. Fluent interface parameter. Type name of the Target The target type-alias for use in NLog configuration + + + Register a custom NLog Layout. + + Type of the layout renderer. + Fluent interface parameter. + The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned. + + + + Register a custom NLog Layout. + + Fluent interface parameter. + Type of the layout. + The layout type-alias for use in NLog configuration + - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Type of the layout renderer. Fluent interface parameter. @@ -20002,7 +19948,7 @@ - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Fluent interface parameter. Type of the layout renderer. @@ -20010,7 +19956,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20018,7 +19964,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20026,7 +19972,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20035,7 +19981,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -23955,10 +23901,7 @@ The logging event. - - Flush any pending log messages asynchronously (in case of asynchronous targets). - - The asynchronous continuation. + @@ -24569,10 +24512,7 @@ - - Writes logging event to the log target. - - Logging event to be written out. + @@ -25344,10 +25284,7 @@ - - Flush any pending log messages (in case of asynchronous targets). - - The asynchronous continuation. + diff --git a/packages/NLog.5.0.5/lib/netstandard1.5/NLog.dll b/packages/NLog.5.0.5/lib/netstandard1.5/NLog.dll new file mode 100644 index 0000000..c954213 Binary files /dev/null and b/packages/NLog.5.0.5/lib/netstandard1.5/NLog.dll differ diff --git a/packages/NLog.5.0.2/lib/netstandard1.5/NLog.xml b/packages/NLog.5.0.5/lib/netstandard1.5/NLog.xml similarity index 99% rename from packages/NLog.5.0.2/lib/netstandard1.5/NLog.xml rename to packages/NLog.5.0.5/lib/netstandard1.5/NLog.xml index 7d14659..3a9ce87 100644 --- a/packages/NLog.5.0.2/lib/netstandard1.5/NLog.xml +++ b/packages/NLog.5.0.5/lib/netstandard1.5/NLog.xml @@ -2594,7 +2594,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -4039,10 +4039,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4102,10 +4099,7 @@ The layout. - - Returns a string representation of this expression. - - String literal in single quotes. + @@ -4121,10 +4115,7 @@ - - Returns a string representation of the expression. - - The 'level' string. + @@ -4151,10 +4142,7 @@ The literal value. - - Returns a string representation of the expression. - - The literal value. + @@ -4169,10 +4157,7 @@ - - Returns a string representation of this expression. - - A logger string. + @@ -4187,10 +4172,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4224,9 +4206,7 @@ - - Returns a string representation of the expression. - + @@ -4253,9 +4233,7 @@ The expression. - - Returns a string representation of the expression. - + @@ -4285,9 +4263,7 @@ The right expression. - - Returns a string representation of the expression. - + @@ -4329,9 +4305,7 @@ The operator. - - Returns a string representation of the expression. - + @@ -4920,11 +4894,7 @@ - - Registers a single type definition. - - The item name. - The type of the item. + @@ -4936,27 +4906,13 @@ The item name prefix. - - Tries to get registered item definition. - - Name of the item. - Reference to a variable which will store the item definition. - Item definition. + - - Tries to create an item instance. - - Name of the item. - The result. - True if instance was created successfully, false otherwise. + - - Creates an item instance. - - The name of the item. - Created item. + @@ -8980,14 +8936,22 @@ The bytes. + + + Writes the specified bytes to a file. + + The bytes array. + The bytes array offset. + The number of bytes. + - Flushes this instance. + Flushes this file-appender instance. - Closes this instance. + Closes this file-appender instance. @@ -9044,10 +9008,7 @@ The mutex for archiving. - - Releases unmanaged and - optionally - managed resources. - - True to release both managed and unmanaged resources; false to release only unmanaged resources. + @@ -9070,35 +9031,19 @@ The parameters. - - Closes this instance of the appender. - + - - Flushes this current appender. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + - - Writes the specified bytes to a file. - - The bytes array. - The bytes array offset. - The number of bytes. + @@ -9106,14 +9051,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9379,35 +9317,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9415,14 +9337,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9437,14 +9352,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9460,35 +9368,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9496,14 +9388,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9518,35 +9403,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9554,14 +9423,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -10461,9 +10323,9 @@ value to append - + - Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time) + Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time) @@ -11744,6 +11606,20 @@ + + + Renders the nested states from like a callstack + + + + + Gets or sets the indent token. + + + + + + Renders the nested states from like a callstack @@ -12611,6 +12487,11 @@ Render the first character of the level. + + + Render the first character of the level. + + Render the ordinal (aka number) for the level. @@ -12621,6 +12502,11 @@ Render the LogLevel full name, expanding Warn / Info abbreviations + + + Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl) + + The log level. @@ -13208,6 +13094,12 @@ Only outputs the inner layout when exception has been defined for log message. + + + If is not found, print this layout. + + + @@ -13222,6 +13114,12 @@ ${onhasproperties:, Properties\: ${all-event-properties}} + + + If is not found, print this layout. + + + @@ -15284,6 +15182,12 @@ The full path of the source file that contains the caller. This is set at by the compiler. The line number in the source file at which the method is called. This is set at by the compiler. + + + Writes the log event to the underlying logger. + + Type of custom Logger wrapper. + Represents the logging event. @@ -19202,7 +19106,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -20392,7 +20296,7 @@ - Register a custom Target. + Register a custom NLog Target. Type of the Target. Fluent interface parameter. @@ -20400,15 +20304,31 @@ - Register a custom Target. + Register a custom NLog Target. Fluent interface parameter. Type name of the Target The target type-alias for use in NLog configuration + + + Register a custom NLog Layout. + + Type of the layout renderer. + Fluent interface parameter. + The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned. + + + + Register a custom NLog Layout. + + Fluent interface parameter. + Type of the layout. + The layout type-alias for use in NLog configuration + - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Type of the layout renderer. Fluent interface parameter. @@ -20416,7 +20336,7 @@ - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Fluent interface parameter. Type of the layout renderer. @@ -20424,7 +20344,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20432,7 +20352,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20440,7 +20360,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20449,7 +20369,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -24936,10 +24856,7 @@ The logging event. - - Flush any pending log messages asynchronously (in case of asynchronous targets). - - The asynchronous continuation. + @@ -25550,10 +25467,7 @@ - - Writes logging event to the log target. - - Logging event to be written out. + @@ -26325,10 +26239,7 @@ - - Flush any pending log messages (in case of asynchronous targets). - - The asynchronous continuation. + diff --git a/packages/NLog.5.0.5/lib/netstandard2.0/NLog.dll b/packages/NLog.5.0.5/lib/netstandard2.0/NLog.dll new file mode 100644 index 0000000..2785094 Binary files /dev/null and b/packages/NLog.5.0.5/lib/netstandard2.0/NLog.dll differ diff --git a/packages/NLog.5.0.2/lib/netstandard2.0/NLog.xml b/packages/NLog.5.0.5/lib/netstandard2.0/NLog.xml similarity index 99% rename from packages/NLog.5.0.2/lib/netstandard2.0/NLog.xml rename to packages/NLog.5.0.5/lib/netstandard2.0/NLog.xml index b8f79c3..7f4d81a 100644 --- a/packages/NLog.5.0.2/lib/netstandard2.0/NLog.xml +++ b/packages/NLog.5.0.5/lib/netstandard2.0/NLog.xml @@ -2594,7 +2594,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -4065,10 +4065,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4128,10 +4125,7 @@ The layout. - - Returns a string representation of this expression. - - String literal in single quotes. + @@ -4147,10 +4141,7 @@ - - Returns a string representation of the expression. - - The 'level' string. + @@ -4177,10 +4168,7 @@ The literal value. - - Returns a string representation of the expression. - - The literal value. + @@ -4195,10 +4183,7 @@ - - Returns a string representation of this expression. - - A logger string. + @@ -4213,10 +4198,7 @@ - - Returns a string representation of this expression. - - The 'message' string. + @@ -4250,9 +4232,7 @@ - - Returns a string representation of the expression. - + @@ -4279,9 +4259,7 @@ The expression. - - Returns a string representation of the expression. - + @@ -4311,9 +4289,7 @@ The right expression. - - Returns a string representation of the expression. - + @@ -4355,9 +4331,7 @@ The operator. - - Returns a string representation of the expression. - + @@ -4946,11 +4920,7 @@ - - Registers a single type definition. - - The item name. - The type of the item. + @@ -4962,27 +4932,13 @@ The item name prefix. - - Tries to get registered item definition. - - Name of the item. - Reference to a variable which will store the item definition. - Item definition. + - - Tries to create an item instance. - - Name of the item. - The result. - True if instance was created successfully, false otherwise. + - - Creates an item instance. - - The name of the item. - Created item. + @@ -9019,14 +8975,22 @@ The bytes. + + + Writes the specified bytes to a file. + + The bytes array. + The bytes array offset. + The number of bytes. + - Flushes this instance. + Flushes this file-appender instance. - Closes this instance. + Closes this file-appender instance. @@ -9083,10 +9047,7 @@ The mutex for archiving. - - Releases unmanaged and - optionally - managed resources. - - True to release both managed and unmanaged resources; false to release only unmanaged resources. + @@ -9109,35 +9070,19 @@ The parameters. - - Closes this instance of the appender. - + - - Flushes this current appender. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + - - Writes the specified bytes to a file. - - The bytes array. - The bytes array offset. - The number of bytes. + @@ -9145,14 +9090,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9418,35 +9356,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Closes this instance. - + - - Flushes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9454,14 +9376,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9476,14 +9391,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9499,35 +9407,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9535,14 +9427,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -9557,35 +9442,19 @@ The parameters. - - Writes the specified bytes. - - The bytes array. - The bytes array offset. - The number of bytes. + - - Flushes this instance. - + - - Closes this instance. - + - - Gets the creation time for a file associated with the appender. The time returned is in Coordinated Universal - Time [UTC] standard. - - The file creation time. + - - Gets the length in bytes of the file associated with the appender. - - A long value representing the length of the file in bytes. + @@ -9593,14 +9462,7 @@ - - Opens the appender for given file name and parameters. - - Name of the file. - Creation parameters. - - Instance of which can be used to write to the file. - + @@ -10589,9 +10451,9 @@ value to append - + - Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 6801 date (Round-Trip-Time) + Convert DateTime into UTC and format to yyyy-MM-ddTHH:mm:ss.fffffffZ - ISO 8601 Compliant Date Format (Round-Trip-Time) @@ -11911,6 +11773,20 @@ + + + Renders the nested states from like a callstack + + + + + Gets or sets the indent token. + + + + + + Renders the nested states from like a callstack @@ -12881,6 +12757,11 @@ Render the first character of the level. + + + Render the first character of the level. + + Render the ordinal (aka number) for the level. @@ -12891,6 +12772,11 @@ Render the LogLevel full name, expanding Warn / Info abbreviations + + + Render the LogLevel as 3 letter abbreviations (Trc, Dbg, Inf, Wrn, Err, Ftl) + + The log level. @@ -13501,6 +13387,12 @@ Only outputs the inner layout when exception has been defined for log message. + + + If is not found, print this layout. + + + @@ -13515,6 +13407,12 @@ ${onhasproperties:, Properties\: ${all-event-properties}} + + + If is not found, print this layout. + + + @@ -15577,6 +15475,12 @@ The full path of the source file that contains the caller. This is set at by the compiler. The line number in the source file at which the method is called. This is set at by the compiler. + + + Writes the log event to the underlying logger. + + Type of custom Logger wrapper. + Represents the logging event. @@ -19495,7 +19399,7 @@ Writes the specified diagnostic message. - The name of the type that wraps Logger. + Type of custom Logger wrapper. Log event. @@ -20875,7 +20779,7 @@ - Register a custom Target. + Register a custom NLog Target. Type of the Target. Fluent interface parameter. @@ -20883,15 +20787,31 @@ - Register a custom Target. + Register a custom NLog Target. Fluent interface parameter. Type name of the Target The target type-alias for use in NLog configuration + + + Register a custom NLog Layout. + + Type of the layout renderer. + Fluent interface parameter. + The layout type-alias for use in NLog configuration. Will extract from class-attribute when unassigned. + + + + Register a custom NLog Layout. + + Fluent interface parameter. + Type of the layout. + The layout type-alias for use in NLog configuration + - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Type of the layout renderer. Fluent interface parameter. @@ -20899,7 +20819,7 @@ - Register a custom layout renderer. + Register a custom NLog LayoutRenderer. Fluent interface parameter. Type of the layout renderer. @@ -20907,7 +20827,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20915,7 +20835,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20923,7 +20843,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -20932,7 +20852,7 @@ - Register a custom layout renderer with a callback function . The callback receives the logEvent and the current configuration. + Register a custom NLog LayoutRenderer with a callback function . The callback receives the logEvent and the current configuration. Fluent interface parameter. The layout-renderer type-alias for use in NLog configuration - without '${ }' @@ -25733,10 +25653,7 @@ The logging event. - - Flush any pending log messages asynchronously (in case of asynchronous targets). - - The asynchronous continuation. + @@ -26347,10 +26264,7 @@ - - Writes logging event to the log target. - - Logging event to be written out. + @@ -27122,10 +27036,7 @@ - - Flush any pending log messages (in case of asynchronous targets). - - The asynchronous continuation. +