@@ -40,25 +40,28 @@ public IServiceProvider GetServiceProvider(ITestOutputHelper testOutputHelper)
4040 => GetServiceProvider ( testOutputHelper ) . GetService < T > ( ) ;
4141
4242 protected abstract void AddServices ( IServiceCollection services , IConfiguration ? configuration ) ;
43+
44+ [ Obsolete ( "This method is deprecated. Please override and use GetTestAppSettings() method instead." , true ) ]
4345 protected abstract IEnumerable < string > GetConfigurationFiles ( ) ;
46+ protected abstract IEnumerable < TestAppSettings > GetTestAppSettings ( ) ;
4447
4548 protected virtual ILoggingBuilder AddLoggingProvider ( ILoggingBuilder loggingBuilder , ILoggerProvider loggerProvider )
4649 => loggingBuilder . AddProvider ( loggerProvider ) ;
4750
4851 private IConfigurationRoot ? GetConfigurationRoot ( )
4952 {
50- var configurationFiles = GetConfigurationFiles ( ) ;
53+ var testAppSettings = GetTestAppSettings ( ) ;
5154 return
52- configurationFiles . All ( c => ! string . IsNullOrEmpty ( c ) )
53- ? GetConfigurationRoot ( configurationFiles )
55+ testAppSettings . All ( setting => ! string . IsNullOrEmpty ( setting . Filename ) )
56+ ? GetConfigurationRoot ( testAppSettings )
5457 : default ;
5558 }
5659
57- private IConfigurationRoot GetConfigurationRoot ( IEnumerable < string > configurationFiles )
60+ private IConfigurationRoot GetConfigurationRoot ( IEnumerable < TestAppSettings > configurationFiles )
5861 {
5962 foreach ( var configurationFile in configurationFiles )
6063 {
61- ConfigurationBuilder . AddJsonFile ( configurationFile ) ;
64+ ConfigurationBuilder . AddJsonFile ( configurationFile . Filename , optional : configurationFile . IsOptional ) ;
6265 }
6366 ConfigurationBuilder . AddEnvironmentVariables ( ) ;
6467 return ConfigurationBuilder . Build ( ) ;
0 commit comments