Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

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 (master) #2159

Merged
merged 2 commits into from
Mar 15, 2018
Merged

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 (master) #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ebfb4
Update Cli, CoreFx, CoreFx, CoreFx, CoreFx, CoreFx, CoreSetup, CoreSe…
dotnet-maestro-bot Mar 15, 2018
6c0f623
Revert recent changes to UvThread Schedule
ahsonkhan Mar 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.300-preview2-008315
2.1.300-preview2-008354
2 changes: 1 addition & 1 deletion SharedRuntimeVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0-preview2-26312-01
2.1.0-preview2-26314-02
10 changes: 3 additions & 7 deletions src/System.IO.Pipelines.Networking.Libuv/UvThread.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tools/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.6.0-beta3-62316-02</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>
Expand Down