Make code .NET 3.5 compatible

Use compile directives to ensure smooth NuGet package generation. 'IReturnsExtensions' was using 'System.Threading.Tasks' namespace, so compile directives were also added to it.
devlooped · Dec 13, 2013 · ad78301 · ad78301
1 parent 7bf05bd
commit ad78301
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Source/EmptyDefaultValueProvider.cs b/Source/EmptyDefaultValueProvider.cs
@@ -43,7 +43,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+#if !NET3x
 using System.Threading.Tasks;
+#endif
 
 namespace Moq
 {
@@ -87,11 +89,13 @@ private static object GetReferenceTypeDefault(Type valueType)
 			{
 				return new object[0].AsQueryable();
 			}
+#if !NET3x
 			else if (valueType == typeof(Task))
 			{
 				// Task<T> inherits from Task, so just return Task<bool>
 				return GetCompletedTaskWithResult(false);
 			}
+#endif
 			else if (valueType.IsGenericType && valueType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
 			{
 				var genericListType = typeof(List<>).MakeGenericType(valueType.GetGenericArguments()[0]);
@@ -107,13 +111,15 @@ private static object GetReferenceTypeDefault(Type valueType)
 					.MakeGenericMethod(genericType)
 					.Invoke(null, new[] { Activator.CreateInstance(genericListType) });
 			}
+#if !NET3x
 			else if (valueType.IsGenericType && valueType.GetGenericTypeDefinition() == typeof(Task<>))
 			{
 				var genericType = valueType.GetGenericArguments()[0];
 
 				return GetCompletedTaskWithResult(
 					genericType.IsValueType ? GetValueTypeDefault(genericType) : GetReferenceTypeDefault(genericType));
 			}
+#endif
 
 			return null;
 		}
@@ -129,6 +135,7 @@ private static object GetValueTypeDefault(Type valueType)
 			return Activator.CreateInstance(valueType);
 		}
 
+#if !NET3x
 		private static Task GetCompletedTaskWithResult(object result)
 		{
 			var type = result.GetType();
@@ -140,5 +147,6 @@ private static Task GetCompletedTaskWithResult(object result)
 			setResultMethod.Invoke(tcs, new[] {result});
 			return (Task) taskProperty.GetValue(tcs, null);
 		}
+#endif
 	}
 }
diff --git a/Source/Language/IReturnsExtensions.cs b/Source/Language/IReturnsExtensions.cs
@@ -1,4 +1,5 @@
-using System;
+#if !NET3x
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -34,3 +35,4 @@ public static IReturnsResult<TMock> ThrowsAsync<TMock, TResult>(this IReturns<TM
         }
     }
 }
+#endif
diff --git a/UnitTests/EmptyDefaultValueProviderFixture.cs b/UnitTests/EmptyDefaultValueProviderFixture.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+#if !NET3x
 using System.Threading.Tasks;
+#endif
 using Xunit;
 
 namespace Moq.Tests
@@ -108,6 +110,7 @@ public void ProvideEmptyQueryableObjects()
 			Assert.Equal(0, ((IQueryable)value).Cast<object>().Count());
 		}
 
+#if !NET3x
 		[Fact]
 		public void ProvidesDefaultTask()
 		{
@@ -142,6 +145,7 @@ public void ProvidesDefaultTaskOfGenericTask()
 			Assert.True(((Task)value).IsCompleted);
 			Assert.Equal(default(int), ((Task<Task<int>>) value).Result.Result);
 		}
+#endif
 
 		public interface IFoo
 		{
@@ -156,9 +160,11 @@ public interface IFoo
 			IBar[] Bars { get; set; }
 			IQueryable<int> Queryable { get; }
 			IQueryable QueryableObjects { get; }
+#if !NET3x
 			Task TaskValue { get; set; }
 			Task<int> GenericTaskValue { get; set; }
 			Task<Task<int>> TaskOfGenericTaskValue { get; set; }
+#endif
 		}
 
 		public interface IBar { }