Skip to content

Commit

Permalink
Merge pull request abpframework#11117 from abpframework/studio-update…
Browse files Browse the repository at this point in the history
…-AnalyzingOptions

Update AnalyzingOptions.cs
  • Loading branch information
cotur authored Dec 29, 2021
2 parents b3dfef9 + eddfb9d commit 9d6b2ff
Showing 1 changed file with 2 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@ public class AnalyzingOptions
[CanBeNull]
public string AnalyzeConfigurationFile { get; set; }

[CanBeNull]
public string SettingNamePrefix { get; set; }

[CanBeNull]
public string FeatureNamePrefix { get; set; }

// Combines two options
// The second option has more priority
// The second option has more priority
public static AnalyzingOptions Combine([CanBeNull] AnalyzingOptions first, [CanBeNull] AnalyzingOptions second)
{
if (second == null && first == null)
Expand All @@ -36,9 +30,7 @@ public static AnalyzingOptions Combine([CanBeNull] AnalyzingOptions first, [CanB

return new AnalyzingOptions
{
AnalyzeConfigurationFile = second.AnalyzeConfigurationFile ?? first.AnalyzeConfigurationFile,
SettingNamePrefix = second.SettingNamePrefix ?? first.SettingNamePrefix,
FeatureNamePrefix = second.FeatureNamePrefix ?? first.FeatureNamePrefix
AnalyzeConfigurationFile = second.AnalyzeConfigurationFile ?? first.AnalyzeConfigurationFile
};
}
}

0 comments on commit 9d6b2ff

Please sign in to comment.