Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -9,9 +9,7 @@
using System;
using System.IO;
using System.Text;
#if NET_4_5
using System.Threading.Tasks;
#endif
using NUnit.Framework;
@ -845,7 +843,6 @@ public class StreamReaderTest
Assert.AreEqual (0, StreamReader.Null.ReadBlock (buffer, 0, buffer.Length));
}
#if NET_4_5
[Test]
public void ReadLineAsync ()
{
@ -866,7 +863,6 @@ public class StreamReaderTest
Assert.IsTrue (result.Wait (3000), "#1");
Assert.AreEqual ("ab" + Environment.NewLine, result.Result);
}
#endif
}
class MyStream : Stream {