Make virtual project builder parameter required in MSBuildAPIUtility (#7233)

jjonescz · web-flow · commit 9131f7118cf7 · 2026-03-26T09:58:22.000-07:00
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Utility/MSBuildAPIUtility.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Utility/MSBuildAPIUtility.cs
@@ -48,7 +48,7 @@ internal class MSBuildAPIUtility
 
         public IVirtualProjectBuilder VirtualProjectBuilder { get; }
 
-        public MSBuildAPIUtility(ILogger logger, IVirtualProjectBuilder virtualProjectBuilder = null)
+        public MSBuildAPIUtility(ILogger logger, IVirtualProjectBuilder virtualProjectBuilder)
         {
             Logger = logger ?? throw new ArgumentNullException(nameof(logger));
             VirtualProjectBuilder = virtualProjectBuilder;
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/CommitAsyncTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/CommitAsyncTests.cs
@@ -20,7 +20,7 @@ public class CommitAsyncTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetDependencyGraphSpecTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetDependencyGraphSpecTests.cs
@@ -18,7 +18,7 @@ public class GetDependencyGraphSpecTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetKnownVulnerabilitiesAsyncTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetKnownVulnerabilitiesAsyncTests.cs
@@ -22,7 +22,7 @@ public class GetKnownVulnerabilitiesAsyncTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetLatestVersionAsyncTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetLatestVersionAsyncTests.cs
@@ -19,7 +19,7 @@ public class GetLatestVersionAsyncTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetNonVulnerableAsyncTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetNonVulnerableAsyncTests.cs
@@ -22,7 +22,7 @@ public class GetNonVulnerableAsyncTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetPackageSourceMappingTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetPackageSourceMappingTests.cs
@@ -16,7 +16,7 @@ public class GetPackageSourceMappingTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetProjectAssetsFileAsyncTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/GetProjectAssetsFileAsyncTests.cs
@@ -17,7 +17,7 @@ public class GetProjectAssetsFileAsyncTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/PreviewUpdatePackageReferenceAsyncTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/Commands/Package/Update/PackageUpdateIOTests/PreviewUpdatePackageReferenceAsyncTests.cs
@@ -18,7 +18,7 @@ public class PreviewUpdatePackageReferenceAsyncTests
 {
     private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)
     {
-        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);
+        var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);
         var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);
         return packageUpdateIO;
     }
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/ListPackageTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/ListPackageTests.cs
@@ -224,7 +224,7 @@ await SimpleTestPackageUtility.CreatePackagesAsync(
             using TextWriter consoleOut = new StringWriter(output);
             using TextWriter consoleError = new StringWriter(error);
             var logger = new TestLogger(_testOutputHelper);
-            ListPackageCommandRunner listPackageCommandRunner = new(new MSBuildAPIUtility(logger));
+            ListPackageCommandRunner listPackageCommandRunner = new(new MSBuildAPIUtility(logger, virtualProjectBuilder: null));
             var packageRefArgs = new ListPackageArgs(
                                         path: Path.Combine(pathContext.SolutionRoot, "solution.sln"),
                                         packageSources: [new(mockServer.ServiceIndexUri)],
@@ -333,7 +333,7 @@ await SimpleTestPackageUtility.CreatePackagesAsync(
             using TextWriter consoleOut = new StringWriter(output);
             using TextWriter consoleError = new StringWriter(error);
             var logger = new TestLogger(_testOutputHelper);
-            ListPackageCommandRunner listPackageCommandRunner = new(new MSBuildAPIUtility(logger));
+            ListPackageCommandRunner listPackageCommandRunner = new(new MSBuildAPIUtility(logger, virtualProjectBuilder: null));
             var packageRefArgs = new ListPackageArgs(
                                         path: solution.SolutionPath,
                                         packageSources: [new PackageSource(pathContext.PackageSource)],
@@ -428,7 +428,7 @@ public async Task GetReportDataAsync_WhenReportTypeIsVulnerable_ShouldUseAuditSo
                 CancellationToken.None
             );
 
-            var listPackageCommandRunner = new ListPackageCommandRunner(new MSBuildAPIUtility(mockLogger.Object));
+            var listPackageCommandRunner = new ListPackageCommandRunner(new MSBuildAPIUtility(mockLogger.Object, virtualProjectBuilder: null));
 
 
             // Act
@@ -474,7 +474,7 @@ public async Task GetReportDataAsync_WithSolutionFilePassed_ShouldList()
                 CancellationToken.None
             );
 
-            var listPackageCommandRunner = new ListPackageCommandRunner(new MSBuildAPIUtility(mockLogger.Object));
+            var listPackageCommandRunner = new ListPackageCommandRunner(new MSBuildAPIUtility(mockLogger.Object, virtualProjectBuilder: null));
 
             // Act
             var result = await listPackageCommandRunner.GetReportDataAsync(listPackageArgs);
@@ -529,7 +529,7 @@ public async Task GetReportDataAsync_WhenReportTypeIsVulnerableAuditSourcesWithN
                 CancellationToken.None
             );
 
-            var listPackageCommandRunner = new ListPackageCommandRunner(new MSBuildAPIUtility(mockLogger.Object));
+            var listPackageCommandRunner = new ListPackageCommandRunner(new MSBuildAPIUtility(mockLogger.Object, virtualProjectBuilder: null));
 
             // Act
             var result = await listPackageCommandRunner.GetReportDataAsync(listPackageArgs);
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/XPlatAddPkgTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/XPlatAddPkgTests.cs
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/XPlatWhyTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/XPlatWhyTests.cs
diff --git a/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/XplatRemovePkgTests.cs b/test/NuGet.Core.FuncTests/NuGet.XPlat.FuncTest/XplatRemovePkgTests.cs
diff --git a/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/ListPackageCommandRunnerTests.cs b/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/ListPackageCommandRunnerTests.cs
diff --git a/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/MSBuildAPIUtilityTests.cs b/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/MSBuildAPIUtilityTests.cs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ internal class MSBuildAPIUtility`
`48`	`48`
`49`	`49`	`public IVirtualProjectBuilder VirtualProjectBuilder { get; }`
`50`	`50`
`51`		`- public MSBuildAPIUtility(ILogger logger, IVirtualProjectBuilder virtualProjectBuilder = null)`
	`51`	`+ public MSBuildAPIUtility(ILogger logger, IVirtualProjectBuilder virtualProjectBuilder)`
`52`	`52`	`{`
`53`	`53`	`Logger = logger ?? throw new ArgumentNullException(nameof(logger));`
`54`	`54`	`VirtualProjectBuilder = virtualProjectBuilder;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class CommitAsyncTests`
`20`	`20`	`{`
`21`	`21`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`22`	`22`	`{`
`23`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`23`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`24`	`24`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`25`	`25`	`return packageUpdateIO;`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class GetDependencyGraphSpecTests`
`18`	`18`	`{`
`19`	`19`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`20`	`20`	`{`
`21`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`21`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`22`	`22`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`23`	`23`	`return packageUpdateIO;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class GetKnownVulnerabilitiesAsyncTests`
`22`	`22`	`{`
`23`	`23`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`24`	`24`	`{`
`25`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`25`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`26`	`26`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`27`	`27`	`return packageUpdateIO;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class GetLatestVersionAsyncTests`
`19`	`19`	`{`
`20`	`20`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`21`	`21`	`{`
`22`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`22`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`23`	`23`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`24`	`24`	`return packageUpdateIO;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class GetNonVulnerableAsyncTests`
`22`	`22`	`{`
`23`	`23`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`24`	`24`	`{`
`25`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`25`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`26`	`26`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`27`	`27`	`return packageUpdateIO;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class GetPackageSourceMappingTests`
`16`	`16`	`{`
`17`	`17`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`18`	`18`	`{`
`19`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`19`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`20`	`20`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`21`	`21`	`return packageUpdateIO;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class GetProjectAssetsFileAsyncTests`
`17`	`17`	`{`
`18`	`18`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`19`	`19`	`{`
`20`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`20`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`21`	`21`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`22`	`22`	`return packageUpdateIO;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class PreviewUpdatePackageReferenceAsyncTests`
`18`	`18`	`{`
`19`	`19`	`private static PackageUpdateIO CreatePackageUpdateIO(string solutionRoot)`
`20`	`20`	`{`
`21`		`- var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance);`
	`21`	`+ var msbuildUtility = new MSBuildAPIUtility(NullLogger.Instance, virtualProjectBuilder: null);`
`22`	`22`	`var packageUpdateIO = new PackageUpdateIO(solutionRoot, msbuildUtility, TestEnvironmentVariableReader.EmptyInstance);`
`23`	`23`	`return packageUpdateIO;`
`24`	`24`	`}`