Skip to content

Commit 5ac3352

Browse files
Forward global props to dotnet run (#47694)
1 parent 2b09ea2 commit 5ac3352

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs

+4-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.Build.Framework;
88
using Microsoft.DotNet.Cli.Utils;
99
using Microsoft.DotNet.Tools.Test;
10-
using NuGet.Packaging;
1110
using LocalizableStrings = Microsoft.DotNet.Tools.Test.LocalizableStrings;
1211

1312
namespace Microsoft.DotNet.Cli;
@@ -83,13 +82,10 @@ public static (bool SolutionOrProjectFileFound, string Message) TryGetProjectOrS
8382
}
8483
}
8584

86-
private static string[] GetSolutionFilePaths(string directory)
87-
{
88-
string[] solutionFiles = Directory.GetFiles(directory, CliConstants.SolutionExtensionPattern, SearchOption.TopDirectoryOnly);
89-
solutionFiles.AddRange(Directory.GetFiles(directory, CliConstants.SolutionXExtensionPattern, SearchOption.TopDirectoryOnly));
90-
91-
return solutionFiles;
92-
}
85+
private static string[] GetSolutionFilePaths(string directory) => [
86+
.. Directory.GetFiles(directory, CliConstants.SolutionExtensionPattern, SearchOption.TopDirectoryOnly),
87+
.. Directory.GetFiles(directory, CliConstants.SolutionXExtensionPattern, SearchOption.TopDirectoryOnly)
88+
];
9389

9490
private static string[] GetSolutionFilterFilePaths(string directory)
9591
{

src/Cli/dotnet/commands/dotnet-test/TestApplication.cs

+2-11
Original file line numberDiff line numberDiff line change
@@ -307,20 +307,11 @@ private string BuildArgsWithDotnetRun(TestOptions testOptions)
307307
builder.Append($" {CommonOptions.NoRestoreOption.Name}");
308308
builder.Append($" {TestingPlatformOptions.NoBuildOption.Name}");
309309

310-
// TODO: Instead of passing Architecture and Configuration this way, pass _buildOptions.MSBuildArgs
311-
// _buildOptions.MSBuildArgs will include all needed global properties.
312-
// TODO: Care to be taken when dealing with -bl.
313-
// We will want to adjust the file name here.
314-
315-
if (!string.IsNullOrEmpty(testOptions.Architecture))
310+
foreach (var arg in _buildOptions.MSBuildArgs)
316311
{
317-
builder.Append($" {CommonOptions.ArchitectureOption.Name} {testOptions.Architecture}");
312+
builder.Append($" {arg}");
318313
}
319314

320-
if (!string.IsNullOrEmpty(testOptions.Configuration))
321-
{
322-
builder.Append($" {TestingPlatformOptions.ConfigurationOption.Name} {testOptions.Configuration}");
323-
}
324315

325316
if (!string.IsNullOrEmpty(_module.TargetFramework))
326317
{

0 commit comments

Comments
 (0)