diff options
| author | John Brock <JohnHBrock@gmail.com> | 2017-02-13 15:34:35 -0800 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2017-02-23 10:51:52 +0000 |
| commit | c9b2c8f3271f9985a738fe193ced5b3324ae8c7c (patch) | |
| tree | 11e60a4c6da0e9eb94ca026aac8e3bc4d323e62c /csharp/src/Google.Protobuf/JsonFormatter.cs | |
| parent | 1a8cbfd355603e094858cbfdf5999b860dbab13f (diff) | |
| download | protobuf-c9b2c8f3271f9985a738fe193ced5b3324ae8c7c.tar.gz protobuf-c9b2c8f3271f9985a738fe193ced5b3324ae8c7c.tar.bz2 protobuf-c9b2c8f3271f9985a738fe193ced5b3324ae8c7c.zip | |
Fixes for .NET 3.5 compatibility
* Changing DOTNET35 framework symbols in preprocessor directives to the default built-in value of NET35.
* Adding extension method StreamExtension.CopyTo for .NET 3.5 because it didn’t exist until .NET 4, and adding associated unit tests.
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonFormatter.cs')
| -rwxr-xr-x[-rw-r--r--] | csharp/src/Google.Protobuf/JsonFormatter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs index bb1a361e..05282775 100644..100755 --- a/csharp/src/Google.Protobuf/JsonFormatter.cs +++ b/csharp/src/Google.Protobuf/JsonFormatter.cs @@ -831,7 +831,7 @@ namespace Google.Protobuf return originalName; } -#if DOTNET35 +#if NET35 // TODO: Consider adding functionality to TypeExtensions to avoid this difference. private static Dictionary<object, string> GetNameMapping(System.Type enumType) => enumType.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static) |