diff --git a/src/ReportPortal.Shared/Build/ReportPortal.Shared.props b/src/ReportPortal.Shared/Build/ReportPortal.Shared.props index 2ffc1e55..a5f5a072 100644 --- a/src/ReportPortal.Shared/Build/ReportPortal.Shared.props +++ b/src/ReportPortal.Shared/Build/ReportPortal.Shared.props @@ -5,6 +5,10 @@ PreserveNewest + + + PreserveNewest + \ No newline at end of file diff --git a/src/ReportPortal.Shared/Configuration/ConfigurationBuilderExtensions.cs b/src/ReportPortal.Shared/Configuration/ConfigurationBuilderExtensions.cs index ba791701..0073d6c6 100644 --- a/src/ReportPortal.Shared/Configuration/ConfigurationBuilderExtensions.cs +++ b/src/ReportPortal.Shared/Configuration/ConfigurationBuilderExtensions.cs @@ -19,6 +19,7 @@ public static IConfigurationBuilder AddDefaults(this IConfigurationBuilder build { if (builder == null) throw new ArgumentNullException(nameof(builder)); + builder.AddJsonFile(Path.Combine(baseDir, "ReportPortal.json"), optional: true); builder.AddJsonFile(Path.Combine(baseDir, "ReportPortal.config.json"), optional: true); builder.AddDirectoryProbing(baseDir); builder.AddEnvironmentVariables(); diff --git a/test/ReportPortal.Shared.Tests/Configuration/ConfigurationBuilderTest.cs b/test/ReportPortal.Shared.Tests/Configuration/ConfigurationBuilderTest.cs index f59808d8..3a387adb 100644 --- a/test/ReportPortal.Shared.Tests/Configuration/ConfigurationBuilderTest.cs +++ b/test/ReportPortal.Shared.Tests/Configuration/ConfigurationBuilderTest.cs @@ -459,10 +459,12 @@ public void ShouldUseDefaultsWithBaseDir() var dir = Directory.CreateDirectory(Path.GetRandomFileName()); File.AppendAllText(dir + "/ReportPortal_prop1", "value1"); File.AppendAllText(dir + "/ReportPortal.config.json", @"{""prop2"": ""value2""}"); + File.AppendAllText(dir + "/ReportPortal.json", @"{""prop3"": ""value3""}"); var config = new ConfigurationBuilder().AddDefaults(dir.FullName).Build(); - config.Properties.Should().HaveCountGreaterOrEqualTo(2).And.ContainKeys("prop1", "prop2"); + config.Properties.Should().HaveCountGreaterOrEqualTo(3) + .And.ContainKeys("prop1", "prop2", "prop3"); dir.Delete(true); }