@@ -15,8 +15,6 @@ namespace Microsoft.DotNet.Cli.Commands.Test;
15
15
16
16
internal static class MSBuildUtility
17
17
{
18
- private const string dotnetTestVerb = "dotnet-test" ;
19
-
20
18
public static ( IEnumerable < ParallelizableTestModuleGroupWithSequentialInnerModules > Projects , bool IsBuiltOrRestored ) GetProjectsFromSolution ( string solutionFilePath , BuildOptions buildOptions )
21
19
{
22
20
SolutionModel solutionModel = SlnFileFactory . CreateFromFileOrDirectory ( solutionFilePath , includeSolutionFilterFiles : true , includeSolutionXmlFiles : true ) ;
@@ -32,11 +30,9 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
32
30
Path . GetDirectoryName ( solutionModel . Description ) ! :
33
31
SolutionAndProjectUtility . GetRootDirectory ( solutionFilePath ) ;
34
32
35
- FacadeLogger ? logger = LoggerUtility . DetermineBinlogger ( [ .. buildOptions . MSBuildArgs ] , dotnetTestVerb ) ;
36
- var collection = new ProjectCollection ( globalProperties : CommonRunHelpers . GetGlobalPropertiesFromArgs ( [ .. buildOptions . MSBuildArgs ] ) , loggers : logger is null ? null : [ logger ] , toolsetDefinitionLocations : ToolsetDefinitionLocations . Default ) ;
33
+ var collection = new ProjectCollection ( globalProperties : CommonRunHelpers . GetGlobalPropertiesFromArgs ( [ .. buildOptions . MSBuildArgs ] ) , null , toolsetDefinitionLocations : ToolsetDefinitionLocations . Default ) ;
37
34
38
35
ConcurrentBag < ParallelizableTestModuleGroupWithSequentialInnerModules > projects = GetProjectsProperties ( collection , solutionModel . SolutionProjects . Select ( p => Path . Combine ( rootDirectory , p . FilePath ) ) , buildOptions ) ;
39
- logger ? . ReallyShutdown ( ) ;
40
36
41
37
return ( projects , isBuiltOrRestored ) ;
42
38
}
@@ -50,11 +46,9 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
50
46
return ( Array . Empty < ParallelizableTestModuleGroupWithSequentialInnerModules > ( ) , isBuiltOrRestored ) ;
51
47
}
52
48
53
- FacadeLogger ? logger = LoggerUtility . DetermineBinlogger ( [ .. buildOptions . MSBuildArgs ] , dotnetTestVerb ) ;
54
- var collection = new ProjectCollection ( globalProperties : CommonRunHelpers . GetGlobalPropertiesFromArgs ( [ .. buildOptions . MSBuildArgs ] ) , logger is null ? null : [ logger ] , toolsetDefinitionLocations : ToolsetDefinitionLocations . Default ) ;
49
+ var collection = new ProjectCollection ( globalProperties : CommonRunHelpers . GetGlobalPropertiesFromArgs ( [ .. buildOptions . MSBuildArgs ] ) , null , toolsetDefinitionLocations : ToolsetDefinitionLocations . Default ) ;
55
50
56
51
IEnumerable < ParallelizableTestModuleGroupWithSequentialInnerModules > projects = SolutionAndProjectUtility . GetProjectProperties ( projectFilePath , collection , buildOptions . NoLaunchProfile ) ;
57
- logger ? . ReallyShutdown ( ) ;
58
52
59
53
return ( projects , isBuiltOrRestored ) ;
60
54
}
0 commit comments