Преглед на файлове

Enable a netcoreapp1.0 build to light up thread/threadpool support

Oren Novotny преди 9 години
родител
ревизия
6385cea5dc

+ 8 - 0
Rx.NET/Source/NuSpecs/System.Reactive.Core.nuspec

@@ -24,6 +24,14 @@
             <dependency id="System.Diagnostics.Contracts" version="4.0.1-rc2-24027" />
             <dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24027" />
         </group>
+        <group targetFramework="netcoreapp1.0">
+            <dependency id="System.Reactive.Interfaces" version="$version$" />
+            <dependency id="System.ComponentModel" version="4.0.1-rc2-24027" />
+            <dependency id="System.Diagnostics.Contracts" version="4.0.1-rc2-24027" />
+            <dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24027" />
+            <dependency id="System.Threading.Thread" version="4.0.0-rc2-24027" />
+            <dependency id="System.Threading.ThreadPool" version="4.0.10-rc2-24027" />
+        </group>
       </dependencies>
     </metadata>
     <files>

+ 5 - 1
Rx.NET/Source/System.Reactive.Core/Reactive/Internal/Stubs.cs

@@ -17,7 +17,11 @@ namespace System.Reactive
 #if !NO_THREAD
     internal static class TimerStubs
     {
+#if NETCOREAPP1_0
+        public static readonly System.Threading.Timer Never = new System.Threading.Timer(_ => { }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
+#else
         public static readonly System.Threading.Timer Never = new System.Threading.Timer(_ => { });
+#endif
     }
 #endif
-}
+    }

+ 26 - 0
Rx.NET/Source/System.Reactive.Core/project.json

@@ -132,6 +132,32 @@
         "System.Dynamic.Runtime": "4.0.11-rc2-24027"
       }
     },
+    "netcoreapp1.0": {
+      "buildOptions": {
+        "define": [
+          "NO_EVENTARGS_CONSTRAINT",
+          "HAS_EDI",
+          "HAS_WINRT",
+          "HAS_PROGRESS",
+          "HAS_TPL46",
+          "PREFER_ASYNC",
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "NO_REMOTING",
+          "NO_SERIALIZABLE",          
+          "CRIPPLED_REFLECTION",
+          "PLIB",
+          "USE_TIMER_SELF_ROOT"
+        ]
+      },
+      "dependencies": {
+        "System.ComponentModel": "4.0.1-rc2-24027",
+        "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
+        "System.Dynamic.Runtime": "4.0.11-rc2-24027",
+        "System.Threading.Thread": "4.0.0-rc2-24027",
+        "System.Threading.ThreadPool": "4.0.10-rc2-24027"
+      }
+    },
     "sl5": {
       "buildOptions": {
         "define": [

+ 4 - 0
Rx.NET/Source/System.Reactive.PlatformServices/Reactive/Internal/Stubs.cs

@@ -5,7 +5,11 @@ namespace System.Reactive.Concurrency
 #if !NO_THREAD
     internal static class TimerStubs
     {
+#if NETCOREAPP1_0
+        public static readonly System.Threading.Timer Never = new System.Threading.Timer(_ => { }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
+#else
         public static readonly System.Threading.Timer Never = new System.Threading.Timer(_ => { });
+#endif
     }
 #endif
 }

+ 25 - 4
Rx.NET/Source/System.Reactive.PlatformServices/project.json

@@ -106,7 +106,7 @@
         ]
       },
       "dependencies": {
-      
+
       }
     },
     "netstandard1.3": {
@@ -129,7 +129,28 @@
         ]
       },
       "dependencies": {
-      
+
+      }
+    },
+    "netcoreapp1.0": {
+      "buildOptions": {
+        "define": [
+          "NO_EVENTARGS_CONSTRAINT",
+          "HAS_EDI",
+          "HAS_WINRT",
+          "HAS_PROGRESS",
+          "HAS_TPL46",
+          "PREFER_ASYNC",
+          "HAS_AWAIT",
+          "HAS_APTCA",
+          "NO_REMOTING",
+          "NO_SERIALIZABLE",
+          "CRIPPLED_REFLECTION",
+          "PLIB",
+          "USE_TIMER_SELF_ROOT"
+        ]
+      },
+      "dependencies": {
       }
     },
     "wpa81": {
@@ -191,7 +212,7 @@
       }
     },
     "uap10.0": {
-      "imports": ["dotnet5.4"],
+      "imports": [ "dotnet5.4" ],
       "buildOptions": {
         "define": [
           "NO_EVENTARGS_CONSTRAINT",
@@ -239,7 +260,7 @@
         ]
       },
       "dependencies": {
-      
+
       }
     }
   }