From de978a13d1f504156d5f2f4d59d9743e669f811e Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 26 Mar 2026 11:14:39 +0100 Subject: [PATCH] [msbuild] Enable nullability for the remaining files in this directory. And fix any resulting issues. --- msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs | 7 +++---- msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs b/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs index fe53a8bd7438..03042309e8b0 100644 --- a/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs +++ b/msbuild/Messaging/Xamarin.Messaging.Build/BuildAgent.cs @@ -5,14 +5,13 @@ using Xamarin.Messaging.Build.Contracts; using Xamarin.Messaging.Client; -// Disable until we get around to enable + fix any issues. -#nullable disable +#nullable enable namespace Xamarin.Messaging.Build { public class BuildAgent : Agent { readonly AgentInfo buildAgentInfo; - public BuildAgent (ITopicGenerator topicGenerator, string version = null, string versionInfo = null) : base (topicGenerator) + public BuildAgent (ITopicGenerator topicGenerator, string? version = null, string? versionInfo = null) : base (topicGenerator) { Version = string.IsNullOrEmpty (version) ? GetVersion () : version; VersionInfo = string.IsNullOrEmpty (versionInfo) ? GetInformationalVersion () : versionInfo; @@ -68,7 +67,7 @@ void SetLicenseEnvironmentVariables () Environment.SetEnvironmentVariable ("VSIDE", "true"); var assemblyLocation = this.GetType ().Assembly.Location; - var path = Path.GetDirectoryName (assemblyLocation); + var path = Path.GetDirectoryName (assemblyLocation)!; AddValueToEnvVariable ("MONO_GAC_PREFIX", path); AddValueToEnvVariable ("PATH", path); diff --git a/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs b/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs index 265ab631199f..6e27f8a6003a 100644 --- a/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs +++ b/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs @@ -9,8 +9,7 @@ using Xamarin.Messaging.Build.Properties; using Xamarin.Messaging.Build.Serialization; -// Disable until we get around to enable + fix any issues. -#nullable disable +#nullable enable namespace Xamarin.Messaging.Build { internal class TaskRunner : ITaskRunner { @@ -39,7 +38,7 @@ public ExecuteTaskResult Execute (string taskName, string inputs) throw new ArgumentException (string.Format (Resources.TaskRunner_Execute_Error, taskName), nameof (taskName)); } - var task = serializer.Deserialize (inputs, taskType) as Task; + var task = (Task) serializer.Deserialize (inputs, taskType); var buildEngine = new BuildEngine (); task.BuildEngine = buildEngine; @@ -64,7 +63,7 @@ void SetDotNetVariables () } else { //In case the XMA dotnet has not been installed yet, we use the default dotnet installation xmaDotNetPath = GetDefaultDotNetPath (); - xmaDotNetRootPath = Path.GetDirectoryName (xmaDotNetPath); + xmaDotNetRootPath = Path.GetDirectoryName (xmaDotNetPath)!; } //We want to define a custom home for dotnet only if it's the Pair To Mac SDK installation