VP-1558: Merge settings between base and current themes #383
Conversation
This file contains 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
Fully backward-compatible: see changes in settings Support merge between themes in different stores and themes in the same store
vc-ci
reviewed
Feb 28, 2020
| !string.IsNullOrEmpty(_options.BaseThemePath) ? Path.Combine("Themes", _options.BaseThemePath) : | ||
| #pragma warning disable 618 | ||
| // We need to use obsolete value here for backward compatibility. | ||
| !string.IsNullOrEmpty(_options.BaseThemeName) ? Path.Combine("Themes", _options.BaseThemeName, "default") : null; |
There was a problem hiding this comment.
vc-ci
reviewed
Mar 3, 2020
| } | ||
|
|
||
| return retVal; | ||
| return result.ToObject<Dictionary<string, object>>().ToDictionary(x => x.Key, x => x.Value).WithDefaultValue(defaultValue); |
There was a problem hiding this comment.
|
SonarQube analysis reported 6 issues
Watch the comments in this conversation to review them. 4 extra issuesNote: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:
|
tatarincev
approved these changes
Mar 3, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fully backward-compatible: see changes in settings
Support merge between themes in different stores and themes in the same store