From 44f9be5e406b5db9da88afb7f2ba39a3bf2d981f Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Thu, 11 Oct 2018 16:42:29 +0200
Subject: [PATCH] jj: Update Nlog to 4.5.10, Firebird to 6.3.0.0

---
 Config/Config.vbproj               |  2 +-
 Config/packages.config             |  2 +-
 DDTestService/DDTestService.vbproj |  2 +-
 DDTestService/packages.config      |  2 +-
 EDMDesigner/EDMDesigner.vbproj     | 10 +++++-----
 EDMDesigner/packages.config        |  6 +++---
 Message/Messaging.vbproj           |  2 +-
 Message/packages.config            |  2 +-
 Modules.Database/App.config        |  2 +-
 Modules.Database/Database.vbproj   | 14 ++++++++------
 Modules.Database/packages.config   |  6 +++---
 11 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Config/Config.vbproj b/Config/Config.vbproj
index 1ee0487b..1be91b94 100644
--- a/Config/Config.vbproj
+++ b/Config/Config.vbproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/Config/packages.config b/Config/packages.config
index a3ffb2eb..9764f16f 100644
--- a/Config/packages.config
+++ b/Config/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.5.8" targetFramework="net461" />
+  <package id="NLog" version="4.5.10" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/DDTestService/DDTestService.vbproj b/DDTestService/DDTestService.vbproj
index df8a9034..9068d5b2 100644
--- a/DDTestService/DDTestService.vbproj
+++ b/DDTestService/DDTestService.vbproj
@@ -52,7 +52,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/DDTestService/packages.config b/DDTestService/packages.config
index a3ffb2eb..9764f16f 100644
--- a/DDTestService/packages.config
+++ b/DDTestService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.5.8" targetFramework="net461" />
+  <package id="NLog" version="4.5.10" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/EDMDesigner/EDMDesigner.vbproj b/EDMDesigner/EDMDesigner.vbproj
index b1259ad4..cf2dc6e7 100644
--- a/EDMDesigner/EDMDesigner.vbproj
+++ b/EDMDesigner/EDMDesigner.vbproj
@@ -65,18 +65,18 @@
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.Firebird, Version=6.1.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.Firebird.6.1.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    <Reference Include="EntityFramework.Firebird, Version=6.3.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.Firebird.6.3.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.1.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.3.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.3.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/EDMDesigner/packages.config b/EDMDesigner/packages.config
index 59561d12..f27f81d3 100644
--- a/EDMDesigner/packages.config
+++ b/EDMDesigner/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
-  <package id="EntityFramework.Firebird" version="6.1.0" targetFramework="net461" />
-  <package id="FirebirdSql.Data.FirebirdClient" version="6.1.0" targetFramework="net461" />
-  <package id="NLog" version="4.5.8" targetFramework="net461" />
+  <package id="EntityFramework.Firebird" version="6.3.0" targetFramework="net461" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.3.0" targetFramework="net461" />
+  <package id="NLog" version="4.5.10" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Message/Messaging.vbproj b/Message/Messaging.vbproj
index ed437d9a..30f0e002 100644
--- a/Message/Messaging.vbproj
+++ b/Message/Messaging.vbproj
@@ -48,7 +48,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/Message/packages.config b/Message/packages.config
index a3ffb2eb..9764f16f 100644
--- a/Message/packages.config
+++ b/Message/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.5.8" targetFramework="net461" />
+  <package id="NLog" version="4.5.10" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Modules.Database/App.config b/Modules.Database/App.config
index 422012a5..10fb41e9 100644
--- a/Modules.Database/App.config
+++ b/Modules.Database/App.config
@@ -16,7 +16,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.1.0.0" newVersion="6.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Modules.Database/Database.vbproj b/Modules.Database/Database.vbproj
index 78456acd..6b4b52f5 100644
--- a/Modules.Database/Database.vbproj
+++ b/Modules.Database/Database.vbproj
@@ -48,18 +48,18 @@
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.Firebird, Version=6.1.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.Firebird.6.1.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    <Reference Include="EntityFramework.Firebird, Version=6.3.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.Firebird.6.3.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.1.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.1.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.3.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.3.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
@@ -119,7 +119,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
diff --git a/Modules.Database/packages.config b/Modules.Database/packages.config
index 59561d12..f27f81d3 100644
--- a/Modules.Database/packages.config
+++ b/Modules.Database/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
-  <package id="EntityFramework.Firebird" version="6.1.0" targetFramework="net461" />
-  <package id="FirebirdSql.Data.FirebirdClient" version="6.1.0" targetFramework="net461" />
-  <package id="NLog" version="4.5.8" targetFramework="net461" />
+  <package id="EntityFramework.Firebird" version="6.3.0" targetFramework="net461" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.3.0" targetFramework="net461" />
+  <package id="NLog" version="4.5.10" targetFramework="net461" />
 </packages>
\ No newline at end of file