diff --git a/Sider.sln b/Sider.sln
index eaec3bb..2df7572 100644
--- a/Sider.sln
+++ b/Sider.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2016
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{0CE30014-2C41-4378-8208-0704781C0CA9}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGES.markdown = CHANGES.markdown
@@ -85,19 +87,24 @@ Global
 		{65A68D5D-9C38-4AF6-A8D9-4D789735BC23}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{65A68D5D-9C38-4AF6-A8D9-4D789735BC23}.Release|x86.ActiveCfg = Release|x86
 		{65A68D5D-9C38-4AF6-A8D9-4D789735BC23}.Release|x86.Build.0 = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|x86.ActiveCfg = Debug|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|x86.Build.0 = Debug|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|Any CPU.ActiveCfg = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|Mixed Platforms.ActiveCfg = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|x86.ActiveCfg = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|x86.Build.0 = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|Any CPU.ActiveCfg = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|x86.ActiveCfg = Release|x86
-		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|x86.Build.0 = Release|x86
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Debug|x86.Build.0 = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|Any CPU.Build.0 = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|x86.ActiveCfg = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Package|x86.Build.0 = Debug|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB628BC0-81E1-4676-AEE2-306FC686BBCB}.Release|x86.Build.0 = Release|Any CPU
 		{C34EA0A3-4FF8-4446-ADA4-C18AB979AF33}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{C34EA0A3-4FF8-4446-ADA4-C18AB979AF33}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{C34EA0A3-4FF8-4446-ADA4-C18AB979AF33}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -129,11 +136,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{478B5DD3-825D-4F88-8DC8-0B671DA048BD} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
 		{F0E53E17-3112-4B16-8717-3D5D220C4FD9} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
+		{478B5DD3-825D-4F88-8DC8-0B671DA048BD} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
 		{65A68D5D-9C38-4AF6-A8D9-4D789735BC23} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
 		{CB628BC0-81E1-4676-AEE2-306FC686BBCB} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
 		{C34EA0A3-4FF8-4446-ADA4-C18AB979AF33} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
 		{2BFB74C2-DBD4-4F30-A672-71161D4BBCC6} = {E6D78299-6A6B-4815-AD64-1F6A64FD30EE}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {727B6043-1D88-4A70-992C-7E2841FD6596}
+	EndGlobalSection
 EndGlobal
diff --git a/package.bat b/package.bat
index 7b15816..79c4a86 100644
--- a/package.bat
+++ b/package.bat
@@ -3,7 +3,8 @@
 
 echo Building NuGet package...
 mkdir build\packages
-.\.nuget\NuGet.exe pack .\src\Sider\Sider.csproj -build -o build\packages -sym -verbosity detailed -exclude Sider.GUI -exclude Sider.Benchmark
+
+dotnet pack .\src\Sider\Sider.csproj -o ..\..\build\packages\ --include-symbols -v d -c Release
 
 echo Packages built:
 dir build\packages /b/s
diff --git a/src/Sider/Sider.csproj b/src/Sider/Sider.csproj
index ca4db66..332cedd 100644
--- a/src/Sider/Sider.csproj
+++ b/src/Sider/Sider.csproj
@@ -1,109 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F0E53E17-3112-4B16-8717-3D5D220C4FD9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Sider</RootNamespace>
-    <AssemblyName>Sider</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
+    <PackageId>Sider</PackageId>
+    <Title>Sider</Title>
+    <Authors>Chakrit Wichian &lt;service@chakrit.net&gt; (http://chakrit.net/)</Authors>
+    <Owners>Chakrit Wichian &lt;service@chakrit.net&gt; (http://chakrit.net/)</Owners>
+    <Description>SIDER : REDIS bindings for C#/.NET 4.0 -- Redis client that sticks to the metal. Minimal, lightweight, easy to use, no fancy APIs, no gigantic class hierarchies. No ORM madness. Assumes knowledge of how Redis works. -- Sider works with Redis 2.2+.</Description>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Compile Include="..\..\SiderAssemblyInfo.cs" Link="Properties\SiderAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\SiderAssemblyInfo.cs">
-      <Link>Properties\SiderAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Aggregate.cs" />
-    <Compile Include="Exceptions.cs" />
-    <Compile Include="Executors\ExecutorBase.cs" />
-    <Compile Include="Executors\IExecutor.cs" />
-    <Compile Include="Executors\ImmediateExecutor.cs" />
-    <Compile Include="Executors\IocpExecutor.cs" />
-    <Compile Include="Executors\MonitorExecutor.cs" />
-    <Compile Include="Executors\PipelinedExecutor.cs" />
-    <Compile Include="Executors\PubSubExecutor.cs" />
-    <Compile Include="Executors\TransactedExecutor.cs" />
-    <Compile Include="Invocation.cs" />
-    <Compile Include="LimitingStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MessageType.cs" />
-    <Compile Include="Observable.cs" />
-    <Compile Include="ProtocolReader.cs" />
-    <Compile Include="ProtocolEncoder.cs" />
-    <Compile Include="ProtocolWriter.cs" />
-    <Compile Include="RedisClientBase.cs" />
-    <Compile Include="RedisVersionAttribute.cs" />
-    <Compile Include="Serialization\ObjectSerializer.cs" />
-    <Compile Include="Serialization\SerializerBase.cs" />
-    <Compile Include="SettingsWrapper.cs" />
-    <None Include="RedisClientPipeliningExtensions.tt">
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="RedisClientPipeliningExtensions.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>RedisClientPipeliningExtensions.cs</LastGenOutput>
     </None>
-    <Compile Include="Serialization\BufferSerializer.cs" />
-    <Compile Include="Serialization\ISerializer.cs" />
-    <Compile Include="RedisClientPipeliningExtensions.cs">
+    <None Update="RedisClientPipeliningExtensions.tt">
+      <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
+      <DependentUpon>RedisClientPipeliningExtensions.cs</DependentUpon>
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>RedisClientPipeliningExtensions.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="RedisClientPipeliningExtensions.cs">
       <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
       <DependentUpon>RedisClientPipeliningExtensions.tt</DependentUpon>
     </Compile>
-    <Compile Include="RedisSettings.cs" />
-    <Compile Include="RoundRobinPool.cs" />
-    <Compile Include="SAssert.cs" />
-    <Compile Include="IClientsPool.cs" />
-    <Compile Include="IRedisClient.cs" />
-    <Compile Include="RedisClient.API.cs" />
-    <Compile Include="RedisClient.cs" />
-    <Compile Include="RedisClient.IO.core.cs" />
-    <Compile Include="RedisReader.cs" />
-    <Compile Include="RedisType.cs" />
-    <Compile Include="RedisWriter.cs" />
-    <Compile Include="ResponseType.cs" />
-    <Compile Include="Serialization\Serializers.cs" />
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="Serialization\StringSerializer.cs" />
-    <Compile Include="Message.cs" />
-    <Compile Include="AutoActivatingPool.cs" />
-    <Compile Include="ThreadwisePool.cs" />
-    <Compile Include="Mode.cs" />
-    <Compile Include="TrackedThreadwisePool.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file