-
Notifications
You must be signed in to change notification settings - Fork 579
Add Project/Solution flags to DotNet.TestOptions for SDK 10+ support #2897
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.
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
Draft
bartelink
wants to merge
1
commit into
fsprojects:master
Choose a base branch
from
bartelink:add-project-solution-to-TestOptions
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+17
−2
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1766,6 +1766,16 @@ module DotNet = | |
| /// order of tests execution before the crash. (<c>--blame</c>) | ||
| Blame: bool | ||
|
|
||
| /// Specifies the project to test via the <c>--project</c> flag (SDK 10+). | ||
| /// When set, overrides the positional <c>project</c> argument passed to <see cref="test"/>. | ||
| /// Use this instead of the positional argument when targeting SDK 10+ with Microsoft.Testing.Platform. | ||
| /// (<c>--project</c>) | ||
| Project: string option | ||
|
|
||
| /// Specifies the solution to test via the <c>--solution</c> flag (SDK 10+). | ||
| /// (<c>--solution</c>) | ||
| Solution: string option | ||
|
|
||
| /// Other msbuild specific parameters | ||
| MSBuildParams: MSBuild.CliArguments | ||
| } | ||
|
|
@@ -1789,6 +1799,8 @@ module DotNet = | |
| NoRestore = false | ||
| RunSettingsArguments = None | ||
| Blame = false | ||
| Project = None | ||
| Solution = None | ||
| MSBuildParams = MSBuild.CliArguments.Create() } | ||
|
|
||
| /// Gets the current environment | ||
|
|
@@ -1820,7 +1832,9 @@ module DotNet = | |
| param.ResultsDirectory |> Option.toList |> argList2 "results-directory" | ||
| param.Collect |> Option.toList |> argList2 "collect" | ||
| param.NoRestore |> argOption "no-restore" | ||
| param.Blame |> argOption "blame" ] | ||
| param.Blame |> argOption "blame" | ||
| param.Project |> Option.toList |> argList2 "project" | ||
| param.Solution |> Option.toList |> argList2 "solution" ] | ||
| |> List.concat | ||
| |> List.filter (not << String.IsNullOrEmpty) | ||
|
|
||
|
|
@@ -1834,7 +1848,8 @@ module DotNet = | |
| let test setParams project = | ||
| use __ = Trace.traceTask "DotNet:test" project | ||
| let param = TestOptions.Create() |> setParams | ||
| let args = project :: buildTestArgs param | ||
| let positionalArg = if String.IsNullOrEmpty project then [] else [ project ] | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also doesnt use solution arg - probably needs to be mutually exclusive and added at end after positional args |
||
| let args = positionalArg @ buildTestArgs param | ||
|
Comment on lines
+1851
to
+1852
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (see preamble in OP) |
||
| execWithBinLog project param.Common "test" args param.MSBuildParams param.RunSettingsArguments | ||
| __.MarkSuccess() | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs comment to mention it doesnt work for MTP anymore