Browse Source

Basic setup so tests can be run

Mordechai Zuber 9 years ago
parent
commit
5190a877e1

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/DispatcherHelpers.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-#if DOTNET5_1
+#if DOTNET5_1 || DNX51
 using System.Threading;
 #else
 using System.Windows.Threading;

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConcurrencyTest.cs

@@ -9,7 +9,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Threading;
-#if NET45
+#if NET45 || DNX451
 using System.Windows.Threading;
 #endif
 using Microsoft.Reactive.Testing;

+ 10 - 5
Rx.NET/Source/Tests.System.Reactive/project.json

@@ -17,12 +17,17 @@
     "Microsoft.Reactive.Testing": { "target": "project" },
     "System.Reactive.Experimental": { "target": "project" },
     "System.Reactive.Providers": { "target": "project" }, 
-    "System.Reactive.Observable.Aliases": {"target": "project"}, 
-    "xunit": "2.1.0"
+    "System.Reactive.Observable.Aliases": {"target": "project"},
+    "xunit": "2.1.0",
+    "xunit.runner.dnx": "2.1.0-rc1-build204",
+    "xunit.runner.visualstudio": "2.1.0"
   },
-  
+  "commands": {
+    "test": "xunit.runner.dnx"
+  },
+
   "frameworks": {
-    "net45": {
+    "dnx451": {
       "compilationOptions": {
         "define": [
             "NO_EVENTARGS_CONSTRAINT",
@@ -51,7 +56,7 @@
         "System.Threading.Tasks": "4.0.0.0"
       }
     },
-    "dotnet5.1": {
+    "dnx51": {
       "compilationOptions": {
         "define": [
             "NO_EVENTARGS_CONSTRAINT",