diff --git a/NetMQ.Devices.sln b/NetMQ.Devices.sln
index e95930e..b9ff6ec 100644
--- a/NetMQ.Devices.sln
+++ b/NetMQ.Devices.sln
@@ -1,16 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1500
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{338CCF4A-51D8-4183-96E9-6A2DE71CE50A}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetMQ.Devices", "src\NetMQ.Devices\NetMQ.Devices.xproj", "{1654CA28-3B0C-4B5E-99EA-0A155B82875D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetMQ.Devices", "src\NetMQ.Devices\NetMQ.Devices.csproj", "{1654CA28-3B0C-4B5E-99EA-0A155B82875D}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetMQ.Devices.Tests", "tests\NetMQ.Devices.Tests\NetMQ.Devices.Tests.xproj", "{B85D42AF-2233-402E-8630-5257485C1485}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetMQ.Devices.Tests", "tests\NetMQ.Devices.Tests\NetMQ.Devices.Tests.csproj", "{B85D42AF-2233-402E-8630-5257485C1485}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,4 +30,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {66151175-2901-48E3-856C-1557B01C0C32}
+	EndGlobalSection
 EndGlobal
diff --git a/src/NetMQ.Devices/NetMQ.Devices.csproj b/src/NetMQ.Devices/NetMQ.Devices.csproj
new file mode 100644
index 0000000..e608799
--- /dev/null
+++ b/src/NetMQ.Devices/NetMQ.Devices.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>NetMQ.Devices</AssemblyName>
+    <AssemblyOriginatorKeyFile>../../NetMQ.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageId>NetMQ.Devices</PackageId>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="NetMQ" Version="4.0.1.6" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/NetMQ.Devices/NetMQ.Devices.xproj b/src/NetMQ.Devices/NetMQ.Devices.xproj
deleted file mode 100644
index 792414a..0000000
--- a/src/NetMQ.Devices/NetMQ.Devices.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>1654ca28-3b0c-4b5e-99ea-0a155b82875d</ProjectGuid>
-    <RootNamespace>NetMQ.Devices</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/NetMQ.Devices/project.json b/src/NetMQ.Devices/project.json
deleted file mode 100644
index 1e626b7..0000000
--- a/src/NetMQ.Devices/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "keyFile": "../../NetMQ.snk",
-    "debugType": "portable"
-  },
-  "dependencies": {
-    "NetMQ": "4.0.0-rc5",
-    "JetBrains.Annotations": {
-      "version": "10.1.5",
-      "type": "build"
-    }
-  },
-  "frameworks": {
-    "net40": {     
-    }
-  }
-}
diff --git a/tests/NetMQ.Devices.Tests/NetMQ.Devices.Tests.csproj b/tests/NetMQ.Devices.Tests/NetMQ.Devices.Tests.csproj
new file mode 100644
index 0000000..4a9482e
--- /dev/null
+++ b/tests/NetMQ.Devices.Tests/NetMQ.Devices.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>NetMQ.Devices.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>../../NetMQ.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageId>NetMQ.Devices.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\NetMQ.Devices\NetMQ.Devices.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/NetMQ.Devices.Tests/NetMQ.Devices.Tests.xproj b/tests/NetMQ.Devices.Tests/NetMQ.Devices.Tests.xproj
deleted file mode 100644
index 8d0b049..0000000
--- a/tests/NetMQ.Devices.Tests/NetMQ.Devices.Tests.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b85d42af-2233-402e-8630-5257485c1485</ProjectGuid>
-    <RootNamespace>NetMQ.Devices.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/tests/NetMQ.Devices.Tests/project.json b/tests/NetMQ.Devices.Tests/project.json
deleted file mode 100644
index dde2c55..0000000
--- a/tests/NetMQ.Devices.Tests/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "debugType": "portable",
-    "keyFile": "../../NetMQ.snk"   
-  },
-  "dependencies": {
-    "NetMQ.Devices": "1.0.0-*",
-    "dotnet-test-nunit": "3.4.0-beta-1",
-    "NUnit": "3.4.1",
-    "JetBrains.Annotations": {
-      "version": "10.1.5",
-      "type": "build"
-    }
-  },
-  "testRunner": "nunit",
-  "frameworks": {
-    "net451": {
-      "buildOptions": {
-        "copyToOutput": ["./NetMQ.Testing.pfx", "./NetMQ.Testing.crt"]
-      }      
-    }
-  }
-}