Adding conditional compiler symbol to support .NET 3.5 (protocolbuffe…

…rs#1713) * Adding condition compiler symbol to support .NET 3.5
jcanizales · Jun 28, 2016 · dc0aeaa · dc0aeaa
1 parent 7b5648c
commit dc0aeaa
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs b/csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
@@ -67,7 +67,7 @@ public void IsValueType(Type type, bool expected)
         {
             Assert.AreEqual(expected, TypeExtensions.IsValueType(type));
         }
-
+#if !DOTNET35
         [Test]
         [TestCase(typeof(object), typeof(string), true)]
         [TestCase(typeof(object), typeof(int), true)]
@@ -129,5 +129,6 @@ public void GetMethod_Ambiguous(Type type, string name)
         {
             Assert.Throws<AmbiguousMatchException>(() => TypeExtensions.GetMethod(type, name));
         }
+#endif
     }
 }
diff --git a/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs b/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs
@@ -47,7 +47,11 @@ internal static class PropertyInfoExtensions
         /// </summary>
         internal static MethodInfo GetGetMethod(this PropertyInfo target)
         {
+#if DOTNET35
+            var method = target.GetGetMethod();
+#else
             var method = target.GetMethod;
+#endif
             return method != null && method.IsPublic ? method : null;
         }
 
@@ -57,7 +61,11 @@ internal static MethodInfo GetGetMethod(this PropertyInfo target)
         /// </summary>
         internal static MethodInfo GetSetMethod(this PropertyInfo target)
         {
+#if DOTNET35
+            var method = target.GetSetMethod();
+#else
             var method = target.SetMethod;
+#endif
             return method != null && method.IsPublic ? method : null;
         }
     }

diff --git a/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs b/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
@@ -49,6 +49,11 @@ internal static class TypeExtensions
         /// Returns true if the target type is a value type, including a nullable value type or an enum, or false
         /// if it's a reference type (class, delegate, interface - including System.ValueType and System.Enum).
         /// </summary>
+#if DOTNET35
+        internal static bool IsValueType(this Type target) {
+            return target.IsValueType;
+        }
+#else
         internal static bool IsValueType(this Type target)
         {
             return target.GetTypeInfo().IsValueType;
@@ -109,5 +114,6 @@ internal static MethodInfo GetMethod(this Type target, string name)
             }
             return null;
         }
+#endif
     }
 }
diff --git a/csharp/src/Google.Protobuf/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs
@@ -885,6 +885,16 @@ internal static string GetOriginalName(object value)
                 return originalName;
             }
 
+#if DOTNET35
+            // 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)
+                    .ToDictionary(f => f.GetValue(null),
+                                  f => (f.GetCustomAttributes(typeof(OriginalNameAttribute), false)
+                                        .FirstOrDefault() as OriginalNameAttribute)
+                                        // If the attribute hasn't been applied, fall back to the name of the field.
+                                        ?.Name ?? f.Name);
+#else
             private static Dictionary<object, string> GetNameMapping(System.Type enumType) =>
                 enumType.GetTypeInfo().DeclaredFields
                     .Where(f => f.IsStatic)
@@ -893,6 +903,7 @@ private static Dictionary<object, string> GetNameMapping(System.Type enumType) =
                                         .FirstOrDefault()
                                         // If the attribute hasn't been applied, fall back to the name of the field.
                                         ?.Name ?? f.Name);
+#endif
         }
     }
 }
diff --git a/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
@@ -34,6 +34,10 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+#if DOTNET35
+// Needed for ReadOnlyDictionary, which does not exist in .NET 3.5
+using Google.Protobuf.Collections;
+#endif
 
 namespace Google.Protobuf.Reflection
 {

diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
@@ -59,7 +59,12 @@ internal static string ToJson(IList<string> paths, bool diagnosticOnly)
             if (firstInvalid == null)
             {
                 var writer = new StringWriter();
+#if DOTNET35
+                var query = paths.Select(JsonFormatter.ToCamelCase);
+                JsonFormatter.WriteString(writer, string.Join(",", query.ToArray()));
+#else
                 JsonFormatter.WriteString(writer, string.Join(",", paths.Select(JsonFormatter.ToCamelCase)));
+#endif
                 return writer.ToString();
             }
             else

diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs b/csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs
@@ -31,10 +31,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Google.Protobuf.WellKnownTypes
 {