Load dotnet.dll

Author: jjonescz

src/NuGet.Core/NuGet.CommandLine.XPlat/NuGetCommands.cs

@@ -5,7 +5,9 @@
 
 using System;
 using System.CommandLine;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using NuGet.CommandLine.XPlat.Commands.Package.PackageDownload;
@@ -18,8 +20,6 @@ namespace NuGet.CommandLine.XPlat;
 /// </summary>
 public static class NuGetCommands
 {
-    public static IVirtualProjectBuilder? VirtualProjectBuilder { get; set; }
-
     /// <summary>
     /// <para>Adds NuGet's dotnet CLI commands to the dotnet CLI RootCommand object</para>
     /// </summary>
@@ -57,4 +57,19 @@ public interface IVirtualProjectBuilder
     bool IsValidEntryPointPath(string entryPointFilePath);
 
     ProjectRootElement CreateProjectRootElement(string entryPointFilePath, ProjectCollection projectCollection);
+
+    internal static IVirtualProjectBuilder? TryLoad()
+    {
+        var assemblyPath = Path.Join(AppContext.BaseDirectory, "dotnet.dll");
+
+        if (!File.Exists(assemblyPath))
+        {
+            return null;
+        }
+
+        var type = Assembly.LoadFile(assemblyPath)
+            .GetExportedTypes()
+            .FirstOrDefault(static t => t.IsAssignableTo(typeof(IVirtualProjectBuilder)));
+        return type != null ? (IVirtualProjectBuilder?)Activator.CreateInstance(type) : null;
+    }
 }

src/NuGet.Core/NuGet.CommandLine.XPlat/PublicAPI.Unshipped.txt

@@ -2,5 +2,3 @@
 NuGet.CommandLine.XPlat.IVirtualProjectBuilder
 NuGet.CommandLine.XPlat.IVirtualProjectBuilder.CreateProjectRootElement(string! entryPointFilePath, Microsoft.Build.Evaluation.ProjectCollection! projectCollection) -> Microsoft.Build.Construction.ProjectRootElement!
 NuGet.CommandLine.XPlat.IVirtualProjectBuilder.IsValidEntryPointPath(string! entryPointFilePath) -> bool
-static NuGet.CommandLine.XPlat.NuGetCommands.VirtualProjectBuilder.get -> NuGet.CommandLine.XPlat.IVirtualProjectBuilder?
-static NuGet.CommandLine.XPlat.NuGetCommands.VirtualProjectBuilder.set -> void

src/NuGet.Core/NuGet.CommandLine.XPlat/Utility/MSBuildAPIUtility.cs

@@ -1039,7 +1039,7 @@ private static IEnumerable<string> GetProjectFrameworks(Project project)
 
         private static ProjectRootElement TryOpenProjectRootElement(string filename)
         {
-            var virtualProjectBuilder = NuGetCommands.VirtualProjectBuilder;
+            var virtualProjectBuilder = IVirtualProjectBuilder.TryLoad();
             if (virtualProjectBuilder != null && virtualProjectBuilder.IsValidEntryPointPath(filename))
             {
                 return virtualProjectBuilder.CreateProjectRootElement(filename, ProjectCollection.GlobalProjectCollection);