Fixed CSharp Generators test project

jianghaolu · Apr 20, 2016 · 62dfbcc · 62dfbcc
1 parent 74692a0
commit 62dfbcc
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 82 deletions.
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
diff --git 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
diff --git 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
@@ -0,0 +1,3 @@
+{
+  "projects": [ "../../../ClientRuntimes/CSharp/", "Azure.CSharp.Tests", "CSharp.Tests" ]
+}
diff --git a/ClientRuntimes/CSharp/NuGet.Config → NuGet.Config b/ClientRuntimes/CSharp/NuGet.Config → NuGet.Config