diff --git a/Moq.Dapper.sln b/Moq.Dapper.sln
index 12688b5..94a6283 100644
--- a/Moq.Dapper.sln
+++ b/Moq.Dapper.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Dapper.Test", "Moq.Dapper.Test\Moq.Dapper.Test.csproj", "{3AF05DC6-580D-410B-9AA4-E0DAB3048992}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Dapper", "Moq.Dapper\Moq.Dapper.csproj", "{7430287C-81CF-4BB0-889A-D73AAA7E8313}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Dapper", "Moq.Dapper\Moq.Dapper.csproj", "{7430287C-81CF-4BB0-889A-D73AAA7E8313}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.DataContext", "Moq.DataContext\Moq.DataContext.csproj", "{EF1DFF93-6C0B-4ADB-891A-C2C6A1E17AB0}"
 EndProject
@@ -31,4 +31,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {33BDBCCA-3DEC-419D-B0CC-CFBAA836A4DA}
+	EndGlobalSection
 EndGlobal
diff --git a/Moq.Dapper/Moq.Dapper.csproj b/Moq.Dapper/Moq.Dapper.csproj
index c1edae6..a1d8a89 100644
--- a/Moq.Dapper/Moq.Dapper.csproj
+++ b/Moq.Dapper/Moq.Dapper.csproj
@@ -1,59 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7430287C-81CF-4BB0-889A-D73AAA7E8313}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Moq.Dapper</RootNamespace>
-    <AssemblyName>Moq.Dapper</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>1.0.0.4</Version>
+    <PackageId>Moq.Dapper</PackageId>
+    <Description>Moq extensions for Dapper methods.</Description>
+    <Copyright>Copyright 2017</Copyright>
+    <FileVersion>1.0.0.0</FileVersion>
+    <Company>Stefano d'Antonio</Company>
+    <Authors>Stefano d'Antonio</Authors>
+    <Product>Moq.Dapper</Product>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/UnoSD/Moq.Dapper</PackageProjectUrl>
+    <RepositoryUrl></RepositoryUrl>
+    <PackageTags>Moq Dapper Test</PackageTags>
+    <PackageReleaseNotes>First release.</PackageReleaseNotes>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapper.1.50.2\lib\net451\Dapper.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq, Version=4.7.1.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.7.1\lib\net45\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DbConnectionInterfaceMockExtensions.cs" />
-    <Compile Include="DbConnectionMockExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Dapper" Version="1.50.2" />
+    <PackageReference Include="Moq" Version="4.7.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Moq.Dapper/Moq.Dapper.nuspec b/Moq.Dapper/Moq.Dapper.nuspec
deleted file mode 100644
index d44707e..0000000
--- a/Moq.Dapper/Moq.Dapper.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>Stefano d'Antonio</authors>
-    <owners>Stefano d'Antonio</owners>
-    <licenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html</licenseUrl>
-    <projectUrl>https://github.com/UnoSD/Moq.Dapper</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Moq extensions for Dapper methods.</description>
-    <releaseNotes>First release.</releaseNotes>
-    <copyright>Copyright 2017</copyright>
-    <tags>Moq Dapper Test</tags>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/Moq.Dapper/Properties/AssemblyInfo.cs b/Moq.Dapper/Properties/AssemblyInfo.cs
deleted file mode 100644
index 81f62ff..0000000
--- a/Moq.Dapper/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Moq.Dapper")]
-[assembly: AssemblyDescription("Moq extensions for Dapper methods.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Moq.Dapper")]
-[assembly: AssemblyCopyright("Copyright © Stefano d'Antonio 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("3af05dc6-580d-410b-9aa4-e0dab3048992")]
-
-[assembly: AssemblyVersion("1.0.0.3")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Moq.Dapper/packages.config b/Moq.Dapper/packages.config
deleted file mode 100644
index 7ccdb57..0000000
--- a/Moq.Dapper/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Castle.Core" version="4.0.0" targetFramework="net462" />
-  <package id="Dapper" version="1.50.2" targetFramework="net462" />
-  <package id="Moq" version="4.7.1" targetFramework="net462" />
-  <package id="NuGet.CommandLine" version="3.5.0" targetFramework="net461" developmentDependency="true" />
-</packages>
\ No newline at end of file