Jelajahi Sumber

Add dotnet5.1 targets correctly and lower WindowsRuntime to 5.1

Oren Novotny 9 tahun lalu
induk
melakukan
ad59f46099

+ 6 - 3
Rx.NET/Source/System.Reactive.Core/project.json

@@ -55,6 +55,7 @@
                     "NO_REMOTING",
                     "NO_SERIALIZABLE",
                     "NO_THREAD",
+                    "NO_WEAKTABLE",
                     "CRIPPLED_REFLECTION",
                     "PLIB",
                     "USE_TIMER_SELF_ROOT"
@@ -62,10 +63,12 @@
             },
             "dependencies": {
                 "System.Linq": "4.0.0",
-                "System.Collections.Concurrent": "4.0.10",
+                "System.Collections.Concurrent": "4.0.0",
                 "System.ComponentModel": "4.0.0",
-                "System.Threading": "4.0.10",
-                "System.Threading.Timer": "4.0.0"
+                "System.Threading": "4.0.0",
+                "System.Threading.Timer": "4.0.0",
+                "System.Runtime": "4.0.0",
+                "System.Runtime.Extensions": "4.0.0"
             }
             
         },

+ 3 - 2
Rx.NET/Source/System.Reactive.Interfaces/project.json

@@ -59,9 +59,10 @@
             "dependencies": {
                 "System.Diagnostics.Tools": "4.0.0",
                 "System.Linq": "4.0.0",
-                "System.Linq.Expressions": "4.0.10",
+                "System.Linq.Expressions": "4.0.0",
                 "System.Resources.ResourceManager": "4.0.0",
-                "System.Threading": "4.0.10"
+                "System.Threading": "4.0.0",
+                "System.Runtime": "4.0.0"
             }
         },
         "dotnet5.2": {

+ 4 - 2
Rx.NET/Source/System.Reactive.Linq/project.json

@@ -68,9 +68,11 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.10",
+                "System.Collections.Concurrent": "4.0.0",
                 "System.Reflection.TypeExtensions": "4.0.0",
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.0"
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.0",
+                "System.Runtime": "4.0.0",
+                "System.Runtime.Extensions": "4.0.0"
             }
         },
         "dotnet5.4": {

+ 13 - 7
Rx.NET/Source/System.Reactive.WindowsRuntime/project.json

@@ -11,13 +11,11 @@
   "requireLicenseAcceptance": true,
 
   "dependencies": {
-    "System.Reactive.Interfaces": { "target": "project" },
-    "System.Reactive.Core": { "target": "project" },
     "System.Reactive.Linq": { "target": "project" }
   },
 
   "frameworks": {
-    "uap10.0": {
+    "dotnet5.1": {
         "compilationOptions": {
             "define": [
                 "NO_EVENTARGS_CONSTRAINT",
@@ -34,11 +32,19 @@
             ]
         },
         "dependencies": {
-            "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
-            "Microsoft.TargetingPack.Private.WinRT": "1.0.1",
-            "System.Runtime": "4.0.20",
-            "System.Threading.Tasks": "4.0.10"
+            "Microsoft.NETCore.Portable.Compatibility": {
+                "version": "1.0.0",
+                "type": "build"
+            },
+            "Microsoft.TargetingPack.Private.WinRT": {
+                "version": "1.0.1",
+                "type": "build"
+            },
+            "System.Runtime": "4.0.0",
+            "System.Threading.Tasks": "4.0.0",
+            "System.Runtime.WindowsRuntime": "4.0.10"
         }
+
     }
   }
 }