From 7ba27a5ea8c6c23426a2143b6f51a5f19dda6ea8 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:37:42 -0700
Subject: [PATCH] PR Feedback:

- Remove reference to Logging package
- Update FileGlobbing Version to 8.0
- Move Validation target to installer repo-projects project
- Set VSTestUseMSBuildOutput=true in test project file
---
 src/SourceBuild/content/Directory.Build.props       |  2 ++
 src/SourceBuild/content/eng/Versions.props          |  2 +-
 .../content/eng/unifiedBuildValidation.targets      | 13 -------------
 .../content/repo-projects/installer.proj            |  9 ++++++++-
 .../Microsoft.DotNet.UnifiedBuild.Tests.csproj      |  4 +---
 5 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 src/SourceBuild/content/eng/unifiedBuildValidation.targets

diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
index 44fbdcb06..b3265733e 100644
--- a/src/SourceBuild/content/Directory.Build.props
+++ b/src/SourceBuild/content/Directory.Build.props
@@ -137,6 +137,8 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <!-- By default, the VMR builds with online sources when not building source-only. -->
     <DotNetBuildWithOnlineFeeds Condition="'$(DotNetBuildWithOnlineFeeds)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</DotNetBuildWithOnlineFeeds>
+
+    <DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index 20f5ad816..272ed3018 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -33,6 +33,6 @@
     <MicrosoftExtensionsLoggingVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsLoggingVersion>
     <!-- command-line-api -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/SourceBuild/content/eng/unifiedBuildValidation.targets b/src/SourceBuild/content/eng/unifiedBuildValidation.targets
deleted file mode 100644
index df2e94f78..000000000
--- a/src/SourceBuild/content/eng/unifiedBuildValidation.targets
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-
-  <Target Name="RunUnifiedBuildValidation"
-          AfterTargets="Build">
-
-    <MSBuild Projects="../test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj"
-             Targets="VSTest"
-             ContinueOnError="true"
-             Properties="ExcludeFromDotNetBuild=false;VsTestUseMSBuildOutput=true" />
-
-  </Target>
-
-</Project>
diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj
index 78459f997..bbb6d778f 100644
--- a/src/SourceBuild/content/repo-projects/installer.proj
+++ b/src/SourceBuild/content/repo-projects/installer.proj
@@ -148,6 +148,13 @@
           UseHardlinksIfPossible="true" />
   </Target>
 
-  <Import Project="$(RepositoryEngineeringDir)unifiedBuildValidation.targets" Condition="'$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" />
+  <Target Name="RunUnifiedBuildValidation"
+          AfterTargets="Build"
+          Condition="'$(PortableBuild)' == 'true' and '$(PgoInstrument)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'" >
+    <MSBuild Projects="../test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj"
+             Targets="VSTest"
+             ContinueOnError="true"
+             Properties="VsTestUseMSBuildOutput=true" />
+  </Target>
 
 </Project>
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 e61ed0976..9fa6a847b 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
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <!-- Pass 'ExcludeFromDotnetBuild=false' when building: test projects are excluded by default -->
-
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <Nullable>enable</Nullable>
@@ -9,11 +7,11 @@
     <UBTestsWarnOnSdkContentDiffs>true</UBTestsWarnOnSdkContentDiffs>
     <VSTestLogger>console%3bverbosity=diagnostic;trx%3bverbosity=diagnostic%3bLogFileName=Microsoft.DotNet.UnifiedBuild.Tests.xml</VSTestLogger>
     <VSTestResultsDirectory>$(ArtifactsTestResultsDir)</VSTestResultsDirectory>
+    <VsTestUseMSBuildOutput>true</VsTestUseMSBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.2.24128.5" />
   </ItemGroup>
 
   <ItemGroup>