diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 00000000..18eaa2c3
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,40 @@
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Opserver.sln b/Opserver.sln
index b59c3045..a5f37a41 100644
--- a/Opserver.sln
+++ b/Opserver.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29021.104
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35521.163 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opserver.Core", "src\Opserver.Core\Opserver.Core.csproj", "{C58AFF99-F4D9-4A83-866E-18DA0A633F6B}"
EndProject
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
appveyor.yml = appveyor.yml
azure-pipelines.yml = azure-pipelines.yml
Build.bat = Build.bat
+ Directory.Packages.props = Directory.Packages.props
global.json = global.json
nuget.config = nuget.config
readme.md = readme.md
diff --git a/nuget.config b/nuget.config
index 15932f7c..b004e5cc 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,7 +2,6 @@
-
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 21c82dae..d5ad3201 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -16,15 +16,10 @@
en-US
false
true
-
-
-
-
-
diff --git a/src/Opserver.Core/Data/SQL/SQLAzureServer.cs b/src/Opserver.Core/Data/SQL/SQLAzureServer.cs
index a2940319..0a00d341 100644
--- a/src/Opserver.Core/Data/SQL/SQLAzureServer.cs
+++ b/src/Opserver.Core/Data/SQL/SQLAzureServer.cs
@@ -1,6 +1,6 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
namespace Opserver.Data.SQL
{
diff --git a/src/Opserver.Core/Data/SQL/SQLInstance.cs b/src/Opserver.Core/Data/SQL/SQLInstance.cs
index 7a3e7f0d..2d11b913 100644
--- a/src/Opserver.Core/Data/SQL/SQLInstance.cs
+++ b/src/Opserver.Core/Data/SQL/SQLInstance.cs
@@ -2,9 +2,9 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data.Common;
-using System.Data.SqlClient;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
using Opserver.Helpers;
namespace Opserver.Data.SQL
diff --git a/src/Opserver.Core/Helpers/Connection.cs b/src/Opserver.Core/Helpers/Connection.cs
index 452724c9..2514ae4d 100644
--- a/src/Opserver.Core/Helpers/Connection.cs
+++ b/src/Opserver.Core/Helpers/Connection.cs
@@ -1,9 +1,9 @@
using System;
using System.Data;
using System.Data.Common;
-using System.Data.SqlClient;
using System.Threading;
using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
using StackExchange.Profiling;
using StackExchange.Profiling.Data;
diff --git a/src/Opserver.Core/Opserver.Core.csproj b/src/Opserver.Core/Opserver.Core.csproj
index b16a9181..9e53af34 100644
--- a/src/Opserver.Core/Opserver.Core.csproj
+++ b/src/Opserver.Core/Opserver.Core.csproj
@@ -7,30 +7,26 @@
embedded
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
diff --git a/src/Opserver.Web/Opserver.Web.csproj b/src/Opserver.Web/Opserver.Web.csproj
index d69dc84d..7c3450e5 100644
--- a/src/Opserver.Web/Opserver.Web.csproj
+++ b/src/Opserver.Web/Opserver.Web.csproj
@@ -6,13 +6,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -23,8 +22,4 @@
-
-
-
-
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 55991240..7a356e0b 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -5,8 +5,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/tests/Opserver.Tests/Opserver.Tests.csproj b/tests/Opserver.Tests/Opserver.Tests.csproj
index 5cb796eb..08b25e45 100644
--- a/tests/Opserver.Tests/Opserver.Tests.csproj
+++ b/tests/Opserver.Tests/Opserver.Tests.csproj
@@ -6,15 +6,8 @@
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
+
+
\ No newline at end of file