From 7b249fb9cb24eb0a0cff1add083554636ef38c67 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Fri, 25 Nov 2022 13:01:12 +0100
Subject: [PATCH] Jobs: Update to Nlog 5 - Version 1.11.0.0

---
 Jobs/App.config                    | 8 ++++----
 Jobs/Jobs.vbproj                   | 4 ++--
 Jobs/My Project/AssemblyInfo.vb    | 6 +++---
 Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb | 3 ---
 Jobs/packages.config               | 2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Jobs/App.config b/Jobs/App.config
index db14e04e..94e38df9 100644
--- a/Jobs/App.config
+++ b/Jobs/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj
index b29aa40d..eb622bad 100644
--- a/Jobs/Jobs.vbproj
+++ b/Jobs/Jobs.vbproj
@@ -127,8 +127,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/Jobs/My Project/AssemblyInfo.vb b/Jobs/My Project/AssemblyInfo.vb
index d26d6176..9dac9b52 100644
--- a/Jobs/My Project/AssemblyInfo.vb	
+++ b/Jobs/My Project/AssemblyInfo.vb	
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Jobs")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("1.10.0.4")>
+<Assembly: AssemblyTrademark("1.11.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("1.10.0.4")>
-<Assembly: AssemblyFileVersion("1.10.0.4")>
+<Assembly: AssemblyVersion("1.11.0.0")>
+<Assembly: AssemblyFileVersion("1.11.0.0")>
diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
index 54ede22e..226ada45 100644
--- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -198,7 +198,6 @@ Public Class ImportZUGFeRDFiles
                         Dim oMissingProperties As New List(Of String)
                         Dim oMD5CheckSum As String = String.Empty
 
-                        _logger.NewBlock($"Message Id {oMessageId}")
                         _logger.Info("Start processing file group {0}", oMessageId)
 
                         Try
@@ -540,8 +539,6 @@ Public Class ImportZUGFeRDFiles
                                 _logger.Warn("Could not move files!")
                                 _logger.Error(ex)
                                 Throw ex
-                            Finally
-                                _logger.EndBlock()
                             End Try
 
                             Try
diff --git a/Jobs/packages.config b/Jobs/packages.config
index 67708dc3..91d16086 100644
--- a/Jobs/packages.config
+++ b/Jobs/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>
\ No newline at end of file