diff --git a/appveyor.yml b/appveyor.yml
index b8a2ddf..4156925 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,16 +2,16 @@ version: '{build}'
 pull_requests:
   do_not_increment_build_number: true
 init:
-- ps: (new-object net.webclient).DownloadFile('https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-dev-win-x64.latest.exe', "c:/dotnet-install.exe")
-- ps: Start-Process c:\dotnet-install.exe -ArgumentList "/install","/quiet" -Wait
+- ps: (new-object net.webclient).DownloadFile('https://dot.net/v1/dotnet-install.ps1', "C:/dotnet-install.ps1")
+- ps: C:/dotnet-install.ps1 -Channel 2.0
 nuget:
   disable_publish_on_pr: true
 build_script:
 - ps: $psversiontable
 - ps: dotnet --version
-- ps: dotnet restore
-- ps: dotnet build **\project.json
-- ps: dotnet pack $pwd\src\Microsoft.Windows.ComputeVirtualization -o $pwd\bin --version-suffix $env:APPVEYOR_BUILD_VERSION 
+- ps: dotnet restore --no-cache
+- ps: dotnet build
+- ps: dotnet pack src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.csproj -c Release -o $pwd/bin --version-suffix $env:APPVEYOR_BUILD_VERSION 
 test: off
 artifacts:
 - path: bin/*.nupkg
diff --git a/dotnet-computevirtualization.sln b/dotnet-computevirtualization.sln
new file mode 100644
index 0000000..d2ad8d7
--- /dev/null
+++ b/dotnet-computevirtualization.sln
@@ -0,0 +1,88 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7091057-0259-4DDF-A500-97DA750CB638}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Windows.ComputeVirtualization", "src\Microsoft.Windows.ComputeVirtualization\Microsoft.Windows.ComputeVirtualization.csproj", "{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8F8EAF52-42E0-473B-8967-9D170744CF53}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Windows.ComputeVirtualization.Tests", "test\Microsoft.Windows.ComputeVirtualization.Tests\Microsoft.Windows.ComputeVirtualization.Tests.csproj", "{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EA85BE47-9F5B-478A-8BA8-E89AEE32AE88}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContainerMount", "samples\ContainerMount\ContainerMount.csproj", "{6E638718-97F5-485E-B5A6-F83D651ED6C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContainerRun", "samples\ContainerRun\ContainerRun.csproj", "{75AF02BC-0DA5-4457-89B6-7022A5FE721A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Debug|x64.ActiveCfg = Debug|x64
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Debug|x64.Build.0 = Debug|x64
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Debug|x86.ActiveCfg = Debug|x86
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Debug|x86.Build.0 = Debug|x86
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Release|x64.ActiveCfg = Release|x64
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Release|x64.Build.0 = Release|x64
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Release|x86.ActiveCfg = Release|x86
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF}.Release|x86.Build.0 = Release|x86
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Debug|x64.ActiveCfg = Debug|x64
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Debug|x64.Build.0 = Debug|x64
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Debug|x86.ActiveCfg = Debug|x86
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Debug|x86.Build.0 = Debug|x86
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Release|x64.ActiveCfg = Release|x64
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Release|x64.Build.0 = Release|x64
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Release|x86.ActiveCfg = Release|x86
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29}.Release|x86.Build.0 = Release|x86
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Debug|x64.ActiveCfg = Debug|x64
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Debug|x64.Build.0 = Debug|x64
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Debug|x86.ActiveCfg = Debug|x86
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Debug|x86.Build.0 = Debug|x86
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Release|x64.ActiveCfg = Release|x64
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Release|x64.Build.0 = Release|x64
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Release|x86.ActiveCfg = Release|x86
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1}.Release|x86.Build.0 = Release|x86
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Debug|x64.ActiveCfg = Debug|x64
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Debug|x64.Build.0 = Debug|x64
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Debug|x86.ActiveCfg = Debug|x86
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Debug|x86.Build.0 = Debug|x86
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Release|x64.ActiveCfg = Release|x64
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Release|x64.Build.0 = Release|x64
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Release|x86.ActiveCfg = Release|x86
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{51D0CFD4-3148-4B14-8A77-00E13BB98ABF} = {D7091057-0259-4DDF-A500-97DA750CB638}
+		{D6284332-CD4A-49C9-82EE-B78F6CCB6C29} = {8F8EAF52-42E0-473B-8967-9D170744CF53}
+		{6E638718-97F5-485E-B5A6-F83D651ED6C1} = {EA85BE47-9F5B-478A-8BA8-E89AEE32AE88}
+		{75AF02BC-0DA5-4457-89B6-7022A5FE721A} = {EA85BE47-9F5B-478A-8BA8-E89AEE32AE88}
+	EndGlobalSection
+EndGlobal
diff --git a/global.json b/global.json
deleted file mode 100644
index ee35324..0000000
--- a/global.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "projects": [
-    "src",
-    "samples",
-    "test"
-  ],
-  "sdk": {
-    "version": "1.0.0"
-  }
-}
\ No newline at end of file
diff --git a/samples/ContainerMount/ContainerMount.csproj b/samples/ContainerMount/ContainerMount.csproj
new file mode 100644
index 0000000..cd1a069
--- /dev/null
+++ b/samples/ContainerMount/ContainerMount.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ContainerMount Sample</Description>
+    <TargetFramework>net46</TargetFramework>
+    <AssemblyName>ContainerMount</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>ContainerMount</PackageId>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <ProjectReference Include="..\..\src\Microsoft.Windows.ComputeVirtualization\Microsoft.Windows.ComputeVirtualization.csproj" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ContainerMount/ContainerMount.xproj b/samples/ContainerMount/ContainerMount.xproj
deleted file mode 100644
index 2dfd288..0000000
--- a/samples/ContainerMount/ContainerMount.xproj
+++ /dev/null
@@ -1,21 +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)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a5f1cef8-0f41-4b58-ac00-a9c13c3e9834</ProjectGuid>
-    <RootNamespace>ContainerMount</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/samples/ContainerMount/project.json b/samples/ContainerMount/project.json
deleted file mode 100644
index f833b4f..0000000
--- a/samples/ContainerMount/project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "description": "ContainerMount Sample",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-  "frameworks": {
-    "net46": {
-      "dependencies": {
-        "Microsoft.Windows.ComputeVirtualization": "0.1.0-*"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/samples/ContainerRun/ContainerRun.csproj b/samples/ContainerRun/ContainerRun.csproj
new file mode 100644
index 0000000..ba92fb2
--- /dev/null
+++ b/samples/ContainerRun/ContainerRun.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ContainerRun Sample</Description>
+    <TargetFramework>net46</TargetFramework>
+    <AssemblyName>ContainerRun</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>ContainerRun</PackageId>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <ProjectReference Include="..\..\src\Microsoft.Windows.ComputeVirtualization\Microsoft.Windows.ComputeVirtualization.csproj" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ContainerRun/ContainerRun.xproj b/samples/ContainerRun/ContainerRun.xproj
deleted file mode 100644
index 885c750..0000000
--- a/samples/ContainerRun/ContainerRun.xproj
+++ /dev/null
@@ -1,21 +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)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>51f92488-50fd-47fc-9ed0-8a9a8bdf639f</ProjectGuid>
-    <RootNamespace>ContainerRun</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/samples/ContainerRun/project.json b/samples/ContainerRun/project.json
deleted file mode 100644
index b1ce29b..0000000
--- a/samples/ContainerRun/project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "description": "ContainerRun Sample",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-  "frameworks": {
-    "net46": {
-      "dependencies": {
-        "Microsoft.Windows.ComputeVirtualization": "0.1.0-*"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.csproj b/src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.csproj
new file mode 100644
index 0000000..b844809
--- /dev/null
+++ b/src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Simple class library to interface with Windows host compute service.</Description>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <VersionPrefix>0.1.0-alpha5</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <DebugType>portable</DebugType>
+    <AssemblyName>Microsoft.Windows.ComputeVirtualization</AssemblyName>
+    <PackageId>Microsoft.Windows.ComputeVirtualization</PackageId>
+    <PackageProjectUrl>https://github.com/Microsoft/dotnet-computevirtualization/</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet-computevirtualization/master/LICENSE</PackageLicenseUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
+    <PackageReference Include="System.Runtime.Serialization.Json" Version="4.0.2" />
+    <PackageReference Include="Microsoft.Win32.Primitives" Version="4.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.xproj b/src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.xproj
deleted file mode 100644
index 643dd09..0000000
--- a/src/Microsoft.Windows.ComputeVirtualization/Microsoft.Windows.ComputeVirtualization.xproj
+++ /dev/null
@@ -1,21 +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)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f7de3645-cbcf-4421-a17b-efb9d99884ad</ProjectGuid>
-    <RootNamespace>Microsoft.Windows.ComputeVirtualization</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.Windows.ComputeVirtualization/project.json b/src/Microsoft.Windows.ComputeVirtualization/project.json
deleted file mode 100644
index fd249f5..0000000
--- a/src/Microsoft.Windows.ComputeVirtualization/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "version": "0.1.0-alpha5-*",
-  "description": "Simple class library to interface with Windows host compute service.",
-  "copyright": "© Microsoft Corporation. All rights reserved.",
-  "authors": [
-    "Microsoft"
-  ],
-  "buildOptions": {
-    "debugType": "portable"
-  },
-  "packOptions": {
-    "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet-computevirtualization/master/LICENSE",
-    "projectUrl": "https://github.com/Microsoft/dotnet-computevirtualization/",
-    "requireLicenseAcceptance": false
-  },
-  "frameworks": {
-    "net46": {
-      "frameworkAssemblies": {
-        "System.Xml": "",
-        "System.Runtime": "",
-        "System.Runtime.Serialization": ""
-      }
-    },
-    "netstandard1.3": {
-      "dependencies": {
-        "NETStandard.Library": "1.6.0",
-        "System.Runtime.Serialization.Primitives": "4.1.1",
-        "System.Runtime.Serialization.Json": "4.0.2",
-        "Microsoft.Win32.Primitives": "4.0.1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/Microsoft.Windows.ComputeVirtualization.Tests/Microsoft.Windows.ComputeVirtualization.Tests.csproj b/test/Microsoft.Windows.ComputeVirtualization.Tests/Microsoft.Windows.ComputeVirtualization.Tests.csproj
new file mode 100644
index 0000000..75669d0
--- /dev/null
+++ b/test/Microsoft.Windows.ComputeVirtualization.Tests/Microsoft.Windows.ComputeVirtualization.Tests.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>Microsoft.Windows.ComputeVirtualization.Tests</AssemblyName>
+    <PackageId>Microsoft.Windows.ComputeVirtualization.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeIdentifiers>win81-x64</RuntimeIdentifiers>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.Windows.ComputeVirtualization\Microsoft.Windows.ComputeVirtualization.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
+    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <PackageReference Include="System.Runtime" Version="4.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Microsoft.Windows.ComputeVirtualization.Tests/project.json b/test/Microsoft.Windows.ComputeVirtualization.Tests/project.json
deleted file mode 100644
index c32cac7..0000000
--- a/test/Microsoft.Windows.ComputeVirtualization.Tests/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "testRunner": "xunit",
-  "buildOptions": {
-    "copyToOutput": {
-      "include": [
-        "xunit.runner.json"
-      ]
-    },
-    "debugType": "portable"
-  },
-  "runtimes": {
-    "win81-x64": {}
-  },
-  "dependencies": {
-    "xunit": "2.2.0-beta2-build3300",
-    "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "Microsoft.Windows.ComputeVirtualization": "0.1.0-*"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win8"
-      ],
-      "dependencies": {
-        "System.Runtime": "4.1.0"
-      }
-    }
-  }
-}
\ No newline at end of file