Skip to content

Forward global props to dotnet run #47694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Forward global props to dotnet run #47694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Build.Framework;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Tools.Test;
using NuGet.Packaging;
using LocalizableStrings = Microsoft.DotNet.Tools.Test.LocalizableStrings;

namespace Microsoft.DotNet.Cli;
Expand Down Expand Up @@ -83,13 +82,10 @@ public static (bool SolutionOrProjectFileFound, string Message) TryGetProjectOrS
}
}

private static string[] GetSolutionFilePaths(string directory)
{
string[] solutionFiles = Directory.GetFiles(directory, CliConstants.SolutionExtensionPattern, SearchOption.TopDirectoryOnly);
solutionFiles.AddRange(Directory.GetFiles(directory, CliConstants.SolutionXExtensionPattern, SearchOption.TopDirectoryOnly));

return solutionFiles;
}
private static string[] GetSolutionFilePaths(string directory) => [
.. Directory.GetFiles(directory, CliConstants.SolutionExtensionPattern, SearchOption.TopDirectoryOnly),
.. Directory.GetFiles(directory, CliConstants.SolutionXExtensionPattern, SearchOption.TopDirectoryOnly)
];

private static string[] GetSolutionFilterFilePaths(string directory)
{
Expand Down
13 changes: 2 additions & 11 deletions src/Cli/dotnet/commands/dotnet-test/TestApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,20 +307,11 @@ private string BuildArgsWithDotnetRun(TestOptions testOptions)
builder.Append($" {CommonOptions.NoRestoreOption.Name}");
builder.Append($" {TestingPlatformOptions.NoBuildOption.Name}");

// TODO: Instead of passing Architecture and Configuration this way, pass _buildOptions.MSBuildArgs
// _buildOptions.MSBuildArgs will include all needed global properties.
// TODO: Care to be taken when dealing with -bl.
// We will want to adjust the file name here.

if (!string.IsNullOrEmpty(testOptions.Architecture))
foreach (var arg in _buildOptions.MSBuildArgs)
{
builder.Append($" {CommonOptions.ArchitectureOption.Name} {testOptions.Architecture}");
builder.Append($" {arg}");
}

if (!string.IsNullOrEmpty(testOptions.Configuration))
{
builder.Append($" {TestingPlatformOptions.ConfigurationOption.Name} {testOptions.Configuration}");
}

if (!string.IsNullOrEmpty(_module.TargetFramework))
{
Expand Down
Loading