Enable nullability in MultitargetUtil (#4585)

gpetrou · web-flow · commit 45739de51e0e · 2021-02-22T18:58:38.000+11:00
diff --git a/src/System.Windows.Forms/src/misc/MultitargetUtil.cs b/src/System.Windows.Forms/src/misc/MultitargetUtil.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Resources
 {
     /// <summary>
@@ -16,9 +14,9 @@ internal static class MultitargetUtil
         ///  This method gets assembly info for the corresponding type. If the delegate
         ///  is provided it is used to get this information.
         /// </summary>
-        public static string GetAssemblyQualifiedName(Type type, Func<Type, string> typeNameConverter)
+        public static string? GetAssemblyQualifiedName(Type? type, Func<Type, string>? typeNameConverter)
         {
-            string assemblyQualifiedName = null;
+            string? assemblyQualifiedName = null;
 
             if (type != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-#nullable disable`
`6`		`-`
`7`	`5`	`namespace System.Resources`
`8`	`6`	`{`
`9`	`7`	`/// <summary>`
`@@ -16,9 +14,9 @@ internal static class MultitargetUtil`
`16`	`14`	`/// This method gets assembly info for the corresponding type. If the delegate`
`17`	`15`	`/// is provided it is used to get this information.`
`18`	`16`	`/// </summary>`
`19`		`- public static string GetAssemblyQualifiedName(Type type, Func<Type, string> typeNameConverter)`
	`17`	`+ public static string? GetAssemblyQualifiedName(Type? type, Func<Type, string>? typeNameConverter)`
`20`	`18`	`{`
`21`		`- string assemblyQualifiedName = null;`
	`19`	`+ string? assemblyQualifiedName = null;`
`22`	`20`
`23`	`21`	`if (type != null)`
`24`	`22`	`{`