Migrate MSBuild tests from xUnit v2 to xUnit v3

Directory.Packages.props

@@ -15,10 +15,10 @@
      -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(NuGetBuildTasksVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Collections" Version="$(MicrosoftCodeAnalysisCollectionsVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Contracts" Version="$(MicrosoftCodeAnalysisContractsVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PooledObjects" Version="$(MicrosoftCodeAnalysisPooledObjectsVersion)" />
-    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
     <PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistVersion)" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" Condition="'$(UsingToolMicrosoftNetCompilers)' != 'true'" />
     <PackageVersion Include="NuGet.Build.Tasks" Version="$(NuGetBuildTasksVersion)" />
@@ -46,7 +46,6 @@
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
     <PackageVersion Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
-    <PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
     <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
   </ItemGroup>

eng/dependabot/Directory.Packages.props

@@ -50,8 +50,8 @@
     <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
     <PackageVersion Update="Microsoft.VisualStudio.SolutionPersistence" Condition="'$(MicrosoftVisualStudioSolutionPersistenceVersion)' != ''" Version="$(MicrosoftVisualStudioSolutionPersistenceVersion)" />
 
-    <PackageVersion Include="Verify.Xunit" Version="19.14.1" />
-    <PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
+    <PackageVersion Include="Verify.XunitV3" Version="28.12.0" />
+    <PackageVersion Update="Verify.XunitV3" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">

src/Build.OM.UnitTests/Construction/ProjectFormatting_Tests.cs

@@ -12,7 +12,6 @@
 using Microsoft.Build.Shared;
 using Microsoft.Build.UnitTests;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.OM.UnitTests/Construction/ProjectMetadataElement_Tests.cs

@@ -8,7 +8,6 @@
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using Xunit;
-using Xunit.Abstractions;
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
 
 #nullable disable

src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs

@@ -14,7 +14,6 @@
 using Microsoft.Build.Utilities;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
 
 #nullable disable

src/Build.OM.UnitTests/Definition/Project_Tests.cs

@@ -17,7 +17,6 @@
 using Microsoft.Build.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using GlobResultList = System.Collections.Generic.List<(string, string[], System.Collections.Immutable.ImmutableHashSet<string>, System.Collections.Immutable.ImmutableHashSet<string>)>;
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
 // can't use an actual ProvenanceResult because it points to a ProjectItemElement which is hard to mock.

src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs

@@ -11,7 +11,6 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Xunit;
-using Xunit.Abstractions;
 using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord;
 
 #nullable disable

src/Build.OM.UnitTests/NugetRestoreTests.cs

@@ -7,7 +7,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.Engine.OM.UnitTests
 {

src/Build.UnitTests/BackEnd/AppHostSupport_Tests.cs

@@ -11,7 +11,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BackEnd/AssemblyTaskFactory_E2E_Tests.cs

@@ -8,7 +8,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.Engine.UnitTests
 {

src/Build.UnitTests/BackEnd/BuildManager_Logging_Tests.cs

@@ -14,7 +14,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.UnitTests.ObjectModelHelpers;
 
 #nullable disable

src/Build.UnitTests/BackEnd/BuildManager_Tests.cs

@@ -24,7 +24,6 @@
 using Microsoft.Build.Utilities;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.UnitTests.ObjectModelHelpers;
 using Constants = Microsoft.Build.Framework.Constants;
 

src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs

@@ -16,7 +16,6 @@
 using Microsoft.Build.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BackEnd/LoggingContext_Tests.cs

@@ -5,7 +5,6 @@
 using Microsoft.Build.Framework;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BackEnd/MSBuild_Tests.cs

@@ -13,7 +13,6 @@
 using Microsoft.Build.Utilities;
 
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BackEnd/SdkResolverLoader_Tests.cs

@@ -15,7 +15,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using Exception = System.Exception;
 using SdkResolverBase = Microsoft.Build.Framework.SdkResolver;
 using SdkResolverContextBase = Microsoft.Build.Framework.SdkResolverContext;

src/Build.UnitTests/BackEnd/SdkResultOutOfProc_Tests.cs

@@ -16,7 +16,6 @@
 using Microsoft.Build.Unittest;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.UnitTests.ObjectModelHelpers;
 
 #nullable disable

src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs

@@ -17,7 +17,6 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Xunit;
-using Xunit.Abstractions;
 using ElementLocation = Microsoft.Build.Construction.ElementLocation;
 
 #nullable disable

src/Build.UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs

@@ -15,7 +15,6 @@
 using Microsoft.Build.Shared;
 using Microsoft.Win32.SafeHandles;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs

@@ -18,7 +18,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using ElementLocation = Microsoft.Build.Construction.ElementLocation;
 using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService;
 using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData;

src/Build.UnitTests/BackEnd/TaskHostCallback_Tests.cs

@@ -9,7 +9,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.UnitTests.BackEnd
 {

src/Build.UnitTests/BackEnd/TaskHostFactory_Tests.cs

@@ -13,7 +13,6 @@
 
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BackEnd/TaskHost_MultiThreadableTask_Tests.cs

@@ -12,7 +12,6 @@
 using Microsoft.Build.Utilities;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.Engine.UnitTests.BackEnd
 {

src/Build.UnitTests/BackEnd/TaskRegistry_Tests.cs

@@ -20,7 +20,6 @@
 using Microsoft.Build.Utilities;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
 
 #nullable disable

src/Build.UnitTests/BackEnd/TaskRouter_IntegrationTests.cs

@@ -13,7 +13,6 @@
 using Microsoft.Build.Utilities;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/BinaryLogger_Tests.cs

@@ -18,7 +18,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/CLR2TaskHost_E2E_Tests.cs

@@ -6,7 +6,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.Engine.UnitTests;
 

src/Build.UnitTests/ChangeWaves_Tests.cs

@@ -8,7 +8,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/ConsoleLogger_Tests.cs

@@ -17,7 +17,6 @@
 using Microsoft.Build.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem;
 
 #nullable disable

src/Build.UnitTests/Construction/SolutionFile_NewParser_Tests.cs

@@ -12,7 +12,6 @@
 using Microsoft.VisualStudio.SolutionPersistence.Serializer;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/Construction/SolutionFile_OldParser_Tests.cs

@@ -12,7 +12,6 @@
 using Microsoft.Build.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/Construction/SolutionFilter_Tests.cs

@@ -20,7 +20,6 @@
 using Microsoft.VisualStudio.SolutionPersistence.Serializer;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.Engine.UnitTests.Construction
 {

src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs

@@ -13,7 +13,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using FrameworkLocationHelper = Microsoft.Build.Shared.FrameworkLocationHelper;
 using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService;
 using InternalUtilities = Microsoft.Build.Internal.Utilities;

src/Build.UnitTests/EndToEndCondition_Tests.cs

@@ -5,7 +5,6 @@
 
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/EscapingInProjects_Tests.cs

@@ -22,7 +22,6 @@
 using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 #if FEATURE_COMPILE_IN_TESTS
 using Microsoft.Build.Shared;
 #endif

src/Build.UnitTests/Evaluation/ExpanderFunction_Tests.cs

@@ -7,7 +7,6 @@
 using Shouldly;
 
 using Xunit;
-using Xunit.Abstractions;
 using ParseArgs = Microsoft.Build.Evaluation.Expander.ArgumentParser;
 
 namespace Microsoft.Build.Engine.UnitTests.Evaluation

src/Build.UnitTests/Evaluation/Expander_Tests.cs

@@ -26,7 +26,6 @@
 using Microsoft.Win32;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using Xunit.NetCore.Extensions;
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
 using ProjectHelpers = Microsoft.Build.UnitTests.BackEnd.ProjectHelpers;
@@ -5133,6 +5132,8 @@ public void ExpandItem_ConvertToStringUsingInvariantCultureForNumberData_Respect
                 using (var env = TestEnvironment.Create())
                 {
                     env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_12.ToString());
+                    ChangeWaves.ResetStateForTests();
+
                     currentThread.CurrentCulture = svSECultureInfo;
                     currentThread.CurrentUICulture = svSECultureInfo;
                     var root = env.CreateFolder();

src/Build.UnitTests/Evaluation/SdkResultEvaluation_Tests.cs

@@ -14,7 +14,6 @@
 using Microsoft.Build.Unittest;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/EvaluationProfiler_Tests.cs

@@ -12,7 +12,6 @@
 using Microsoft.Build.Logging;
 using Microsoft.Build.UnitTests;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.UnitTests.ObjectModelHelpers;
 
 #nullable disable

src/Build.UnitTests/ExpressionTreeExpression_Tests.cs

@@ -12,7 +12,6 @@
 using Microsoft.Build.Execution;
 using Microsoft.Build.Shared.FileSystem;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/Graph/GraphLoadedFromSolution_tests.cs

@@ -13,7 +13,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.Graph.UnitTests.GraphTestingUtilities;
 using static Microsoft.Build.UnitTests.Helpers;
 

src/Build.UnitTests/Graph/IsolateProjects_Tests.cs

@@ -11,7 +11,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using ExpectedNodeBuildOutput = System.Collections.Generic.Dictionary<Microsoft.Build.Graph.ProjectGraphNode, string[]>;
 using OutputCacheDictionary = System.Collections.Generic.Dictionary<Microsoft.Build.Graph.ProjectGraphNode, string>;
 

src/Build.UnitTests/Graph/ProjectGraph_Tests.cs

@@ -17,7 +17,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using Xunit.NetCore.Extensions;
 using static Microsoft.Build.Graph.UnitTests.GraphTestingUtilities;
 

src/Build.UnitTests/Graph/ResultCacheBasedBuilds_Tests.cs

@@ -14,7 +14,6 @@
 using Microsoft.Build.UnitTests;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.UnitTests.Helpers;
 
 using ExpectedNodeBuildOutput = System.Collections.Generic.Dictionary<Microsoft.Build.Graph.ProjectGraphNode, string[]>;

src/Build.UnitTests/Instance/ProjectInstance_Internal_Tests.cs

@@ -16,7 +16,6 @@
 using Microsoft.Build.UnitTests.BackEnd;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 using static Microsoft.Build.Engine.UnitTests.TestComparers.ProjectInstanceModelTestComparers;
 
 #nullable disable

src/Build.UnitTests/InvalidProjectFileException_Tests.cs

@@ -6,7 +6,6 @@
 using Microsoft.Build.Exceptions;
 
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable disable
 

src/Build.UnitTests/MSBuildTaskHostTests.cs

@@ -9,7 +9,6 @@
 using Microsoft.Build.UnitTests.Shared;
 using Shouldly;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Build.Engine.UnitTests;