From a29048822eadcf9b338f0fd421139a2b179df69d Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Thu, 28 Mar 2024 18:10:44 -0700
Subject: [PATCH] Set correct test loggers to log all messages from test, add
 msftsdkpath option for debugging

---
 src/SourceBuild/content/eng/unifiedBuildValidation.targets      | 2 +-
 .../content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs  | 1 +
 .../Microsoft.DotNet.UnifiedBuild.Tests.csproj                  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/eng/unifiedBuildValidation.targets b/src/SourceBuild/content/eng/unifiedBuildValidation.targets
index f44a81aa3..c9cca12dc 100644
--- a/src/SourceBuild/content/eng/unifiedBuildValidation.targets
+++ b/src/SourceBuild/content/eng/unifiedBuildValidation.targets
@@ -12,7 +12,7 @@
     <MSBuild Projects="$(UnifiedBuildValidationTestsProject)"
              Targets="VSTest"
              ContinueOnError="WarnAndContinue"
-             Properties="ExcludeFromDotNetBuild=false;VsTestUseMSBuildOutput=false" />
+             Properties="ExcludeFromDotNetBuild=false;VsTestUseMSBuildOutput=true" />
 
   </Target>
 
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
index 80adcabcf..b98834c77 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
index 31301c332..db3655742 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj
@@ -7,10 +7,12 @@
     <Nullable>enable</Nullable>
     <DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);assets/**/*</DefaultExcludesInProjectFolder>
     <UBTestsWarnOnSdkContentDiffs>true</UBTestsWarnOnSdkContentDiffs>
+    <VSTestLogger>console%3bverbosity=diagnostic;trx%3bverbosity=diagnostic</VSTestLogger>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.2.24128.5" />
   </ItemGroup>
 
   <ItemGroup>