Merge branch 'master' of https://github.com/dotnet/corefxlab into Upd…

…ateCompiler
dotnet · Mar 15, 2018 · 6555b53 · 6555b53
2 parents 82d9f06 + 3a2a165
commit 6555b53
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.300-preview2-008315
+2.1.300-preview2-008354
diff --git a/SharedRuntimeVersion.txt b/SharedRuntimeVersion.txt
@@ -1 +1 @@
-2.1.0-preview2-26312-01
+2.1.0-preview2-26314-02
diff --git a/src/System.IO.Pipelines.Networking.Libuv/UvThread.cs b/src/System.IO.Pipelines.Networking.Libuv/UvThread.cs
@@ -139,14 +139,10 @@ public void Dispose()
             Pool.Dispose();
         }
 
-        // TODO: Re-write to avoid allocation
-        public override void Schedule<TState>(Action<TState> action, TState state)
+        public override void Schedule(Action<object> action, object state)
         {
-            Post(s =>
-            {
-                var tuple = (Tuple<Action<TState>, TState>)s;
-                tuple.Item1(tuple.Item2);
-            }, Tuple.Create(action, state));
+            // REVIEW: Should we inline actions if we're already on the libuv thread?
+            Post(action, state);
         }
 
         private struct Work

diff --git a/tools/dependencies.props b/tools/dependencies.props
@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
-    <RuntimeFrameworkVersion>2.1.0-preview2-26312-01</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.0-preview2-26314-02</RuntimeFrameworkVersion>
     <CoreFxStableVersion>4.3.0</CoreFxStableVersion>
     <RoslynVersion>2.8.0-beta2-62708-09</RoslynVersion>
-    <SystemMemoryVersion>4.5.0-preview2-26312-02</SystemMemoryVersion>
-    <SystemCompilerServicesUnsafeVersion>4.5.0-preview2-26312-02</SystemCompilerServicesUnsafeVersion>
-    <SystemNumericsVectorsVersion>4.5.0-preview2-26312-02</SystemNumericsVectorsVersion>
-    <SystemBuffersVersion>4.5.0-preview2-26312-02</SystemBuffersVersion>
-    <SystemIOPipelinesVersion>4.5.0-preview2-26305-02</SystemIOPipelinesVersion>
+    <SystemMemoryVersion>4.5.0-preview2-26315-04</SystemMemoryVersion>
+    <SystemCompilerServicesUnsafeVersion>4.5.0-preview2-26315-04</SystemCompilerServicesUnsafeVersion>
+    <SystemNumericsVectorsVersion>4.5.0-preview2-26315-04</SystemNumericsVectorsVersion>
+    <SystemBuffersVersion>4.5.0-preview2-26315-04</SystemBuffersVersion>
+    <SystemIOPipelinesVersion>4.5.0-preview2-26315-04</SystemIOPipelinesVersion>
     <LibuvVersion>1.9.1</LibuvVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>