[xabt] Fix NRT annotations in MSBuild Tasks, part 5 (#10313)

Copilot · jonathanpeppers · web-flow · commit 510fc086f837 · 2025-07-21T13:43:36.000-05:00
Context: #10277 This PR addresses the issue of updating MSBuild task classes in `src/Xamarin.Android.Build.Tasks/Tasks/` to follow the repository's nullable reference types guidelines. ## Changes Made ### ✅ Added `#nullable enable` directives - Added `#nullable enable` to 2 files that were missing it: - `GetNativeRuntimeComponents.cs` - `LinkNativeRuntime.cs` ### ✅ Converted to extension method patterns - Updated 17 occurrences across 15 files to use extension methods per copilot-instructions.md: - `string.IsNullOrEmpty()` → `.IsNullOrEmpty()` - `string.IsNullOrWhiteSpace()` → `.IsNullOrWhiteSpace()` **Files updated:** - `Aapt2Link.cs` (2 occurrences) - `BuildAppBundle.cs` - `BundleToolAdbTask.cs` - `CalculateLayoutCodeBehind.cs` - `CollectDalvikFilesForArchive.cs` - `CollectNativeFilesForArchive.cs` (2 occurrences) - `CollectNonEmptyDirectories.cs` (2 occurrences) - `CreateAar.cs` (2 occurrences) - `GetAotArguments.cs` - `GetAotAssemblies.cs` - `GetAssetPacks.cs` - `GetImportedLibraries.cs` - `ProcessAssemblies.cs` - `R8.cs` (5 occurrences) ## Results - **Before**: 143/147 files had `#nullable enable` (97.3% compliance) - **After**: 146/147 files have `#nullable enable` (99.3% compliance) Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Link.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2Link.cs
@@ -266,7 +266,7 @@ string [] GenerateCommandLineCommands (string ManifestFile, string? currentAbi,
 			if (ProtobufFormat)
 				cmd.Add ("--proto-format");
 
-			if (!string.IsNullOrWhiteSpace (ExtraArgs)) {
+			if (!ExtraArgs.IsNullOrWhiteSpace ()) {
 				foreach (Match match in exraArgSplitRegEx.Matches (ExtraArgs)) {
 					string value = match.Value.Trim (' ', '"', '\'');
 					if (!value.IsNullOrEmpty ())
@@ -294,7 +294,7 @@ string [] GenerateCommandLineCommands (string ManifestFile, string? currentAbi,
 			if (AdditionalAndroidAssetPaths != null) {
 				for (int i = 0; i < AdditionalAndroidAssetPaths.Length; i++) {
 					var assetDir = GetFullPath (AdditionalAndroidAssetPaths [i].ItemSpec.TrimEnd ('\\'));
-					if (!string.IsNullOrWhiteSpace (assetDir)) {
+					if (!assetDir.IsNullOrWhiteSpace ()) {
 						if (Directory.Exists (assetDir)) {
 							if (OS.IsWindows && !IsPathOnlyASCII (assetDir)) {
 								hasAssetsErrors = true;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildAppBundle.cs
@@ -91,7 +91,7 @@ public override bool RunTask ()
 				}
 
 				JsonNode? json = JsonNode.Parse ("{}");
-				if (!string.IsNullOrEmpty (CustomBuildConfigFile) && File.Exists (CustomBuildConfigFile)) {
+				if (!CustomBuildConfigFile.IsNullOrEmpty () && File.Exists (CustomBuildConfigFile)) {
 					using Stream fs = File.OpenRead (CustomBuildConfigFile);
 					using JsonDocument doc = JsonDocument.Parse (fs, new JsonDocumentOptions { AllowTrailingCommas = true });
 					json = doc.RootElement.ToNode ();
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BundleToolAdbTask.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BundleToolAdbTask.cs
@@ -23,7 +23,7 @@ public abstract class BundleToolAdbTask : BundleTool
 
 		protected void AppendAdbOptions (CommandLineBuilder cmd)
 		{
-			var adb = string.IsNullOrEmpty (AdbToolExe) ? AdbToolName : AdbToolExe;
+			var adb = AdbToolExe.IsNullOrEmpty () ? AdbToolName : AdbToolExe;
 			cmd.AppendSwitchIfNotNull ("--adb ", Path.Combine (AdbToolPath, adb));
 
 			var adbTarget = AdbTarget;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs
@@ -196,7 +196,7 @@ bool LoadLayout (string filePath, Dictionary <string, LayoutGroup> groupIndex, r
 
 			string? xamarinClasses = nav.GetAttribute (XamarinClassesAttribute, xamarinNS)?.Trim ();
 
-			if (!string.IsNullOrWhiteSpace (rootWidgetIdOverride)) {
+			if (!rootWidgetIdOverride.IsNullOrWhiteSpace ()) {
 				if (!ParseIdWithError (nav, filePath, rootWidgetIdOverride, true, out parsedId, out name))
 					LogCodedError ("XA1012", Properties.Resources.XA1012, rootWidgetIdOverride);
 				else {
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CollectDalvikFilesForArchive.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CollectDalvikFilesForArchive.cs
@@ -29,7 +29,7 @@ public override bool RunTask ()
 
 		foreach (var dex in DalvikClasses) {
 			var apkName = dex.GetMetadata ("ApkName");
-			var dexPath = string.IsNullOrWhiteSpace (apkName) ? Path.GetFileName (dex.ItemSpec) : apkName;
+			var dexPath = apkName.IsNullOrWhiteSpace () ? Path.GetFileName (dex.ItemSpec) : apkName;
 
 			files.AddItem (dex.ItemSpec, dalvikPath + dexPath);
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CollectNativeFilesForArchive.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CollectNativeFilesForArchive.cs
@@ -187,7 +187,7 @@ void AddNativeLibraries (ArchiveFileList files, string [] supportedAbis)
 
 		AddNativeLibraries (files, supportedAbis, libs);
 
-		if (string.IsNullOrWhiteSpace (CheckedBuild))
+		if (CheckedBuild.IsNullOrWhiteSpace ())
 			return;
 
 		string mode = CheckedBuild;
@@ -245,7 +245,7 @@ void AddNativeLibraries (ArchiveFileList files, string [] supportedAbis)
 		// If Abi is explicitly specified, simply return it.
 		var lib_abi = AndroidRidAbiHelper.GetNativeLibraryAbi (lib);
 
-		if (string.IsNullOrWhiteSpace (lib_abi)) {
+		if (lib_abi.IsNullOrWhiteSpace ()) {
 			Log.LogCodedError ("XA4301", lib.ItemSpec, 0, Properties.Resources.XA4301_ABI, lib.ItemSpec);
 			return null;
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CollectNonEmptyDirectories.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CollectNonEmptyDirectories.cs
@@ -91,12 +91,12 @@ public override bool RunTask ()
 					});
 					directory.CopyMetadataTo (taskItem);
 
-					if (string.IsNullOrEmpty (directory.GetMetadata ("StampFile"))) {
+					if (directory.GetMetadata ("StampFile").IsNullOrEmpty ()) {
 						taskItem.SetMetadata ("StampFile", stampFile);
 					} else {
 						Log.LogDebugMessage ($"%(StampFile) already set: {stampFile}");
 					}
-					if (string.IsNullOrEmpty (directory.GetMetadata ("FilesCache"))) {
+					if (directory.GetMetadata ("FilesCache").IsNullOrEmpty ()) {
 						taskItem.SetMetadata ("FilesCache", filesCache);
 					} else {
 						Log.LogDebugMessage ($"%(FilesCache) already set: {filesCache}");
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CreateAar.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CreateAar.cs
@@ -108,7 +108,7 @@ public override bool RunTask ()
 				if (NativeLibraries != null) {
 					foreach (var lib in NativeLibraries) {
 						var abi = AndroidRidAbiHelper.GetNativeLibraryAbi (lib);
-						if (string.IsNullOrWhiteSpace (abi)) {
+						if (abi.IsNullOrWhiteSpace ()) {
 							Log.LogCodedError ("XA4301", lib.ItemSpec, 0, Properties.Resources.XA4301_ABI, lib.ItemSpec);
 							continue;
 						}
@@ -127,7 +127,7 @@ public override bool RunTask ()
 				if (AndroidManifest != null && File.Exists (AndroidManifest.ItemSpec)) {
 					var manifest = File.ReadAllText (AndroidManifest.ItemSpec);
 					var doc = XDocument.Parse(manifest);
-					if (!string.IsNullOrEmpty (doc.Element ("manifest")?.Attribute ("package")?.Value)) {
+					if (!(doc.Element ("manifest")?.Attribute ("package")?.Value).IsNullOrEmpty ()) {
 						aar.AddEntry ("AndroidManifest.xml", manifest, Files.UTF8withoutBOM);
 					} else {
 						Log.LogDebugMessage ($"Skipping {AndroidManifest.ItemSpec}. The `manifest` does not have a `package` attribute.");
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs
@@ -80,7 +80,7 @@ public abstract class GetAotArguments : AsyncTask
 		protected AotMode AotMode;
 		protected SequencePointsMode SequencePointsMode;
 		protected string SdkBinDirectory = "";
-		protected bool UseAndroidNdk => !string.IsNullOrWhiteSpace (AndroidNdkDirectory);
+		protected bool UseAndroidNdk => !AndroidNdkDirectory.IsNullOrWhiteSpace ();
 
 		public static bool GetAndroidAotMode(string androidAotMode, out AotMode aotMode)
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetAotAssemblies.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetAotAssemblies.cs
@@ -38,7 +38,7 @@ public override Task RunTaskAsync ()
 			SdkBinDirectory = MonoAndroidHelper.GetOSBinPath ();
 
 			var abi = AndroidRidAbiHelper.RuntimeIdentifierToAbi (RuntimeIdentifier);
-			if (string.IsNullOrEmpty (abi)) {
+			if (abi.IsNullOrEmpty ()) {
 				Log.LogCodedError ("XA0035", Properties.Resources.XA0035, RuntimeIdentifier);
 				return Task.CompletedTask;
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetAssetPacks.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetAssetPacks.cs
@@ -50,7 +50,7 @@ public override bool RunTask ()
 					assetPacks[assetPack] = item;
 				}
 				foreach (var metadata in MetadataToCopy) {
-					if (string.IsNullOrEmpty (item.GetMetadata (metadata)))
+					if (item.GetMetadata (metadata).IsNullOrEmpty ())
 						item.SetMetadata (metadata, asset.GetMetadata (metadata));
 				}
 				if (!files.ContainsKey (assetPack)) {
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetImportedLibraries.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetImportedLibraries.cs
@@ -73,7 +73,7 @@ public override bool RunTask ()
 						if (IgnoredManifestDirectories.Contains (directory))
 							continue;
 						var doc = XDocument.Load(file);
-						if (string.IsNullOrEmpty (doc.Element ("manifest")?.Attribute ("package")?.Value)) {
+						if ((doc.Element ("manifest")?.Attribute ("package")?.Value).IsNullOrEmpty ()) {
 							Log.LogCodedWarning ("XA4315", file, 0, Properties.Resources.XA4315, file);
 							continue;
 						}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.IO;
 using System.Collections.Generic;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/LinkNativeRuntime.cs b/src/Xamarin.Android.Build.Tasks/Tasks/LinkNativeRuntime.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs
@@ -151,7 +151,7 @@ void SetMetadataForAssemblies (List<ITaskItem> output, Dictionary<string, ITaskI
 		static ITaskItem? GetOrCreateSymbolItem (Dictionary<string, ITaskItem> symbols, ITaskItem assembly)
 		{
 			var symbolPath = Path.ChangeExtension (assembly.ItemSpec, ".pdb");
-			if (!symbols.TryGetValue (symbolPath, out var symbol) || !string.IsNullOrEmpty (symbol.GetMetadata ("DestinationSubDirectory"))) {
+			if (!symbols.TryGetValue (symbolPath, out var symbol) || !symbol.GetMetadata ("DestinationSubDirectory").IsNullOrEmpty ()) {
 				// Sometimes .pdb files are not included in @(ResolvedFileToPublish), so add them if they exist
 				if (File.Exists (symbolPath)) {
 					symbols [symbolPath] = symbol = new TaskItem (symbolPath);
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/R8.cs b/src/Xamarin.Android.Build.Tasks/Tasks/R8.cs
@@ -60,7 +60,7 @@ protected override CommandLineBuilder GetCommandLineBuilder ()
 					if (CustomMainDexListFiles?.Length > 0) {
 						Log.LogCodedWarning ("XA4306", Properties.Resources.XA4306);
 					}
-				} else if (string.IsNullOrEmpty (MultiDexMainDexListFile)) {
+				} else if (MultiDexMainDexListFile.IsNullOrEmpty ()) {
 					Log.LogCodedWarning ("XA4305", Properties.Resources.XA4305);
 				} else {
 					var content = new List<string> ();
@@ -84,7 +84,7 @@ protected override CommandLineBuilder GetCommandLineBuilder ()
 			}
 
 			if (EnableShrinking) {
-				if (!string.IsNullOrEmpty (AcwMapFile)) {
+				if (!AcwMapFile.IsNullOrEmpty ()) {
 					var acwMap      = MonoAndroidHelper.LoadMapFile (BuildEngine4, Path.GetFullPath (AcwMapFile), StringComparer.OrdinalIgnoreCase);
 					var javaTypes   = new List<string> (acwMap.Values.Count);
 					foreach (var v in acwMap.Values) {
@@ -97,13 +97,13 @@ protected override CommandLineBuilder GetCommandLineBuilder ()
 						}
 					}
 				}
-				if (!string.IsNullOrWhiteSpace (ProguardCommonXamarinConfiguration)) {
+				if (!ProguardCommonXamarinConfiguration.IsNullOrWhiteSpace ()) {
 					using (var xamcfg = File.CreateText (ProguardCommonXamarinConfiguration)) {
 						GetType ().Assembly.GetManifestResourceStream ("proguard_xamarin.cfg").CopyTo (xamcfg.BaseStream);
 						if (IgnoreWarnings) {
 							xamcfg.WriteLine ("-ignorewarnings");
 						}
-						if (!string.IsNullOrEmpty (ProguardMappingFileOutput)) {
+						if (!ProguardMappingFileOutput.IsNullOrEmpty ()) {
 							xamcfg.WriteLine ("-keepattributes SourceFile");
 							xamcfg.WriteLine ("-keepattributes LineNumberTable");
 							xamcfg.WriteLine ($"-printmapping \"{Path.GetFullPath (ProguardMappingFileOutput)}\"");
@@ -124,7 +124,7 @@ protected override CommandLineBuilder GetCommandLineBuilder ()
 				if (IgnoreWarnings) {
 					lines.Add ("-ignorewarnings");
 				}
-				if (!string.IsNullOrEmpty (ProguardMappingFileOutput)) {
+				if (!ProguardMappingFileOutput.IsNullOrEmpty ()) {
 					lines.Add ("-keepattributes SourceFile");
 					lines.Add ("-keepattributes LineNumberTable");
 					lines.Add ($"-printmapping \"{Path.GetFullPath (ProguardMappingFileOutput)}\"");

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public override bool RunTask ()`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`JsonNode? json = JsonNode.Parse ("{}");`
`94`		`- if (!string.IsNullOrEmpty (CustomBuildConfigFile) && File.Exists (CustomBuildConfigFile)) {`
	`94`	`+ if (!CustomBuildConfigFile.IsNullOrEmpty () && File.Exists (CustomBuildConfigFile)) {`
`95`	`95`	`using Stream fs = File.OpenRead (CustomBuildConfigFile);`
`96`	`96`	`using JsonDocument doc = JsonDocument.Parse (fs, new JsonDocumentOptions { AllowTrailingCommas = true });`
`97`	`97`	`json = doc.RootElement.ToNode ();`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public abstract class BundleToolAdbTask : BundleTool`
`23`	`23`
`24`	`24`	`protected void AppendAdbOptions (CommandLineBuilder cmd)`
`25`	`25`	`{`
`26`		`- var adb = string.IsNullOrEmpty (AdbToolExe) ? AdbToolName : AdbToolExe;`
	`26`	`+ var adb = AdbToolExe.IsNullOrEmpty () ? AdbToolName : AdbToolExe;`
`27`	`27`	`cmd.AppendSwitchIfNotNull ("--adb ", Path.Combine (AdbToolPath, adb));`
`28`	`28`
`29`	`29`	`var adbTarget = AdbTarget;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public override bool RunTask ()`
`29`	`29`
`30`	`30`	`foreach (var dex in DalvikClasses) {`
`31`	`31`	`var apkName = dex.GetMetadata ("ApkName");`
`32`		`- var dexPath = string.IsNullOrWhiteSpace (apkName) ? Path.GetFileName (dex.ItemSpec) : apkName;`
	`32`	`+ var dexPath = apkName.IsNullOrWhiteSpace () ? Path.GetFileName (dex.ItemSpec) : apkName;`
`33`	`33`
`34`	`34`	`files.AddItem (dex.ItemSpec, dalvikPath + dexPath);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public abstract class GetAotArguments : AsyncTask`
`80`	`80`	`protected AotMode AotMode;`
`81`	`81`	`protected SequencePointsMode SequencePointsMode;`
`82`	`82`	`protected string SdkBinDirectory = "";`
`83`		`- protected bool UseAndroidNdk => !string.IsNullOrWhiteSpace (AndroidNdkDirectory);`
	`83`	`+ protected bool UseAndroidNdk => !AndroidNdkDirectory.IsNullOrWhiteSpace ();`
`84`	`84`
`85`	`85`	`public static bool GetAndroidAotMode(string androidAotMode, out AotMode aotMode)`
`86`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public override Task RunTaskAsync ()`
`38`	`38`	`SdkBinDirectory = MonoAndroidHelper.GetOSBinPath ();`
`39`	`39`
`40`	`40`	`var abi = AndroidRidAbiHelper.RuntimeIdentifierToAbi (RuntimeIdentifier);`
`41`		`- if (string.IsNullOrEmpty (abi)) {`
	`41`	`+ if (abi.IsNullOrEmpty ()) {`
`42`	`42`	`Log.LogCodedError ("XA0035", Properties.Resources.XA0035, RuntimeIdentifier);`
`43`	`43`	`return Task.CompletedTask;`
`44`	`44`	`}`