Add more log to improve error handling for optional-logger failures

src/MSBuild.UnitTests/Microsoft.Build.CommandLine.UnitTests.csproj

@@ -67,5 +67,10 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Include="TestAssets\**" CopyToOutputDirectory="PreserveNewest" />
+    <Compile Remove="TestAssets\TargetInvocationException\LoggerProject\FaultyLogger.cs" />
+  </ItemGroup>
 
 </Project>

src/MSBuild.UnitTests/TestAssets/MemberAccessException/LoggerProject/CustomLogger.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Build.Framework;
+
+namespace Microsoft.Build.CommandLine.UnitTests.TestAssets.MemberAccessException.LoggerProject
+{
+    public class CustomLogger : ILogger
+    {
+        private CustomLogger()
+        {
+            Console.WriteLine("Private constructor");
+        }
+
+        public string? Parameters { get; set; }
+        public LoggerVerbosity Verbosity { get; set; }
+        public void Initialize(IEventSource eventSource) { }
+        public void Shutdown() { }
+    }
+}

src/MSBuild.UnitTests/TestAssets/MemberAccessException/LoggerProject/CustomLogger.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <AssemblyName>CustomLogger</AssemblyName>
+    <OutputPath>artifacts/bin</OutputPath>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" />
+  </ItemGroup>
+</Project>

src/MSBuild.UnitTests/TestAssets/TargetInvocationException/LoggerProject/FaultyLogger.cs

@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Build.Framework;
+
+namespace Microsoft.Build.CommandLine.UnitTests.TestAssets.TargetInvocationException.LoggerProject
+{
+    public class FaultyLogger : ILogger
+    {
+        public FaultyLogger()
+        {
+            throw new Exception("Constructor failed intentionally.");
+        }
+
+        public string Parameters { get; set; }
+        public LoggerVerbosity Verbosity { get; set; }
+
+        public void Initialize(IEventSource eventSource) { }
+
+        public void Shutdown() { }
+    }
+}

src/MSBuild.UnitTests/TestAssets/TargetInvocationException/LoggerProject/FaultyLogger.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <AssemblyName>FaultyLogger</AssemblyName>
+    <OutputPath>artifacts/bin</OutputPath>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" />
+  </ItemGroup>
+</Project>

src/MSBuild.UnitTests/XMake_Tests.cs

@@ -20,6 +20,7 @@
 using Microsoft.Build.Shared;
 using Microsoft.Build.UnitTests.Shared;
 using Microsoft.Build.Utilities;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 using Shouldly;
 using Xunit;
 using Xunit.Abstractions;
@@ -45,6 +46,8 @@ public XMakeAppTests(ITestOutputHelper output)
             _env = UnitTests.TestEnvironment.Create(_output);
         }
 
+        private static string TestAssetsRootPath { get; } = Path.Combine(Path.Combine(Path.GetDirectoryName(typeof(XMakeAppTests).Assembly.Location) ?? AppContext.BaseDirectory), "TestAssets");
+
         private const string AutoResponseFileName = "MSBuild.rsp";
 
         [Fact]
@@ -2490,6 +2493,99 @@ public void MissingOptionalLoggersAreIgnored(string logger, string expectedLogge
             output.ShouldContain($"The specified logger \"{expectedLoggerName}\" could not be created and will not be used.", customMessage: output);
         }
 
+        [Theory]
+        [InlineData("-logger:,CustomLogger.dll", "CustomLogger.dll")]
+        [InlineData("-logger:,Logger.dll", "Logger.dll")]
+        public void LoggerThrowsIOExceptionWhenDllNotFound(string logger, string expectedLoggerName)
+        {
+            string projectString ="<Project><Target Name=\"t\"><Message Text=\"Hello\"/></Target></Project>";
+            var tempDir = _env.CreateFolder();
+            var projectFile = tempDir.CreateFile("iologgertest.proj", projectString);
+
+            var parametersLogger = $"{logger} -verbosity:diagnostic \"{projectFile.Path}\"";
+
+            var output = RunnerUtilities.ExecMSBuild(parametersLogger, out bool successfulExit, _output);
+            successfulExit.ShouldBe(false);
+
+            output.ShouldContain($"Cannot create an instance of the logger {expectedLoggerName}.", customMessage: output);
+        }
+
+        [Theory]
+        [InlineData("-logger:,BadFile.dll", "BadFile.dll")]
+        [InlineData("-distributedlogger:,BadFile.dll", "BadFile.dll")]
+        public void LoggerThrowsBadImageFormatExceptionWhenFileIsInvalid(string logger, string expectedLoggerName)
+        {
+            string projectString ="<Project><Target Name=\"t\"><Message Text=\"Hello\"/></Target></Project>";
+            var tempDir = _env.CreateFolder();
+            var projectFile = tempDir.CreateFile("badimagetest.proj", projectString);
+
+            var dllFilePath = Path.Combine(tempDir.Path, expectedLoggerName);
+            File.WriteAllText(dllFilePath, "Invalid content, not a valid .NET assembly.");
+
+            var loggerParam = $"\"{logger}\"";
+            var parametersLogger = $"{loggerParam} -verbosity:diagnostic \"{projectFile.Path}\"";
+
+            var output = RunnerUtilities.ExecMSBuild(parametersLogger, out bool successfulExit, _output);
+            successfulExit.ShouldBe(false);
+
+            output.ShouldContain($"Cannot create an instance of the logger {expectedLoggerName}.", customMessage: output);
+        }
+
+        [Theory]
+        [InlineData("MemberAccessException", "-logger:,", "CustomLogger.dll")]
+        [InlineData("MemberAccessException", "-distributedlogger:,", "CustomLogger.dll")]
+        public void LoggerThrowsMemberAccessExceptionWhenClassIsInvalid(string memberAccess, string loggerTemplate, string expectedLoggerName)
+        {
+            using (var env = TestEnvironment.Create())
+            {
+                string projectContent = "<Project><Target Name=\"t\"><Message Text=\"Hello\"/></Target></Project>";
+                var tempDir = _env.CreateFolder();
+
+                (string projectFilePath, string tempLoggerProjDir) = CopyTestAssetsToTestEnv(tempDir, projectContent, memberAccess);
+
+                string loggerBuildLog = RunnerUtilities.ExecBootstrapedMSBuild(
+                    $"\"{Path.Combine(tempLoggerProjDir, "CustomLogger.csproj")}\" -restore -verbosity:n", out bool success);
+
+                var loggerDllPath = Path.Combine(tempLoggerProjDir, "artifacts", "bin", "netstandard2.0", expectedLoggerName);
+                var loggerSwitch = $"{loggerTemplate}\"{loggerDllPath}\"";
+                var mainBuildParameters = $"\"{projectFilePath}\" -restore {loggerSwitch} -verbosity:diagnostic";
+
+                string mainBuildLog = RunnerUtilities.ExecBootstrapedMSBuild(
+                    mainBuildParameters,
+                    out bool successfulExit);
+
+                mainBuildLog.ShouldContain($"Cannot create an instance of the logger {loggerDllPath}.", customMessage: mainBuildLog);
+            }
+        }
+
+        [Theory]
+        [InlineData("TargetInvocationException", "-logger:,", "FaultyLogger.dll")]
+        [InlineData("TargetInvocationException", "-distributedlogger:,", "FaultyLogger.dll")]
+        public void LoggerThrowsTargetInvocationException(string targetInvocation, string loggerTemplate, string expectedLoggerName)
+        {
+            using (var env = TestEnvironment.Create())
+            {
+                string projectContent = "<Project><Target Name=\"t\"><Message Text=\"Hello\"/></Target></Project>";
+                var tempDir = _env.CreateFolder();
+
+                (string projectFilePath, string tempLoggerProjDir) = CopyTestAssetsToTestEnv(tempDir, projectContent, targetInvocation);
+
+                string loggerBuildLog = RunnerUtilities.ExecBootstrapedMSBuild(
+                $"{Path.Combine(tempLoggerProjDir, $"FaultyLogger.csproj")} -restore -verbosity:n", out bool success);
+
+                var loggerDllPath = Path.Combine(tempLoggerProjDir, "artifacts", "bin", "netstandard2.0", expectedLoggerName);
+                var loggerSwitch = $"{loggerTemplate}{loggerDllPath}";
+                var mainBuildParameters = $"{projectFilePath} -restore {loggerSwitch} -verbosity:diagnostic";
+
+                string mainBuildLog = RunnerUtilities.ExecBootstrapedMSBuild(
+                    mainBuildParameters,
+                    out bool successfulExit);
+
+                successfulExit.ShouldBeFalse(mainBuildLog);
+                mainBuildLog.ShouldContain("The logger failed unexpectedly.");
+            }
+        }
+
         [Theory]
         [InlineData("/interactive")]
         [InlineData("/p:NuGetInteractive=true")]
@@ -2849,6 +2945,26 @@ private string ExecuteMSBuildExeExpectFailure(string projectContents, IDictionar
             return (success, output);
         }
 
+        private (string projectFilePath, string tempLoggerProjDir) CopyTestAssetsToTestEnv(TransientTestFolder tempDir, string projectContent, string folderName)
+        {
+            var testAssetsPath = Path.Combine(TestAssetsRootPath, folderName);
+            var loggerProjDir = Path.Combine(testAssetsPath, "LoggerProject");
+
+            var projectFile = tempDir.CreateFile("loggerproject.proj", projectContent);
+
+            var tempLoggerProjDir = Path.Combine(tempDir.Path, "LoggerProject");
+            Directory.CreateDirectory(tempLoggerProjDir);
+
+            foreach (var file in Directory.GetFiles(loggerProjDir, "*.*", SearchOption.AllDirectories))
+            {
+                var relativePath = file.Substring(loggerProjDir.Length + 1);
+                var destPath = Path.Combine(tempLoggerProjDir, relativePath);
+                Directory.CreateDirectory(Path.GetDirectoryName(destPath));
+                File.Copy(file, destPath, true);
+            }
+            return (projectFile.Path, tempLoggerProjDir);
+        }
+
         public void Dispose()
         {
             _env.Dispose();

src/MSBuild/InitializationException.cs

@@ -157,6 +157,28 @@ internal static void Throw(string messageResourceName, string invalidSwitch, Exc
             InitializationException.Throw(errorMessage, invalidSwitch);
         }
 
+        /// <summary>
+        /// Throws the exception using the given exception context and can include the logger name.
+        /// </summary>
+        internal static void Throw(string messageResourceName, string invalidSwitch, Exception e, bool showStackTrace, params object[] formatArgs)
+        {
+            string errorMessage = AssemblyResources.GetString(messageResourceName);
+
+            ErrorUtilities.VerifyThrow(errorMessage != null, "The resource string must exist.");
+
+            // the exception message can contain a format item i.e.
+            // "{0}" to hold the logger name
+            // "{1}" to hold the given exception's message
+            errorMessage = ResourceUtilities.FormatString(errorMessage, formatArgs);
+
+            if (showStackTrace && e != null)
+            {            
+                errorMessage += Environment.NewLine + e.ToString();
+            }
+
+            InitializationException.Throw(errorMessage, invalidSwitch);
+        }
+
         /// <summary>
         /// Throws the exception if the specified condition is not met.
         /// </summary>

src/MSBuild/Resources/Strings.resx

@@ -1513,7 +1513,7 @@
     <comment>{StrBegin="MSBUILD : error MSB1059: "}</comment>
   </data>
   <data name="XMake.LoggerCreationError" xml:space="preserve">
-    <value>MSBUILD : error MSB1021: Cannot create an instance of the logger. {0}</value>
+    <value>MSBUILD : error MSB1021: Cannot create an instance of the logger {0}. {1}</value>
     <comment>{StrBegin="MSBUILD : error MSB1021: "}
       UE: This error is shown when a logger cannot be loaded and instantiated from its assembly.
       LOCALIZATION: The prefix "MSBUILD : error MSBxxxx:" should not be localized. {0} contains a message explaining why the