diff --git a/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj b/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj
new file mode 100644
index 000000000..b145d3ffe
--- /dev/null
+++ b/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsPackable>true</IsPackable>
+    <PackageId>Docker.DotNet.BasicAuth</PackageId>
+    <Description>Docker.DotNet.BasicAuth is a library that allows you to use basic authentication with a remote Docker engine programmatically in your .NET applications.</Description>
+    <TargetFrameworks>netstandard1.6;net46;net45</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyName>Docker.DotNet.BasicAuth</AssemblyName>
+    <PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
+    <PackageLicenseUrl>https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
+    <Copyright>Copyright Microsoft 2015</Copyright>
+    <PackageTags>Docker Container C# .NET</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet.BasicAuth</RepositoryUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(version)' != ''">
+    <VersionPrefix>$(version)</VersionPrefix>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Docker.DotNet\Docker.DotNet.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.xproj b/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.xproj
deleted file mode 100644
index caf0a2c75..000000000
--- a/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.xproj
+++ /dev/null
@@ -1,22 +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>ec789466-95c7-4fab-9575-18b2ff55abd3</ProjectGuid>
-    <RootNamespace>Docker.DotNet.BasicAuth</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/Docker.DotNet.BasicAuth/project.json b/Docker.DotNet.BasicAuth/project.json
deleted file mode 100644
index 904cebb60..000000000
--- a/Docker.DotNet.BasicAuth/project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": "2.124.3",
-  "description": "Docker.DotNet.BasicAuth is a library that allows you to use basic authentication with a remote Docker engine programmatically in your .NET applications.",
-  "packOptions": {
-    "licenseUrl": "https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet.BasicAuth"
-    },
-    "iconUrl": "https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74"
-  },
-  "dependencies": {
-    "Docker.DotNet": "2.124.3"
-  },
-  "frameworks": {
-    "netstandard1.6": {},
-    "netstandard1.3": {},
-    "net46": {
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Security": ""
-      }
-    },
-    "net45": {}
-  }
-}
\ No newline at end of file
diff --git a/Docker.DotNet.X509/Docker.DotNet.X509.csproj b/Docker.DotNet.X509/Docker.DotNet.X509.csproj
new file mode 100644
index 000000000..48a2f1d71
--- /dev/null
+++ b/Docker.DotNet.X509/Docker.DotNet.X509.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsPackable>true</IsPackable>
+    <PackageId>Docker.DotNet.X509</PackageId>
+    <Description>Docker.DotNet.X509 is a library that allows you to use certificate authentication with a remote Docker engine programmatically in your .NET applications.</Description>
+    <TargetFrameworks>netstandard1.6;net46;net45</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyName>Docker.DotNet.X509</AssemblyName>
+    <PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
+    <PackageLicenseUrl>https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
+    <Copyright>Copyright Microsoft 2015</Copyright>
+    <PackageTags>Docker Container C# .NET</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet</RepositoryUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(version)' != ''">
+    <VersionPrefix>$(version)</VersionPrefix>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="System.Security.Cryptography.Csp" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Docker.DotNet\Docker.DotNet.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Docker.DotNet.X509/Docker.DotNet.X509.xproj b/Docker.DotNet.X509/Docker.DotNet.X509.xproj
deleted file mode 100644
index 9d0cbc110..000000000
--- a/Docker.DotNet.X509/Docker.DotNet.X509.xproj
+++ /dev/null
@@ -1,22 +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>3eb8c108-ead7-4a58-aacf-33d9149f4708</ProjectGuid>
-    <RootNamespace>Docker.DotNet.X509</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/Docker.DotNet.X509/project.json b/Docker.DotNet.X509/project.json
deleted file mode 100644
index 22a2243a6..000000000
--- a/Docker.DotNet.X509/project.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "version": "2.124.3",
-    "description": "Docker.DotNet.X509 is a library that allows you to use certificate authentication with a remote Docker engine programmatically in your .NET applications.",
-    "packOptions": {
-        "licenseUrl": "https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE",
-        "repository": {
-            "type": "git",
-            "url": "https://github.com/Microsoft/Docker.DotNet/tree/master/Docker.DotNet.X509"
-        },
-        "iconUrl": "https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74"
-    },
-    "dependencies": {
-        "Docker.DotNet": "2.124.3"
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "dependencies": {
-                "System.Security.Cryptography.X509Certificates": "4.1.0",
-                "System.Security.Cryptography.Csp": "4.0.0",
-                "System.Security.SecureString": "4.0.0"
-            }
-        },
-        "netstandard1.3": {
-            "dependencies": {
-                "System.Security.Cryptography.X509Certificates": "4.1.0",
-                "System.Security.Cryptography.Csp": "4.0.0",
-                "System.Security.SecureString": "4.0.0"
-            }
-        },
-        "net46": {
-            "frameworkAssemblies": {
-                "System.Net.Http": "",
-                "System.Net.Http.WebRequest": ""
-            }
-        },
-        "net45": {
-            "frameworkAssemblies": {
-                "System.Net.Http": "",
-                "System.Net.Http.WebRequest": ""
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Docker.DotNet/Docker.DotNet.csproj b/Docker.DotNet/Docker.DotNet.csproj
new file mode 100644
index 000000000..0a4bc4038
--- /dev/null
+++ b/Docker.DotNet/Docker.DotNet.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsPackable>true</IsPackable>
+    <PackageId>Docker.DotNet</PackageId>
+    <Description>Docker.DotNet is a library that allows you to interact with the Docker Remote API programmatically with fully asynchronous, non-blocking and object-oriented code in your .NET applications.</Description>
+    <TargetFrameworks>net45;net46;netstandard1.6</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyName>Docker.DotNet</AssemblyName>
+    <PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
+    <PackageLicenseUrl>https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE</PackageLicenseUrl>
+    <Copyright>Copyright Microsoft 2015</Copyright>
+    <PackageTags>Docker Container C# .NET</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Microsoft/Docker.DotNet</RepositoryUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(version)' != ''">
+    <VersionPrefix>$(version)</VersionPrefix>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="System.Buffers" Version="4.3.0" />
+    <PackageReference Include="System.IO.Pipes" Version="4.3.0" />
+    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+    <PackageReference Include="System.Net.Requests" Version="4.3.0" />
+    <PackageReference Include="System.Net.Security" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="System.Threading.Overlapped" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <PackageReference Include="System.Buffers" Version="4.3.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.0" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Docker.DotNet/Docker.DotNet.xproj b/Docker.DotNet/Docker.DotNet.xproj
deleted file mode 100644
index 5b3da0bc2..000000000
--- a/Docker.DotNet/Docker.DotNet.xproj
+++ /dev/null
@@ -1,22 +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>a9c3e587-ddec-494b-96e2-bfb4fc34ec74</ProjectGuid>
-    <RootNamespace>Docker.DotNet</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/Docker.DotNet/project.json b/Docker.DotNet/project.json
deleted file mode 100644
index 4605b5729..000000000
--- a/Docker.DotNet/project.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "version": "2.124.3",
-  "description": "Docker.DotNet is a library that allows you to interact with the Docker Remote API programmatically with fully asynchronous, non-blocking and object-oriented code in your .NET applications.",
-  "packOptions": {
-    "licenseUrl": "https://github.com/Microsoft/Docker.DotNet/blob/master/LICENSE",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/Microsoft/Docker.DotNet"
-    },
-    "iconUrl": "https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74"
-  },
-  "dependencies": {
-    "Newtonsoft.Json": "9.0.1"
-  },
-  "frameworks": {
-    "netstandard1.6": {
-      "dependencies": {
-        "NETStandard.Library": "1.6.0",
-        "System.Buffers": "4.0.0",
-        "System.IO.Pipes": "4.0.0",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Requests": "4.0.11",
-        "System.Net.Security": "4.0.0",
-        "System.Reflection.Extensions": "4.0.1",
-        "System.Reflection.TypeExtensions": "4.1.0",
-        "System.Threading.Overlapped": "4.0.1"
-      }
-    },
-    "netstandard1.3": {
-      "dependencies": {
-        "NETStandard.Library": "1.6.0",
-        "System.Buffers": "4.0.0",
-        "System.IO.Pipes": "4.0.0",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Requests": "4.0.11",
-        "System.Net.Security": "4.0.0",
-        "System.Reflection.Extensions": "4.0.1",
-        "System.Reflection.TypeExtensions": "4.1.0",
-        "System.Threading.Overlapped": "4.0.1"
-      }
-    },
-    "net46": {
-      "dependencies": {
-        "System.Buffers": "4.0.0",
-        "System.Runtime": "4.0.20"
-      },
-      "frameworkAssemblies": {
-        "System.Net.Http": "",
-        "System.Runtime.Serialization": ""
-      }
-    },
-    "net45": {
-      "frameworkAssemblies": {
-        "System.Net.Http": "",
-        "System.Runtime.Serialization": ""
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/global.json b/global.json
deleted file mode 100644
index 259bba85a..000000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "projects": ["."],
-  "sdk": {
-    "version": "1.0.0-preview2-003121"
-  }
-}
\ No newline at end of file