Fix ArgumentNullException when SDK resolver is given a null project p…

…ath (#4335) Fixes NuGet/Home#11376
NuGet · Nov 22, 2021 · 3d44676 · 3d44676
1 parent 1fadba7
commit 3d44676
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/src/NuGet.Core/Microsoft.Build.NuGetSdkResolver/GlobalJsonReader.cs b/src/NuGet.Core/Microsoft.Build.NuGetSdkResolver/GlobalJsonReader.cs
@@ -28,6 +28,12 @@ internal static class GlobalJsonReader
         /// <returns>A <see cref="Dictionary{String,String}"/> of MSBuild SDK versions from a global.json if found, otherwise <code>null</code>.</returns>
         public static Dictionary<string, string> GetMSBuildSdkVersions(SdkResolverContext context)
         {
+            if (string.IsNullOrWhiteSpace(context?.ProjectFilePath))
+            {
+                // If the ProjectFilePath is not set, an in-memory project is being evaluated and there's no way to know which directory to start looking for a global.json
+                return null;
+            }
+
             var projectDirectory = Directory.GetParent(context.ProjectFilePath);
 
             if (projectDirectory == null

diff --git a/src/NuGet.Core/Microsoft.Build.NuGetSdkResolver/NuGetSdkResolver.cs b/src/NuGet.Core/Microsoft.Build.NuGetSdkResolver/NuGetSdkResolver.cs
@@ -77,6 +77,15 @@ internal static bool TryGetNuGetVersionForSdk(string id, string version, SdkReso
                 return NuGetAbstraction.TryParseNuGetVersion(version, out parsedVersion);
             }
 
+            parsedVersion = null;
+
+            // Don't try to find versions defined in global.json if the project full path isn't set because an in-memory project is being evaluated and there's no
+            // way to be sure where to look
+            if (string.IsNullOrWhiteSpace(context?.ProjectFilePath))
+            {
+                return false;
+            }
+
             Dictionary<string, string> msbuildSdkVersions;
 
             // Get the SDK versions from a previous state, otherwise find and load global.json to get them
@@ -100,8 +109,6 @@ internal static bool TryGetNuGetVersionForSdk(string id, string version, SdkReso
                 return NuGetAbstraction.TryParseNuGetVersion(globalJsonVersion, out parsedVersion);
             }
 
-            parsedVersion = null;
-
             return false;
         }
 

diff --git a/test/NuGet.Core.Tests/Microsoft.Build.NuGetSdkResolver.Test/GlobalJsonReader_Tests.cs b/test/NuGet.Core.Tests/Microsoft.Build.NuGetSdkResolver.Test/GlobalJsonReader_Tests.cs
@@ -73,6 +73,14 @@ public void InvalidJsonLogsMessage()
             }
         }
 
+        [Fact]
+        public void NullProjectPath()
+        {
+            var context = new MockSdkResolverContext(projectPath: null);
+
+            GlobalJsonReader.GetMSBuildSdkVersions(context).Should().BeNull();
+        }
+
         [Fact]
         public void SdkVersionsAreSuccessfullyLoaded()
         {

diff --git a/test/NuGet.Core.Tests/Microsoft.Build.NuGetSdkResolver.Test/NuGetSdkResolver_Tests.cs b/test/NuGet.Core.Tests/Microsoft.Build.NuGetSdkResolver.Test/NuGetSdkResolver_Tests.cs
@@ -99,6 +99,28 @@ public void TryGetNuGetVersionNoVersionSpecified()
                 context: context);
         }
 
+        [Fact]
+        public void TryGetNuGetVersionNullProjectPath()
+        {
+            var context = new MockSdkResolverContext(projectPath: null);
+
+            VerifyTryGetNuGetVersionForSdk(
+                version: null,
+                expectedVersion: null,
+                context: context);
+        }
+
+        [Fact]
+        public void TryGetNuGetVersionNullProjectPathWithVersion()
+        {
+            var context = new MockSdkResolverContext(projectPath: null);
+
+            VerifyTryGetNuGetVersionForSdk(
+                version: "1.0.0",
+                expectedVersion: NuGetVersion.Parse("1.0.0"),
+                context: context);
+        }
+
         private void VerifyTryGetNuGetVersionForSdk(string version, NuGetVersion expectedVersion, SdkResolverContextBase context = null)
         {
             var result = NuGetSdkResolver.TryGetNuGetVersionForSdk("foo", version, context, out var parsedVersion);