Merge master into NullableFeature

buyaa-n · krwq · commit 8f9d562b7662 · 2019-05-01T13:32:32.000-07:00
Signed-off-by: dotnet-bot &lt;dotnet-bot@microsoft.com&gt;
diff --git a/src/Common/src/CoreLib/System/DefaultBinder.cs b/src/Common/src/CoreLib/System/DefaultBinder.cs
@@ -1207,7 +1207,7 @@ private static bool CreateParamOrder(int[] paramOrder, ParameterInfo[] pars, str
 
         // CanChangePrimitive
         // This will determine if the source can be converted to the target type
-        internal static bool CanChangePrimitive(Type source, Type target)
+        internal static bool CanChangePrimitive(Type? source, Type? target)
         {
             if ((source == typeof(IntPtr) && target == typeof(IntPtr)) ||
                 (source == typeof(UIntPtr) && target == typeof(UIntPtr)))

Original file line number	Diff line number	Diff line change
`@@ -1207,7 +1207,7 @@ private static bool CreateParamOrder(int[] paramOrder, ParameterInfo[] pars, str`
`1207`	`1207`
`1208`	`1208`	`// CanChangePrimitive`
`1209`	`1209`	`// This will determine if the source can be converted to the target type`
`1210`		`- internal static bool CanChangePrimitive(Type source, Type target)`
	`1210`	`+ internal static bool CanChangePrimitive(Type? source, Type? target)`
`1211`	`1211`	`{`
`1212`	`1212`	`if ((source == typeof(IntPtr) && target == typeof(IntPtr)) \|\|`
`1213`	`1213`	`(source == typeof(UIntPtr) && target == typeof(UIntPtr)))`