Skip to content

[code-simplifier] Simplify ExecutableConditionAttribute code #9375

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
Evangelink merged 2 commits into from
Jun 23, 2026
Merged

[code-simplifier] Simplify ExecutableConditionAttribute code #9375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81e36e2
Simplify ExecutableConditionAttribute code
Evangelink Jun 23, 2026
b046878
Update src/TestFramework/TestFramework/Attributes/TestMethod/Executab…
Evangelink Jun 23, 2026
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
16 changes: 8 additions & 8 deletions src/TestFramework/TestFramework/Attributes/TestMethod/ExecutableConditionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,12 @@ public ExecutableConditionAttribute(ConditionMode mode, string executable, param

// Clone so a caller mutating the array they passed (params arrays are caller-owned) can't change this
// attribute's GroupName / cache key / IgnoreMessage after construction.
_arguments = arguments is null
? throw new ArgumentNullException(nameof(arguments))
: (string[])arguments.Clone();
if (arguments is null)
{
throw new ArgumentNullException(nameof(arguments));
}

_arguments = (string[])arguments.Clone();
Arguments = Array.AsReadOnly(_arguments);

string predicate = _arguments.Length == 0
Expand Down Expand Up @@ -325,19 +328,16 @@ private static string[] GetExecutableExtensions(string executable, bool isWindow
}

string? pathExt = Environment.GetEnvironmentVariable("PATHEXT");
if (pathExt is null || pathExt.Length == 0)
if (string.IsNullOrEmpty(pathExt))
{
return [string.Empty, ".exe", ".cmd", ".bat", ".com"];
}

// PATHEXT entries already include the leading dot, for example ".COM;.EXE;.BAT".
string[] parts = pathExt.Split([Path.PathSeparator], StringSplitOptions.RemoveEmptyEntries);
string[] result = new string[parts.Length + 1];

// Keep an empty extension first so an exact match (for example when a full file name was passed) still wins.
result[0] = string.Empty;
Array.Copy(parts, 0, result, 1, parts.Length);
return result;
return [string.Empty, .. parts];
}

#if !NET
Expand Down
Loading