aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf.Test/project.json
diff options
context:
space:
mode:
authorJon Skeet <jonskeet@google.com>2017-01-04 16:40:07 +0000
committerJon Skeet <skeet@pobox.com>2017-01-10 13:05:27 +0000
commitfb71df9f0b5a8457255e35cd4cd19c46396e97f1 (patch)
tree80f3f0d27f03265e988f047ac3d47d1368e794d2 /csharp/src/Google.Protobuf.Test/project.json
parente76d91a9d1c0beed0f083740a5c3288d519160fd (diff)
downloadprotobuf-fb71df9f0b5a8457255e35cd4cd19c46396e97f1.tar.gz
protobuf-fb71df9f0b5a8457255e35cd4cd19c46396e97f1.tar.bz2
protobuf-fb71df9f0b5a8457255e35cd4cd19c46396e97f1.zip
Add ByteString.FromStream and ByteString.FromStreamAsync in C#
Fixes #2088. We now have separate tests for netcoreapp and net45 to test the two branches here. (netstandard10 doesn't have MemoryStream.GetBuffer) Although most of this library doesn't have any async functionality, this feels like a natural place to locally add it.
Diffstat (limited to 'csharp/src/Google.Protobuf.Test/project.json')
-rw-r--r--csharp/src/Google.Protobuf.Test/project.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/csharp/src/Google.Protobuf.Test/project.json b/csharp/src/Google.Protobuf.Test/project.json
index 3a73bf7a..9f739f90 100644
--- a/csharp/src/Google.Protobuf.Test/project.json
+++ b/csharp/src/Google.Protobuf.Test/project.json
@@ -27,6 +27,7 @@
"testRunner": "nunit",
"frameworks": {
+ "net451": {},
"netcoreapp1.0": {
"imports" : [ "dnxcore50", "netcoreapp1.0", "portable-net45+win8" ],
"buildOptions": {