Nullable-enable RunCommand.cs

dotnet · Feb 20, 2025 · 5a5206f · 5a5206f
1 parent 9f51756
commit 5a5206f
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs b/src/Cli/dotnet/commands/dotnet-run/RunCommand.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable enable
+
 using System.Diagnostics;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Exceptions;
@@ -275,6 +277,8 @@ private void EnsureProjectIsBuilt(out Func<ProjectCollection, ProjectInstance>?
             }
             else
             {
+                Debug.Assert(ProjectFileFullPath is not null);
+
                 projectFactory = null;
                 buildResult = new RestoringCommand(
                     RestoreArgs.Prepend(ProjectFileFullPath),
@@ -336,9 +340,14 @@ static ProjectInstance EvaluateProject(string? projectFilePath, Func<ProjectColl
                 AddUserPassedProperties(globalProperties, restoreArgs);
 
                 var collection = new ProjectCollection(globalProperties: globalProperties, loggers: binaryLogger is null ? null : [binaryLogger], toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
-                return projectFilePath is not null
-                    ? collection.LoadProject(projectFilePath).CreateProjectInstance()
-                    : projectFactory(collection);
+
+                if (projectFilePath is not null)
+                {
+                    return collection.LoadProject(projectFilePath).CreateProjectInstance();
+                }
+
+                Debug.Assert(projectFactory is not null);
+                return projectFactory(collection);
             }
 
             static void ValidatePreconditions(ProjectInstance project)
@@ -608,9 +617,10 @@ private static void ThrowUnableToRunError(ProjectInstance project)
 
         private static string? DiscoverProjectFilePath(string? projectFileOrDirectoryPath, ref string[] args, out string? entryPointFilePath)
         {
-            bool emptyProjectOption = string.IsNullOrWhiteSpace(projectFileOrDirectoryPath);
-            if (emptyProjectOption)
+            bool emptyProjectOption = false;
+            if (string.IsNullOrWhiteSpace(projectFileOrDirectoryPath))
             {
+                emptyProjectOption = true;
                 projectFileOrDirectoryPath = Directory.GetCurrentDirectory();
             }