From b42bf8346a3176d9c8bdb04a9ba03c94150fdb02 Mon Sep 17 00:00:00 2001
From: Luchs <luchs@pinselohr.ch>
Date: Thu, 13 Jun 2019 08:34:10 +0200
Subject: [PATCH 1/2] .netcore2.2 upgrade, project file cleanup

---
 .../Eurofurence.App.Domain.Model.csproj                      | 4 +---
 .../Eurofurence.App.Server.KestrelHost.csproj                | 5 ++---
 .../Eurofurence.App.Server.Services.csproj                   | 1 -
 .../Eurofurence.App.Server.Web.csproj                        | 4 +---
 .../Eurofurence.App.Tools.CliToolBox.csproj                  | 4 ++--
 .../Eurofurence.App.Tools.DealersDenPackageImporter.csproj   | 5 ++---
 .../Eurofurence.App.Tools.EventScheduleImporter.csproj       | 4 ++--
 .../Eurofurence.App.Tools.KnowledgeBaseImporter.csproj       | 2 +-
 .../Eurofurence.App.Server.Services.Tests.csproj             | 2 +-
 .../Eurofurence.App.Tests.Common.csproj                      | 2 +-
 10 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj b/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj
index 3533b49a..7a07d00f 100644
--- a/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj
+++ b/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj
@@ -7,16 +7,14 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\netstandard2.0\Eurofurence.App.Domain.Model.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
-    <OutputPath>bin\Debug\netstandard2.0\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard1.6\Eurofurence.App.Domain.Model.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
diff --git a/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj b/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj
index 71ac12f9..7fe2c10a 100644
--- a/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj
+++ b/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <AssemblyName>Eurofurence.App.Server.KestrelHost</AssemblyName>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;1705;1591</NoWarn>
-    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
-    <OutputPath>bin\Debug\netcoreapp2.0\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_2</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj b/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj
index c5771e3a..be7a08fc 100644
--- a/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj
+++ b/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
-    <OutputPath>bin\Debug\netstandard2.0\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Eurofurence.App.Domain.Model\Eurofurence.App.Domain.Model.csproj" />
diff --git a/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj b/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj
index 71282d68..220a83c3 100644
--- a/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj
+++ b/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;1705;1591</NoWarn>
-    <OutputPath>bin\Debug\netcoreapp2.0\</OutputPath>
-    <DocumentationFile>obj\Debug\netcoreapp2.0\Eurofurence.App.Server.Web.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj b/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj
index 465da4ff..289cc928 100644
--- a/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj
+++ b/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_2</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj b/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj
index 881da2dc..3d84b1d4 100644
--- a/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj
+++ b/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
-    <OutputPath>bin\Debug\netcoreapp2.0\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_2</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj b/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj
index b8f65a55..c499b194 100644
--- a/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj
+++ b/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <AssemblyName>Eurofurence.App.Tools.EventScheduleImporter</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>Eurofurence.App.Tools.EventScheduleImporter</PackageId>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_2</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj b/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj
index 40eb03d3..f6ac6b9b 100644
--- a/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj
+++ b/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj b/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj
index c455f25e..32d2cdb1 100644
--- a/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj
+++ b/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj b/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj
index c931edb7..69b0e912 100644
--- a/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj
+++ b/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

From c5f5bdd033c4347970ffc8bcbdbd95a8de2c8696 Mon Sep 17 00:00:00 2001
From: Luchs <luchs@pinselohr.ch>
Date: Thu, 13 Jun 2019 09:23:25 +0200
Subject: [PATCH 2/2] Updating all nuget packages

---
 .../Eurofurence.App.Common.csproj             |  2 +-
 ...urofurence.App.Domain.Model.MongoDb.csproj |  4 +--
 .../Eurofurence.App.Domain.Model.MySql.csproj |  6 ++---
 .../Eurofurence.App.Domain.Model.csproj       |  2 +-
 .../Eurofurence.App.Server.KestrelHost.csproj |  4 +--
 .../Eurofurence.App.Server.Services.csproj    | 14 +++++-----
 .../Eurofurence.App.Server.Web.csproj         | 26 +++++++++----------
 .../Extensions/LogMessageRenderer.cs          | 23 ----------------
 src/Eurofurence.App.Server.Web/Startup.cs     |  4 ++-
 .../Eurofurence.App.Tools.CliToolBox.csproj   | 16 ++++++------
 ...App.Tools.DealersDenPackageImporter.csproj |  8 +++---
 ...nce.App.Tools.EventScheduleImporter.csproj |  6 ++---
 ...nce.App.Tools.KnowledgeBaseImporter.csproj |  6 ++---
 ...rofurence.App.Server.Services.Tests.csproj | 13 ++++++----
 .../Eurofurence.App.Tests.Common.csproj       | 11 +++++---
 15 files changed, 65 insertions(+), 80 deletions(-)
 delete mode 100644 src/Eurofurence.App.Server.Web/Extensions/LogMessageRenderer.cs

diff --git a/src/Eurofurence.App.Common/Eurofurence.App.Common.csproj b/src/Eurofurence.App.Common/Eurofurence.App.Common.csproj
index 4498cad2..7fe8c3b7 100644
--- a/src/Eurofurence.App.Common/Eurofurence.App.Common.csproj
+++ b/src/Eurofurence.App.Common/Eurofurence.App.Common.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eurofurence.App.Domain.Model.MongoDb/Eurofurence.App.Domain.Model.MongoDb.csproj b/src/Eurofurence.App.Domain.Model.MongoDb/Eurofurence.App.Domain.Model.MongoDb.csproj
index 096d6102..4e93bdc1 100644
--- a/src/Eurofurence.App.Domain.Model.MongoDb/Eurofurence.App.Domain.Model.MongoDb.csproj
+++ b/src/Eurofurence.App.Domain.Model.MongoDb/Eurofurence.App.Domain.Model.MongoDb.csproj
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.6.0" />
-    <PackageReference Include="Autofac" Version="4.8.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eurofurence.App.Domain.Model.MySql/Eurofurence.App.Domain.Model.MySql.csproj b/src/Eurofurence.App.Domain.Model.MySql/Eurofurence.App.Domain.Model.MySql.csproj
index c3439a0d..f71d7fa9 100644
--- a/src/Eurofurence.App.Domain.Model.MySql/Eurofurence.App.Domain.Model.MySql.csproj
+++ b/src/Eurofurence.App.Domain.Model.MySql/Eurofurence.App.Domain.Model.MySql.csproj
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.2" />
-    <PackageReference Include="MySql.Data" Version="8.0.11" />
-    <PackageReference Include="MySql.Data.EntityFrameworkCore" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.4" />
+    <PackageReference Include="MySql.Data" Version="8.0.16" />
+    <PackageReference Include="MySql.Data.EntityFrameworkCore" Version="8.0.16" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj b/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj
index 7a07d00f..96b3fb4f 100644
--- a/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj
+++ b/src/Eurofurence.App.Domain.Model/Eurofurence.App.Domain.Model.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj b/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj
index 7fe2c10a..ead7f6da 100644
--- a/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj
+++ b/src/Eurofurence.App.Server.KestrelHost/Eurofurence.App.Server.KestrelHost.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj b/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj
index be7a08fc..be266931 100644
--- a/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj
+++ b/src/Eurofurence.App.Server.Services/Eurofurence.App.Server.Services.csproj
@@ -14,16 +14,16 @@
     <ProjectReference Include="..\Eurofurence.App.Domain.Model\Eurofurence.App.Domain.Model.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.0" />
-    <PackageReference Include="CsvHelper" Version="7.1.0" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="CsvHelper" Version="12.1.2" />
     <PackageReference Include="linqtotwitter" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.4.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0005" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.2" />
-    <PackageReference Include="Telegram.Bot" Version="14.11.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
+    <PackageReference Include="Telegram.Bot" Version="14.12.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj b/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj
index 220a83c3..e201e521 100644
--- a/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj
+++ b/src/Eurofurence.App.Server.Web/Eurofurence.App.Server.Web.csproj
@@ -20,24 +20,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
     <PackageReference Include="FluentScheduler" Version="5.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
-    <PackageReference Include="Serilog" Version="2.7.1" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
+    <PackageReference Include="Serilog" Version="2.8.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
     <PackageReference Include="Serilog.Filters.Expressions" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.AwsCloudWatch" Version="3.0.97" />
+    <PackageReference Include="Serilog.Sinks.AwsCloudWatch" Version="4.0.155" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Eurofurence.App.Server.Web/Extensions/LogMessageRenderer.cs b/src/Eurofurence.App.Server.Web/Extensions/LogMessageRenderer.cs
deleted file mode 100644
index c87fefe2..00000000
--- a/src/Eurofurence.App.Server.Web/Extensions/LogMessageRenderer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.IO;
-using Serilog.Events;
-using Serilog.Formatting.Json;
-using Serilog.Sinks.AwsCloudWatch;
-
-namespace Eurofurence.App.Server.Web.Extensions
-{
-    public class JsonLogEventRenderer : ILogEventRenderer
-    {
-        private readonly JsonFormatter _formatter;
-
-        public JsonLogEventRenderer()
-        {
-            _formatter = new JsonFormatter();
-        }
-        public string RenderLogEvent(LogEvent logEvent)
-        {
-            var stringWriter = new StringWriter();
-            _formatter.Format(logEvent, stringWriter);
-            return stringWriter.ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Eurofurence.App.Server.Web/Startup.cs b/src/Eurofurence.App.Server.Web/Startup.cs
index 8cc3787e..218171db 100644
--- a/src/Eurofurence.App.Server.Web/Startup.cs
+++ b/src/Eurofurence.App.Server.Web/Startup.cs
@@ -35,8 +35,10 @@
 using Serilog;
 using Serilog.Context;
 using Serilog.Events;
+using Serilog.Formatting.Json;
 using Serilog.Sinks.AwsCloudWatch;
 using Swashbuckle.AspNetCore.Swagger;
+using Swashbuckle.AspNetCore.SwaggerUI;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace Eurofurence.App.Server.Web
@@ -254,7 +256,7 @@ IApplicationLifetime appLifetime
                 var options = new CloudWatchSinkOptions
                 {
                     LogGroupName = logGroupName,
-                    LogEventRenderer =  new JsonLogEventRenderer(),
+                    TextFormatter = new JsonFormatter(),
                     MinimumLogEventLevel = (LogEventLevel)Convert.ToInt32(Configuration["logLevel"]),
                     LogStreamNameProvider = new ConstantLogStreamNameProvider(Environment.MachineName)
                 };
diff --git a/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj b/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj
index 289cc928..0b5a2df2 100644
--- a/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj
+++ b/src/Eurofurence.App.Tools.CliToolBox/Eurofurence.App.Tools.CliToolBox.csproj
@@ -14,15 +14,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.0" />
-    <PackageReference Include="CsvHelper" Version="7.1.0" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="CsvHelper" Version="12.1.2" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.2" />
-    <PackageReference Include="MongoDB.Driver" Version="2.6.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.4.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj b/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj
index 3d84b1d4..61c9ba11 100644
--- a/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj
+++ b/src/Eurofurence.App.Tools.DealersDenPackageImporter/Eurofurence.App.Tools.DealersDenPackageImporter.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.0" />
-    <PackageReference Include="CsvHelper" Version="7.1.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.6.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="CsvHelper" Version="12.1.2" />
+    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj b/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj
index c499b194..c4aa753e 100644
--- a/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj
+++ b/src/Eurofurence.App.Tools.EventScheduleImporter/Eurofurence.App.Tools.EventScheduleImporter.csproj
@@ -22,9 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.6.0" />
-    <PackageReference Include="CsvHelper" Version="7.1.0" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="CsvHelper" Version="12.1.2" />
   </ItemGroup>
 
 
diff --git a/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj b/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj
index f6ac6b9b..6f62ddac 100644
--- a/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj
+++ b/src/Eurofurence.App.Tools.KnowledgeBaseImporter/Eurofurence.App.Tools.KnowledgeBaseImporter.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.0" />
-    <PackageReference Include="CsvHelper" Version="7.1.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.6.0" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="CsvHelper" Version="12.1.2" />
+    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj b/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj
index 32d2cdb1..bff77488 100644
--- a/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj
+++ b/test/Eurofurence.App.Server.Services.Tests/Eurofurence.App.Server.Services.Tests.csproj
@@ -7,11 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="Moq" Version="4.10.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
+    <PackageReference Include="Moq" Version="4.11.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
diff --git a/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj b/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj
index 69b0e912..35ac9dd5 100644
--- a/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj
+++ b/test/Eurofurence.App.Tests.Common/Eurofurence.App.Tests.Common.csproj
@@ -6,10 +6,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>