Early bind Microsoft.Build.CommandLine.MSBuildApp

Author: ladipro

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs

@@ -6,7 +6,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -116,18 +115,14 @@ public int ExecuteInProc(string[] arguments)
                     Environment.SetEnvironmentVariable(kvp.Key, kvp.Value);
                 }
 
-                Assembly assembly = Assembly.LoadFrom(_msbuildPath);
-                Type type = assembly.GetType(MSBuildAppClassName);
-                MethodInfo mi = type.GetMethod("Main");
-
                 try
                 {
-                    return (int)mi.Invoke(null, new object[] { arguments });
+                    return Microsoft.Build.CommandLine.MSBuildApp.Main(arguments);
                 }
-                catch (TargetInvocationException targetException)
+                catch (Exception exception)
                 {
                     Console.Error.Write("Unhandled exception: ");
-                    Console.Error.WriteLine(targetException.InnerException.ToString());
+                    Console.Error.WriteLine(exception.ToString());
 
                     return unchecked((int)0xe0434352); // EXCEPTION_COMPLUS
                 }

src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingPackageVersion)" />
@@ -28,6 +28,7 @@
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
+    <Reference Include="$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net5.0\ref\MSBuild.dll" Private="True" />
   </ItemGroup>
 
 </Project>