diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj
deleted file mode 100644
index e0c52aa829495..0000000000000
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj
+++ /dev/null
@@ -1,23 +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>729d041a-180e-47a4-ab77-6c7ca72f40c3</ProjectGuid>
-    <RootNamespace>AutoRest.Generator.Azure.CSharp.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
index 91409339218b2..15f96670de661 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
@@ -5,23 +5,20 @@
   "tags": [ "Microsoft AutoRest ClientRuntime REST" ],
   "projectUrl": "https://github.com/Azure/AutoRest",
   "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE",
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
+
+  "testRunner": "xunit",
   "frameworks": {
-    "dnxcore50": {
+    "netcoreapp1.0": {
       "compilationOptions": { "define": [ "PORTABLE" ] },
-      "dependencies": {
-        "xunit.runner.dnx": "2.1.0-rc1-build204",
-        "Microsoft.Rest.ClientRuntime": "",
-        "Microsoft.Rest.ClientRuntime.Azure": "",
-        "CSharp.Tests": "",
-        "xunit": "2.1.0"
-      }
+      "imports": ["dnxcore50", "portable-net45+win8"]
     }
   },
   "exclude": [ "CSharpAzureCodeNamingFrameworkTests.*" ],
   "dependencies": {
-    "Microsoft.Framework.Logging.Console": "1.0.0-beta8"
+    "Microsoft.NETCore.App": "1.0.0-rc2-*",
+    "CSharp.Tests": "1.5.0",
+    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.0,5.0.0)",
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-dev-140469-38"
   }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj
deleted file mode 100644
index 074eec617457c..0000000000000
--- a/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj
+++ /dev/null
@@ -1,31 +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>{7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}</ProjectGuid>
-    <RootNamespace>AutoRest.Generator.CSharp.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\AutoRest.Core\AutoRest.Core.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/project.json b/AutoRest/Generators/CSharp/CSharp.Tests/project.json
index acd7650d15c48..ac694361ef996 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/project.json
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/project.json
@@ -5,28 +5,22 @@
   "tags": [ "Microsoft AutoRest ClientRuntime REST" ],
   "projectUrl": "https://github.com/Azure/AutoRest",
   "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE",
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
+
+  "testRunner": "xunit",
   "frameworks": {
-    "dnxcore50": {
+    "netcoreapp1.0": {
       "compilationOptions": { "define": [ "PORTABLE" ] },
-      "dependencies": {
-        "System.Diagnostics.Tools": "4.0.0",
-        "System.Net.Http": "4.0.0",
-        "System.Threading.Tasks": "4.0.10",
-        "System.Xml.ReaderWriter": "4.0.10",
-        "Microsoft.CSharp": "4.0.0",
-        "xunit.runner.dnx": "2.1.0-rc1-build204"
-      }
+      "imports": ["dnxcore50", "portable-net45+win8"]
     }
   },
   "exclude": [ "CSharpCodeNamingFrameworkTests.*" ],
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "",
-    "System.Runtime.Serialization.Primitives": "4.0.10",
-    "System.Runtime.Loader": "4.0.0-beta-23409",
+    "Microsoft.NETCore.App": "1.0.0-rc2-*",
+    "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0)",
+    "Microsoft.Extensions.Logging": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Filter": "1.0.0-*",
     "xunit": "2.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final"
+    "dotnet-test-xunit": "1.0.0-dev-140469-38"
   }
 }
diff --git a/AutoRest/Generators/CSharp/global.json b/AutoRest/Generators/CSharp/global.json
new file mode 100644
index 0000000000000..db07c2d969bcd
--- /dev/null
+++ b/AutoRest/Generators/CSharp/global.json
@@ -0,0 +1,3 @@
+{
+  "projects": [ "../../../ClientRuntimes/CSharp/", "Azure.CSharp.Tests", "CSharp.Tests" ]
+}
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/NuGet.Config b/NuGet.Config
similarity index 100%
rename from ClientRuntimes/CSharp/NuGet.Config
rename to NuGet.Config