Merge main into darc-main-3179108c-c6b8-45ea-ab29-d26b162530ec

Author: dotnet-maestro[bot]

src/Cli/dotnet/Commands/Test/MSBuildUtility.cs

@@ -53,7 +53,7 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
         FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb);
         var collection = new ProjectCollection(globalProperties: CommonRunHelpers.GetGlobalPropertiesFromArgs([.. buildOptions.MSBuildArgs]), logger is null ? null : [logger], toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
 
-        IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, collection, buildOptions.NoLaunchProfile);
+        IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, collection, buildOptions);
         logger?.ReallyShutdown();
 
         return (projects, isBuiltOrRestored);
@@ -66,10 +66,17 @@ public static BuildOptions GetBuildOptions(ParseResult parseResult, int degreeOf
         var msbuildArgs = parseResult.OptionValuesToBeForwarded(TestCommandParser.GetCommand())
             .Concat(binLogArgs);
 
+        string? resultsDirectory = parseResult.GetValue(TestingPlatformOptions.ResultsDirectoryOption);
+        if (resultsDirectory is not null)
+        {
+            resultsDirectory = Path.Combine(Directory.GetCurrentDirectory(), resultsDirectory);
+        }
+
         PathOptions pathOptions = new(
             parseResult.GetValue(TestingPlatformOptions.ProjectOption),
             parseResult.GetValue(TestingPlatformOptions.SolutionOption),
-            parseResult.GetValue(TestingPlatformOptions.DirectoryOption));
+            parseResult.GetValue(TestingPlatformOptions.DirectoryOption),
+            resultsDirectory);
 
         return new BuildOptions(
             pathOptions,
@@ -112,7 +119,7 @@ private static ConcurrentBag<ParallelizableTestModuleGroupWithSequentialInnerMod
             new ParallelOptions { MaxDegreeOfParallelism = buildOptions.DegreeOfParallelism },
             (project) =>
             {
-                IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projectsMetadata = SolutionAndProjectUtility.GetProjectProperties(project, projectCollection, buildOptions.NoLaunchProfile);
+                IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> projectsMetadata = SolutionAndProjectUtility.GetProjectProperties(project, projectCollection, buildOptions);
                 foreach (var projectMetadata in projectsMetadata)
                 {
                     allProjects.Add(projectMetadata);

src/Cli/dotnet/Commands/Test/Models.cs

@@ -112,7 +112,7 @@ public bool MoveNext()
 }
 
 
-internal sealed record TestModule(RunProperties RunProperties, string? ProjectFullPath, string? TargetFramework, bool IsTestingPlatformApplication, bool IsTestProject, ProjectLaunchSettingsModel? LaunchSettings, string TargetPath);
+internal sealed record TestModule(RunProperties RunProperties, string? ProjectFullPath, string? TargetFramework, bool IsTestingPlatformApplication, bool IsTestProject, ProjectLaunchSettingsModel? LaunchSettings, string TargetPath, string? DotnetRootArchVariableName);
 
 internal sealed record Handshake(Dictionary<byte, string>? Properties);
 

src/Cli/dotnet/Commands/Test/Options.cs

@@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Cli.Commands.Test;
 
 internal record TestOptions(bool HasFilterMode, bool IsHelp);
 
-internal record PathOptions(string? ProjectPath, string? SolutionPath, string? DirectoryPath);
+internal record PathOptions(string? ProjectPath, string? SolutionPath, string? DirectoryPath, string? ResultsDirectoryPath);
 
 internal record BuildOptions(
     PathOptions PathOptions,

src/Cli/dotnet/Commands/Test/SolutionAndProjectUtility.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.CommandLine;
 using System.Diagnostics;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Execution;
@@ -147,7 +148,7 @@ public static string GetRootDirectory(string solutionOrProjectFilePath)
         return string.IsNullOrEmpty(fileDirectory) ? Directory.GetCurrentDirectory() : fileDirectory;
     }
 
-    public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> GetProjectProperties(string projectFilePath, ProjectCollection projectCollection, bool noLaunchProfile)
+    public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModules> GetProjectProperties(string projectFilePath, ProjectCollection projectCollection, BuildOptions buildOptions)
     {
         var projects = new List<ParallelizableTestModuleGroupWithSequentialInnerModules>();
         ProjectInstance projectInstance = EvaluateProject(projectCollection, projectFilePath, null);
@@ -159,7 +160,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
 
         if (!string.IsNullOrEmpty(targetFramework) || string.IsNullOrEmpty(targetFrameworks))
         {
-            if (GetModuleFromProject(projectInstance, projectCollection.Loggers, noLaunchProfile) is { } module)
+            if (GetModuleFromProject(projectInstance, projectCollection.Loggers, buildOptions) is { } module)
             {
                 projects.Add(new ParallelizableTestModuleGroupWithSequentialInnerModules(module));
             }
@@ -187,7 +188,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
                     projectInstance = EvaluateProject(projectCollection, projectFilePath, framework);
                     Logger.LogTrace(() => $"Loaded inner project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{projectInstance.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFM: '{framework}').");
 
-                    if (GetModuleFromProject(projectInstance, projectCollection.Loggers, noLaunchProfile) is { } module)
+                    if (GetModuleFromProject(projectInstance, projectCollection.Loggers, buildOptions) is { } module)
                     {
                         projects.Add(new ParallelizableTestModuleGroupWithSequentialInnerModules(module));
                     }
@@ -201,7 +202,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
                     projectInstance = EvaluateProject(projectCollection, projectFilePath, framework);
                     Logger.LogTrace(() => $"Loaded inner project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{projectInstance.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFM: '{framework}').");
 
-                    if (GetModuleFromProject(projectInstance, projectCollection.Loggers, noLaunchProfile) is { } module)
+                    if (GetModuleFromProject(projectInstance, projectCollection.Loggers, buildOptions) is { } module)
                     {
                         innerModules ??= new List<TestModule>();
                         innerModules.Add(module);
@@ -218,7 +219,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
         return projects;
     }
 
-    private static TestModule? GetModuleFromProject(ProjectInstance project, ICollection<ILogger>? loggers, bool noLaunchProfile)
+    private static TestModule? GetModuleFromProject(ProjectInstance project, ICollection<ILogger>? loggers, BuildOptions buildOptions)
     {
         _ = bool.TryParse(project.GetPropertyValue(ProjectProperties.IsTestProject), out bool isTestProject);
         _ = bool.TryParse(project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication), out bool isTestingPlatformApplication);
@@ -248,9 +249,19 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
         string projectFullPath = project.GetPropertyValue(ProjectProperties.ProjectFullPath);
 
         // TODO: Support --launch-profile and pass it here.
-        var launchSettings = TryGetLaunchProfileSettings(Path.GetDirectoryName(projectFullPath)!, Path.GetFileNameWithoutExtension(projectFullPath), project.GetPropertyValue(ProjectProperties.AppDesignerFolder), noLaunchProfile, profileName: null);
+        var launchSettings = TryGetLaunchProfileSettings(Path.GetDirectoryName(projectFullPath)!, Path.GetFileNameWithoutExtension(projectFullPath), project.GetPropertyValue(ProjectProperties.AppDesignerFolder), buildOptions, profileName: null);
 
-        return new TestModule(runProperties, PathUtility.FixFilePath(projectFullPath), targetFramework, isTestingPlatformApplication, isTestProject, launchSettings, project.GetPropertyValue(ProjectProperties.TargetPath));
+        var rootVariableName = EnvironmentVariableNames.TryGetDotNetRootArchVariableName(
+            project.GetPropertyValue("RuntimeIdentifier"),
+            project.GetPropertyValue("DefaultAppHostRuntimeIdentifier"));
+
+        if (rootVariableName is not null && Environment.GetEnvironmentVariable(rootVariableName) != null)
+        {
+            // If already set, we do not override it.
+            rootVariableName = null;
+        }
+
+        return new TestModule(runProperties, PathUtility.FixFilePath(projectFullPath), targetFramework, isTestingPlatformApplication, isTestProject, launchSettings, project.GetPropertyValue(ProjectProperties.TargetPath), rootVariableName);
 
         static RunProperties GetRunProperties(ProjectInstance project, ICollection<ILogger>? loggers)
         {
@@ -270,9 +281,9 @@ static RunProperties GetRunProperties(ProjectInstance project, ICollection<ILogg
         }
     }
 
-    private static ProjectLaunchSettingsModel? TryGetLaunchProfileSettings(string projectDirectory, string projectNameWithoutExtension, string appDesignerFolder, bool noLaunchProfile, string? profileName)
+    private static ProjectLaunchSettingsModel? TryGetLaunchProfileSettings(string projectDirectory, string projectNameWithoutExtension, string appDesignerFolder, BuildOptions buildOptions, string? profileName)
     {
-        if (noLaunchProfile)
+        if (buildOptions.NoLaunchProfile)
         {
             return null;
         }
@@ -299,6 +310,12 @@ static RunProperties GetRunProperties(ProjectInstance project, ICollection<ILogg
             return null;
         }
 
+        // If buildOptions.Verbosity is null, we still want to print the message.
+        if (buildOptions.Verbosity != VerbosityOptions.quiet)
+        {
+            Reporter.Output.WriteLine(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath));
+        }
+
         var result = LaunchSettingsManager.TryApplyLaunchSettings(launchSettingsPath, profileName);
         if (!result.Success)
         {

src/Cli/dotnet/Commands/Test/Terminal/TerminalTestReporter.cs

@@ -427,28 +427,21 @@ private void AppendExitCodeAndUrl(ITerminal terminal, int? exitCode, bool isRun)
     /// <summary>
     /// Print a build result summary to the output.
     /// </summary>
-    private static void AppendAssemblyResult(ITerminal terminal, bool succeeded, int countErrors, int countWarnings)
+    private static void AppendAssemblyResult(ITerminal terminal, TestProgressState state)
     {
-        if (!succeeded)
+        if (!state.Success)
         {
             terminal.SetColor(TerminalColor.DarkRed);
             // If the build failed, we print one of three red strings.
-            string text = (countErrors > 0, countWarnings > 0) switch
+            string text = (state.FailedTests > 0, state.TotalTests == 0) switch
             {
-                (true, true) => string.Format(CultureInfo.CurrentCulture, CliCommandStrings.FailedWithErrorsAndWarnings, countErrors, countWarnings),
-                (true, _) => string.Format(CultureInfo.CurrentCulture, CliCommandStrings.FailedWithErrors, countErrors),
-                (false, true) => string.Format(CultureInfo.CurrentCulture, CliCommandStrings.FailedWithWarnings, countWarnings),
-                _ => CliCommandStrings.FailedLowercase,
+                (true, _) => string.Format(CultureInfo.CurrentCulture, CliCommandStrings.FailedWithErrors, state.FailedTests),
+                (false, true) => CliCommandStrings.ZeroTestsRan,
+                (false, false) => CliCommandStrings.FailedLowercase,
             };
             terminal.Append(text);
             terminal.ResetColor();
         }
-        else if (countWarnings > 0)
-        {
-            terminal.SetColor(TerminalColor.DarkYellow);
-            terminal.Append($"succeeded with {countWarnings} warning(s)");
-            terminal.ResetColor();
-        }
         else
         {
             terminal.SetColor(TerminalColor.DarkGreen);
@@ -858,12 +851,10 @@ void AppendOutputWhenPresent(string description, string? output)
     private static void AppendAssemblySummary(TestProgressState assemblyRun, ITerminal terminal)
     {
         terminal.ResetColor();
-        int failedTests = assemblyRun.FailedTests;
-        int warnings = 0;
-
+        
         AppendAssemblyLinkTargetFrameworkAndArchitecture(terminal, assemblyRun.Assembly, assemblyRun.TargetFramework, assemblyRun.Architecture);
         terminal.Append(' ');
-        AppendAssemblyResult(terminal, assemblyRun.Success, failedTests, warnings);
+        AppendAssemblyResult(terminal, assemblyRun);
         terminal.Append(' ');
         AppendLongDuration(terminal, assemblyRun.Stopwatch.Elapsed);
         terminal.AppendLine();

src/Cli/dotnet/Commands/Test/TestApplication.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.CommandLine;
 using System.Diagnostics;
 using System.IO.Pipes;
 using Microsoft.DotNet.Cli.Commands.Test.IPC;
@@ -62,7 +63,7 @@ private ProcessStartInfo CreateProcessStartInfo(TestOptions testOptions)
             FileName = Module.RunProperties.RunCommand,
             Arguments = GetArguments(testOptions),
             RedirectStandardOutput = true,
-            RedirectStandardError = true
+            RedirectStandardError = true,
         };
 
         if (!string.IsNullOrEmpty(Module.RunProperties.RunWorkingDirectory))
@@ -75,7 +76,7 @@ private ProcessStartInfo CreateProcessStartInfo(TestOptions testOptions)
             foreach (var entry in Module.LaunchSettings.EnvironmentVariables)
             {
                 string value = Environment.ExpandEnvironmentVariables(entry.Value);
-                processStartInfo.EnvironmentVariables[entry.Key] = value;
+                processStartInfo.Environment[entry.Key] = value;
             }
 
             if (!_buildOptions.NoLaunchProfileArguments &&
@@ -85,6 +86,11 @@ private ProcessStartInfo CreateProcessStartInfo(TestOptions testOptions)
             }
         }
 
+        if (Module.DotnetRootArchVariableName is not null)
+        {
+            processStartInfo.Environment[Module.DotnetRootArchVariableName] = Path.GetDirectoryName(new Muxer().MuxerPath);
+        }
+
         return processStartInfo;
     }
 
@@ -104,6 +110,11 @@ private string GetArguments(TestOptions testOptions)
             builder.Append($" {TestingPlatformOptions.HelpOption.Name}");
         }
 
+        if (_buildOptions.PathOptions.ResultsDirectoryPath is { } resultsDirectoryPath)
+        {
+            builder.Append($" {TestingPlatformOptions.ResultsDirectoryOption.Name} {ArgumentEscaper.EscapeSingleArg(resultsDirectoryPath)}");
+        }
+
         foreach (var arg in _buildOptions.UnmatchedTokens)
         {
             builder.Append($" {ArgumentEscaper.EscapeSingleArg(arg)}");

src/Cli/dotnet/Commands/Test/TestCommandParser.cs

@@ -235,6 +235,7 @@ private static Command GetTestingPlatformCliCommand()
         command.Options.Add(TestingPlatformOptions.DirectoryOption);
         command.Options.Add(TestingPlatformOptions.TestModulesFilterOption);
         command.Options.Add(TestingPlatformOptions.TestModulesRootDirectoryOption);
+        command.Options.Add(TestingPlatformOptions.ResultsDirectoryOption);
         command.Options.Add(TestingPlatformOptions.MaxParallelTestModulesOption);
         command.Options.Add(CommonOptions.ArchitectureOption);
         command.Options.Add(CommonOptions.PropertiesOption);
@@ -293,6 +294,7 @@ private static Command GetVSTestCliCommand()
         command.Options.Add(VerbosityOption);
         command.Options.Add(CommonOptions.ArchitectureOption);
         command.Options.Add(CommonOptions.OperatingSystemOption);
+        command.Options.Add(CommonOptions.PropertiesOption);
         command.Options.Add(CommonOptions.DisableBuildServersOption);
         command.Options.Add(VsTestTargetOption);
         command.SetAction(TestCommand.Run);

src/Cli/dotnet/Commands/Test/TestModulesFilterHandler.cs

@@ -58,7 +58,7 @@ public bool RunWithTestModulesFilter(ParseResult parseResult)
                 ? new RunProperties(muxerPath, $@"exec ""{testModule}""", null)
                 : new RunProperties(testModule, null, null);
 
-            var testApp = new ParallelizableTestModuleGroupWithSequentialInnerModules(new TestModule(runProperties, null, null, true, true, null, testModule));
+            var testApp = new ParallelizableTestModuleGroupWithSequentialInnerModules(new TestModule(runProperties, null, null, true, true, null, testModule, DotnetRootArchVariableName: null));
             // Write the test application to the channel
             _actionQueue.Enqueue(testApp);
         }

src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs

@@ -43,6 +43,13 @@ internal static class TestingPlatformOptions
         HelpName = CliCommandStrings.CmdRootPathName,
     };
 
+    public static readonly Option<string> ResultsDirectoryOption = new("--results-directory")
+    {
+        Description = CliCommandStrings.CmdResultsDirectoryDescription,
+        HelpName = CliCommandStrings.CmdPathToResultsDirectory,
+        Arity = ArgumentArity.ExactlyOne
+    };
+
     public static readonly Option<string> MaxParallelTestModulesOption = new("--max-parallel-test-modules")
     {
         Description = CliCommandStrings.CmdMaxParallelTestModulesDescription,

src/Common/EnvironmentVariableNames.cs

@@ -35,15 +35,15 @@ static class EnvironmentVariableNames
     public static string? TryGetDotNetRootVariableName(string runtimeIdentifier, string defaultAppHostRuntimeIdentifier, Version? targetFrameworkVersion)
         => TryGetDotNetRootVariableNameImpl(runtimeIdentifier, defaultAppHostRuntimeIdentifier, targetFrameworkVersion, RuntimeInformation.ProcessArchitecture, Environment.Is64BitProcess);
 
-    internal static string? TryGetDotNetRootVariableNameImpl(string runtimeIdentifier, string defaultAppHostRuntimeIdentifier, Version? targetFrameworkVersion, Architecture currentArchitecture, bool is64bit)
+    internal static string? TryGetDotNetRootVariableNameImpl(string runtimeIdentifier, string defaultAppHostRuntimeIdentifier, Version? targetFrameworkVersion, Architecture currentArchitecture, bool is64bit, bool onlyUseArchSpecific = false)
     {
         // If the app targets the same architecture as SDK is running on or an unknown architecture, set DOTNET_ROOT, DOTNET_ROOT(x86) for 32-bit, DOTNET_ROOT_arch for TFM 6+.
         // If the app targets different architecture from the SDK, do not set DOTNET_ROOT.
 
         if (!TryParseArchitecture(runtimeIdentifier, out var targetArchitecture) && !TryParseArchitecture(defaultAppHostRuntimeIdentifier, out targetArchitecture) ||
             targetArchitecture == currentArchitecture)
         {
-            var suffix = targetFrameworkVersion != null && targetFrameworkVersion >= s_version6_0 ?
+            var suffix = onlyUseArchSpecific || (targetFrameworkVersion != null && targetFrameworkVersion >= s_version6_0) ?
                 $"_{currentArchitecture.ToString().ToUpperInvariant()}" :
                 is64bit ? "" : "(x86)";
 
@@ -53,6 +53,9 @@ static class EnvironmentVariableNames
         return null;
     }
 
+    internal static string? TryGetDotNetRootArchVariableName(string runtimeIdentifier, string defaultAppHostRuntimeIdentifier)
+        => TryGetDotNetRootVariableNameImpl(runtimeIdentifier, defaultAppHostRuntimeIdentifier, null, RuntimeInformation.ProcessArchitecture, Environment.Is64BitProcess, onlyUseArchSpecific: true);
+
     internal static bool TryParseArchitecture(string runtimeIdentifier, out Architecture architecture)
     {
         // RID is [os].[version]-[architecture]-[additional qualifiers]