Specify Json Configuration File Source Via Command Line #1990
Conversation
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
…re manual testing
… - will need to ask for guidance on how to error handle/log
wiktork
reviewed
Jun 10, 2022
wiktork
reviewed
Jun 10, 2022
wiktork
reviewed
Jun 10, 2022
wiktork
reviewed
Jun 10, 2022
wiktork
reviewed
Jun 10, 2022
wiktork
reviewed
Jun 10, 2022
…essing the rest of the feedback
jander-msft
reviewed
Jun 14, 2022
kkeirstead
commented
Jun 15, 2022
…s or the wrong extension
jander-msft
reviewed
Jun 16, 2022
wiktork
reviewed
Jun 17, 2022
wiktork
previously approved these changes
Jun 17, 2022
wiktork
reviewed
Jun 17, 2022
…tring constant for the key instead of a resource string
wiktork
reviewed
Jun 22, 2022
wiktork
reviewed
Jun 22, 2022
wiktork
previously approved these changes
Jun 22, 2022
jander-msft
previously approved these changes
Jun 22, 2022
jander-msft
approved these changes
Jun 23, 2022
jander-msft
added
the
servicing-minor
Member
Author
|
/backport to release/6.x |
Contributor
|
Started backporting to release/6.x: https://github.com/dotnet/dotnet-monitor/actions/runs/2584007457 |
Contributor
|
@kkeirstead backporting to release/6.x failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Feature appears to be working and tests are passing; might do some more manual testing
.git/rebase-apply/patch:371: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ConfigurationTests.cs
M src/Tools/dotnet-monitor/Commands/ConfigShowCommandHandler.cs
M src/Tools/dotnet-monitor/HostBuilderHelper.cs
M src/Tools/dotnet-monitor/Program.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tools/dotnet-monitor/Program.cs
CONFLICT (content): Merge conflict in src/Tools/dotnet-monitor/Program.cs
Auto-merging src/Tools/dotnet-monitor/HostBuilderHelper.cs
Auto-merging src/Tools/dotnet-monitor/Commands/ConfigShowCommandHandler.cs
CONFLICT (content): Merge conflict in src/Tools/dotnet-monitor/Commands/ConfigShowCommandHandler.cs
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ConfigurationTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Feature appears to be working and tests are passing; might do some more manual testing
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
jander-msft
removed
the
servicing-minor
Egyptmaster
pushed a commit
to Egyptmaster/dotnet-monitor
that referenced
this pull request
Sep 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Users can now specify a configuration file via the command line (
--configuration-file-path); if provided, this takes highest precedence but does not override the other configuration sources.Closes #1760