Browse Source
Merge pull request #11117 from abpframework/studio-update-AnalyzingOptions
Update AnalyzingOptions.cs
pull/11147/head
Ahmet Çotur
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
10 deletions
-
studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Analyzing/AnalyzingOptions.cs
|
|
@ -9,14 +9,8 @@ public class AnalyzingOptions |
|
|
[CanBeNull] |
|
|
[CanBeNull] |
|
|
public string AnalyzeConfigurationFile { get; set; } |
|
|
public string AnalyzeConfigurationFile { get; set; } |
|
|
|
|
|
|
|
|
[CanBeNull] |
|
|
|
|
|
public string SettingNamePrefix { get; set; } |
|
|
|
|
|
|
|
|
|
|
|
[CanBeNull] |
|
|
|
|
|
public string FeatureNamePrefix { get; set; } |
|
|
|
|
|
|
|
|
|
|
|
// Combines two options
|
|
|
// 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) |
|
|
public static AnalyzingOptions Combine([CanBeNull] AnalyzingOptions first, [CanBeNull] AnalyzingOptions second) |
|
|
{ |
|
|
{ |
|
|
if (second == null && first == null) |
|
|
if (second == null && first == null) |
|
|
@ -36,9 +30,7 @@ public class AnalyzingOptions |
|
|
|
|
|
|
|
|
return new AnalyzingOptions |
|
|
return new AnalyzingOptions |
|
|
{ |
|
|
{ |
|
|
AnalyzeConfigurationFile = second.AnalyzeConfigurationFile ?? first.AnalyzeConfigurationFile, |
|
|
AnalyzeConfigurationFile = second.AnalyzeConfigurationFile ?? first.AnalyzeConfigurationFile |
|
|
SettingNamePrefix = second.SettingNamePrefix ?? first.SettingNamePrefix, |
|
|
|
|
|
FeatureNamePrefix = second.FeatureNamePrefix ?? first.FeatureNamePrefix |
|
|
|
|
|
}; |
|
|
}; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
