diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 766e4aa52..374cb130f 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PreserveCompilationContext>false</PreserveCompilationContext>
     <ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
     <AssemblyTitle>Artemis.Core</AssemblyTitle>
@@ -40,7 +40,7 @@
     <PackageReference Include="HidSharp" Version="2.1.0" />
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
     <PackageReference Include="LiteDB" Version="5.0.8" />
-    <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.0" />
+    <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Ninject" Version="3.3.4" />
     <PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
diff --git a/src/Artemis.Core/packages.lock.json b/src/Artemis.Core/packages.lock.json
index 7bc94554e..69a57801e 100644
--- a/src/Artemis.Core/packages.lock.json
+++ b/src/Artemis.Core/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETCoreApp,Version=v3.1": {
+    ".NETCoreApp,Version=v5.0": {
       "Ben.Demystifier": {
         "type": "Direct",
         "requested": "[0.1.6, )",
@@ -32,9 +32,9 @@
       },
       "McMaster.NETCore.Plugins": {
         "type": "Direct",
-        "requested": "[1.3.0, )",
-        "resolved": "1.3.0",
-        "contentHash": "QjGW7DQ0kUB5lrVvczkwVipHbkindrTpQCeYuQKYWtPKJI8MCMl05RCq4J/H9DGqcJEUH8hxCYm8GcxXVOv7MQ==",
+        "requested": "[1.3.1, )",
+        "resolved": "1.3.1",
+        "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
         "dependencies": {
           "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
           "Microsoft.Extensions.DependencyModel": "3.1.0"
diff --git a/src/Artemis.Storage/Artemis.Storage.csproj b/src/Artemis.Storage/Artemis.Storage.csproj
index 7fe23809f..f18dabdc2 100644
--- a/src/Artemis.Storage/Artemis.Storage.csproj
+++ b/src/Artemis.Storage/Artemis.Storage.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PreserveCompilationContext>false</PreserveCompilationContext>
     <Platforms>x64</Platforms>
   </PropertyGroup>
diff --git a/src/Artemis.Storage/packages.lock.json b/src/Artemis.Storage/packages.lock.json
index a032ab3a7..3035e67c6 100644
--- a/src/Artemis.Storage/packages.lock.json
+++ b/src/Artemis.Storage/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETCoreApp,Version=v3.1": {
+    ".NETCoreApp,Version=v5.0": {
       "LiteDB": {
         "type": "Direct",
         "requested": "[5.0.8, )",
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 08d142d25..2e39dab75 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <PreserveCompilationContext>false</PreserveCompilationContext>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
diff --git a/src/Artemis.UI.Shared/packages.lock.json b/src/Artemis.UI.Shared/packages.lock.json
index 0411494ab..3ea7f2516 100644
--- a/src/Artemis.UI.Shared/packages.lock.json
+++ b/src/Artemis.UI.Shared/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETCoreApp,Version=v3.1": {
+    ".NETCoreApp,Version=v5.0": {
       "AvalonEdit": {
         "type": "Direct",
         "requested": "[6.0.1, )",
@@ -159,8 +159,8 @@
       },
       "McMaster.NETCore.Plugins": {
         "type": "Transitive",
-        "resolved": "1.3.0",
-        "contentHash": "QjGW7DQ0kUB5lrVvczkwVipHbkindrTpQCeYuQKYWtPKJI8MCMl05RCq4J/H9DGqcJEUH8hxCYm8GcxXVOv7MQ==",
+        "resolved": "1.3.1",
+        "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
         "dependencies": {
           "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
           "Microsoft.Extensions.DependencyModel": "3.1.0"
@@ -1290,7 +1290,7 @@
           "HidSharp": "2.1.0",
           "Humanizer.Core": "2.8.26",
           "LiteDB": "5.0.8",
-          "McMaster.NETCore.Plugins": "1.3.0",
+          "McMaster.NETCore.Plugins": "1.3.1",
           "Newtonsoft.Json": "12.0.3",
           "Ninject": "3.3.4",
           "Ninject.Extensions.ChildKernel": "3.3.0",
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 1ec1edbb7..b6e3c36e7 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>Artemis</AssemblyTitle>
@@ -309,6 +309,9 @@
     <None Remove="Resources\Images\Logo\logo-512.ico" />
     <None Remove="Resources\Images\Sidebar\sidebar-header.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/src/Artemis.UI/packages.lock.json b/src/Artemis.UI/packages.lock.json
index e3fe7f9ae..8d7a7ed8d 100644
--- a/src/Artemis.UI/packages.lock.json
+++ b/src/Artemis.UI/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    ".NETCoreApp,Version=v3.1": {
+    ".NETCoreApp,Version=v5.0": {
       "FluentValidation": {
         "type": "Direct",
         "requested": "[9.2.0, )",
@@ -204,8 +204,8 @@
       },
       "McMaster.NETCore.Plugins": {
         "type": "Transitive",
-        "resolved": "1.3.0",
-        "contentHash": "QjGW7DQ0kUB5lrVvczkwVipHbkindrTpQCeYuQKYWtPKJI8MCMl05RCq4J/H9DGqcJEUH8hxCYm8GcxXVOv7MQ==",
+        "resolved": "1.3.1",
+        "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
         "dependencies": {
           "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
           "Microsoft.Extensions.DependencyModel": "3.1.0"
@@ -1353,7 +1353,7 @@
           "HidSharp": "2.1.0",
           "Humanizer.Core": "2.8.26",
           "LiteDB": "5.0.8",
-          "McMaster.NETCore.Plugins": "1.3.0",
+          "McMaster.NETCore.Plugins": "1.3.1",
           "Newtonsoft.Json": "12.0.3",
           "Ninject": "3.3.4",
           "Ninject.Extensions.ChildKernel": "3.3.0",