From 07ebfb4a54ad1f9b291fb7d3717c0192d01cce42 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 15 Mar 2018 13:22:41 -0700 Subject: [PATCH 1/2] Update Cli, CoreFx, CoreFx, CoreFx, CoreFx, CoreFx, CoreSetup, CoreSetup to preview2-008354, preview2-26315-04, preview2-26315-04, preview2-26315-04, preview2-26315-04, preview2-26315-04, preview2-26314-02, preview2-26314-02, respectively --- DotnetCLIVersion.txt | 2 +- SharedRuntimeVersion.txt | 2 +- tools/dependencies.props | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index 6525c05b676..42e09d9a446 100644 --- 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 index b997ada6e25..72f1657afdc 100644 --- a/SharedRuntimeVersion.txt +++ b/SharedRuntimeVersion.txt @@ -1 +1 @@ -2.1.0-preview2-26312-01 \ No newline at end of file +2.1.0-preview2-26314-02 \ No newline at end of file diff --git a/tools/dependencies.props b/tools/dependencies.props index 2e680447e54..ace8a2fccac 100644 --- a/tools/dependencies.props +++ b/tools/dependencies.props @@ -1,13 +1,13 @@ - 2.1.0-preview2-26312-01 + 2.1.0-preview2-26314-02 4.3.0 2.6.0-beta3-62316-02 - 4.5.0-preview2-26312-02 - 4.5.0-preview2-26312-02 - 4.5.0-preview2-26312-02 - 4.5.0-preview2-26312-02 - 4.5.0-preview2-26305-02 + 4.5.0-preview2-26315-04 + 4.5.0-preview2-26315-04 + 4.5.0-preview2-26315-04 + 4.5.0-preview2-26315-04 + 4.5.0-preview2-26315-04 1.9.1 15.0.0 2.2.0 From 6c0f6239e59ef2e622456927b14af58ebb501b8b Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Thu, 15 Mar 2018 13:36:30 -0700 Subject: [PATCH 2/2] Revert recent changes to UvThread Schedule --- src/System.IO.Pipelines.Networking.Libuv/UvThread.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/System.IO.Pipelines.Networking.Libuv/UvThread.cs b/src/System.IO.Pipelines.Networking.Libuv/UvThread.cs index 8d1e6ea58af..b02cc6a4591 100644 --- 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(Action action, TState state) + public override void Schedule(Action action, object state) { - Post(s => - { - var tuple = (Tuple, 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