diff --git a/dir.props b/dir.props
index f65f45b05666..aff578b06ec3 100644
--- a/dir.props
+++ b/dir.props
@@ -25,12 +25,6 @@
$(OSEnvironment)
-
-
- 1.0.0-rc3-20150510-01
- Microsoft.Net.ToolsetCompilers
-
-
true
@@ -55,14 +49,9 @@
$(ProjectDir)packages/
- $(ProjectDir)Tools/
$(ToolRuntimePath)
$(ProjectDir)Tools/
- $(ToolRuntimePath)dotnetcli/
- $(DotnetCliPath)dotnet
- $(ToolsDir)net45/
- $(ToolsDir)
- false
+ $(ToolsDir)
@@ -71,12 +60,6 @@
-ignoreBuildAndRevisionMismatch
-
-
- true
-
-
-
@@ -158,37 +141,6 @@
false
-
-
- $(PackagesDir)/$(RoslynPackageName).$(RoslynVersion)/
- $(RoslynPackageDir)build/Microsoft.Net.ToolsetCompilers.props
-
-
- Portable
-
-
- false
-
-
- false
-
-
- false
-
-
AnyCPU
@@ -592,6 +544,7 @@
true
-
-
+
+
+
diff --git a/src/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs b/src/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs
index d7f2464bcac5..55eff83f58f5 100644
--- a/src/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs
+++ b/src/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs
@@ -173,17 +173,17 @@ public async Task TestSchedulerUsage()
{
var scheduler = new ConcurrentExclusiveSchedulerPair().ExclusiveScheduler;
- var sync = new ActionBlock(_ => Assert.Equal(scheduler.Id, TaskScheduler.Current.Id),
+ var actionBlockSync = new ActionBlock(_ => Assert.Equal(scheduler.Id, TaskScheduler.Current.Id),
new ExecutionDataflowBlockOptions
{
TaskScheduler = scheduler,
SingleProducerConstrained = singleProducerConstrained
});
- sync.PostRange(0, 10);
- sync.Complete();
- await sync.Completion;
+ actionBlockSync.PostRange(0, 10);
+ actionBlockSync.Complete();
+ await actionBlockSync.Completion;
- var async = new ActionBlock(_ => {
+ var actionBlockAsync = new ActionBlock(_ => {
Assert.Equal(scheduler.Id, TaskScheduler.Current.Id);
return Task.FromResult(0);
}, new ExecutionDataflowBlockOptions
@@ -191,9 +191,9 @@ public async Task TestSchedulerUsage()
TaskScheduler = scheduler,
SingleProducerConstrained = singleProducerConstrained
});
- async.PostRange(0, 10);
- async.Complete();
- await async.Completion;
+ actionBlockAsync.PostRange(0, 10);
+ actionBlockAsync.Complete();
+ await actionBlockAsync.Completion;
}
}