Get Rx.NET to build with tests

Rx.NET/Source/Microsoft.Reactive.Testing/project.json

@@ -58,12 +58,12 @@
                 ]
             },
             "dependencies": {
-                "System.Runtime": "4.1.0-rc2-23904"
+                "System.Runtime": "4.1.0-rc2-23811"
             }
             
         },
         "netstandard1.0": {
-            "imports": [ "dnxcore50", "portable-win8+net45" ],
+            "imports": [ "dotnet5.1", "dnxcore50", "portable-net45+win8" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -87,7 +87,7 @@
 
         },
         "netstandard1.3": {
-            "imports": [ "dnxcore50", "portable-win8+net45" ],
+            "imports": [ "dotnet5.4", "dnxcore50", "portable-net45+win8" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

Rx.NET/Source/System.Reactive.Core/project.json

@@ -84,15 +84,16 @@
                     "PLIB"
                 ]
             },
+            "imports": [ "dotnet5.1" ],
             "dependencies": {
-                "System.ComponentModel": "4.0.1-rc2-23904",
-                "System.Diagnostics.Contracts": "4.0.1-rc2-23904",
-                "System.Diagnostics.Debug": "4.0.11-rc2-23904",
-                "System.Dynamic.Runtime": "4.0.11-rc2-23904",
-                "System.Linq": "4.0.1-rc2-23904",
-                "System.Runtime": "4.1.0-rc2-23904",
-                "System.Runtime.Extensions": "4.1.0-rc2-23904",
-                "System.Threading": "4.0.11-rc2-23904"
+                "System.ComponentModel": "4.0.1-rc2-23811",
+                "System.Diagnostics.Contracts": "4.0.1-rc2-23811",
+                "System.Diagnostics.Debug": "4.0.11-rc2-23811",
+                "System.Dynamic.Runtime": "4.0.11-rc2-23811",
+                "System.Linq": "4.0.1-rc2-23811",
+                "System.Runtime": "4.1.0-rc2-23811",
+                "System.Runtime.Extensions": "4.1.0-rc2-23811",
+                "System.Threading": "4.0.11-rc2-23811"
             }
         },
         "netstandard1.3": {
@@ -113,14 +114,15 @@
                     "USE_TIMER_SELF_ROOT"
                 ]
             },
+            "imports": [ "dotnet5.4" ],
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.12-rc2-23904",
-                "System.ComponentModel": "4.0.1-rc2-23904",
-                "System.Linq": "4.0.1-rc2-23904",
-                "System.Threading": "4.0.11-rc2-23904",
-                "System.Threading.Thread": "4.0.0-rc2-23904",
-                "System.Threading.ThreadPool": "4.0.10-rc2-23904",
-                "System.Threading.Timer": "4.0.1-rc2-23904"
+                "System.Collections.Concurrent": "4.0.12-rc2-23811",
+                "System.ComponentModel": "4.0.1-rc2-23811",
+                "System.Linq": "4.0.1-rc2-23811",
+                "System.Threading": "4.0.11-rc2-23811",
+                "System.Threading.Thread": "4.0.0-rc2-23811",
+                "System.Threading.ThreadPool": "4.0.10-rc2-23811",
+                "System.Threading.Timer": "4.0.1-rc2-23811"
             }
         }
     }

Rx.NET/Source/System.Reactive.Experimental/project.json

@@ -68,6 +68,7 @@
             }
         },
         "netstandard1.0": {
+            "imports": [ "dotnet5.1" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -90,6 +91,7 @@
             }
         },
         "netstandard1.3": {
+            "imports": [ "dotnet5.4" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

Rx.NET/Source/System.Reactive.Interfaces/project.json

@@ -42,6 +42,7 @@
             }
         },
         "netstandard1.0": {
+            "imports": [ "dotnet5.1" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -61,12 +62,12 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.1-rc2-23904",
-                "System.Linq": "4.0.1-rc2-23904",
-                "System.Linq.Expressions": "4.0.11-rc2-23904",
-                "System.Resources.ResourceManager": "4.0.1-rc2-23904",
-                "System.Runtime": "4.1.0-rc2-23904",
-                "System.Threading": "4.0.11-rc2-23904"
+                "System.Diagnostics.Tools": "4.0.1-rc2-23811",
+                "System.Linq": "4.0.1-rc2-23811",
+                "System.Linq.Expressions": "4.0.11-rc2-23811",
+                "System.Resources.ResourceManager": "4.0.1-rc2-23811",
+                "System.Runtime": "4.1.0-rc2-23811",
+                "System.Threading": "4.0.11-rc2-23811"
             }
         }
     }

Rx.NET/Source/System.Reactive.Linq/project.json

@@ -53,7 +53,7 @@
                 ]
             }
         },
-        "net46": {
+        "net46": {           
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -91,10 +91,11 @@
                     "PLIB"
                 ]
             },
+            "imports": [ "dotnet5.1" ],
             "dependencies": {
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23904",
-                "System.Runtime": "4.1.0-rc2-23904",
-                "System.Runtime.Extensions": "4.1.0-rc2-23904"
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23811",
+                "System.Runtime": "4.1.0-rc2-23811",
+                "System.Runtime.Extensions": "4.1.0-rc2-23811"
             }
         },
         "netstandard1.3": {
@@ -115,10 +116,11 @@
                     "USE_TIMER_SELF_ROOT"
                 ]
             },
+            "imports": [ "dotnet5.4"],
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.12-rc2-23904",
-                "System.Reflection": "4.1.0-rc2-23904",
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23904"
+                "System.Collections.Concurrent": "4.0.12-rc2-23811",
+                "System.Reflection": "4.1.0-rc2-23811",
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23811"
             }
         }
     }

Rx.NET/Source/System.Reactive.Observable.Aliases/project.json

@@ -66,6 +66,7 @@
             }
         },
         "netstandard1.0": {
+            "imports": [ "dotnet5.1" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -88,6 +89,7 @@
             }
         },
         "netstandard1.3": {
+            "imports": [ "dotnet5.4" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

Rx.NET/Source/System.Reactive.PlatformServices/project.json

@@ -68,6 +68,7 @@
             }
         },
         "netstandard1.0": {
+            "imports": [ "dotnet5.1" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -90,6 +91,7 @@
             }
         },
         "netstandard1.3": {
+            "imports": [ "dotnet5.4" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -108,6 +110,7 @@
                 ]
             },
             "dependencies": {
+                "NETStandard.Library": "1.0.0-rc2-23811"
             }
         }
     }

Rx.NET/Source/System.Reactive.Providers/project.json

@@ -69,6 +69,7 @@
             }
         },
         "netstandard1.0": {
+            "imports": [ "dotnet5.1" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -88,11 +89,12 @@
                 ]
             },
             "dependencies": {
-                "System.Linq.Queryable": "4.0.1-rc2-23904",
-                "System.Reflection.Extensions": "4.0.1-rc2-23904"
+                "System.Linq.Queryable": "4.0.1-rc2-23811",
+                "System.Reflection.Extensions": "4.0.1-rc2-23811"
             }
         },
         "netstandard1.3": {
+            "imports": [ "dotnet5.4" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -111,7 +113,7 @@
                 ]
             },
             "dependencies": {
-                "System.Linq.Queryable": "4.0.1-rc2-23904"
+                "System.Linq.Queryable": "4.0.1-rc2-23811"
             }
         }
     }

Rx.NET/Source/System.Reactive.WindowsRuntime/project.json

@@ -41,8 +41,8 @@
                 "version": "1.0.1",
                 "type": "build"
             },
-            "System.Threading.Tasks": "4.0.11-rc2-23904",
-            "System.Runtime.WindowsRuntime": "4.0.11-rc2-23904"
+            "System.Threading.Tasks": "4.0.11-rc2-23811",
+            "System.Runtime.WindowsRuntime": "4.0.11-rc2-23811"
         }
 
     }

Rx.NET/Source/Tests.System.Reactive/Program.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ReactiveTests
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+
+        }
+    }
+}

Rx.NET/Source/Tests.System.Reactive/Tests.System.Reactive.xproj

@@ -14,5 +14,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

Rx.NET/Source/Tests.System.Reactive/project.json

@@ -9,7 +9,9 @@
     "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
     "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
     "requireLicenseAcceptance": true,
-
+    "compilationOptions": {
+        "emitEntryPoint": true
+    },
     "dependencies": {
         "System.Reactive.Interfaces": { "target": "project" },
         "System.Reactive.Linq": { "target": "project" },
@@ -19,11 +21,12 @@
         "System.Reactive.Providers": { "target": "project" },
         "System.Reactive.Observable.Aliases": { "target": "project" },
         "xunit": "2.1.0",
-        "NETStandard.Library": "1.0.0-rc2-23904"
+        "NETStandard.Library": "1.0.0-rc2-23811"
     },
     "testRunner": "xunit",
     "frameworks": {
-        "net461": {
+        "netstandardapp1.5": {
+            "imports": [ "dnxcore50", "portable-net45+win8" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -37,22 +40,16 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "USE_TIMER_SELF_ROOT",
-                    "DESKTOPCLR",
-                    "DESKTOPCLR46"
-                ]
+                    "PLIB",
+                    "USE_TIMER_SELF_ROOT"
+                ],
+                "debugType": "full"
             },
             "dependencies": {
-                "System.Reactive.Windows.Threading": { "target": "project" },
-                "System.Reactive.Windows.Forms": { "target": "project" },
-                "System.Reactive.Runtime.Remoting": { "target": "project" }
-            },
-            "frameworkAssemblies": {
-                "System.Threading.Tasks": "4.0.10.0"
+                "dotnet-test-xunit": "1.0.0-dev-79755-47"
             }
         },
-        "netstandardapp1.5": {
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
+        "net461": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -66,12 +63,18 @@
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
                     "CRIPPLED_REFLECTION",
-                    "PLIB",
-                    "USE_TIMER_SELF_ROOT"
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
                 ]
             },
             "dependencies": {
-                "dotnet-test-xunit": "1.0.0-dev-79755-47"
+                "System.Reactive.Windows.Threading": { "target": "project" },
+                "System.Reactive.Windows.Forms": { "target": "project" },
+                "System.Reactive.Runtime.Remoting": { "target": "project" }
+            },
+            "frameworkAssemblies": {
+                "System.Threading.Tasks": "4.0.10.0"
             }
         }
     }