Merge pull request #104 from Umplify/improvements

Author: Arash-Sabet

azure-pipeline-PR.yml

@@ -17,7 +17,7 @@ steps:
   displayName: 'Use .NET 6.0 sdk'
   inputs:
     packageType: sdk
-    version: 6.0.101
+    version: 6.0.200
     installationPath: $(Agent.ToolsDirectory)/dotnet
 - script: echo Started restoring the source code
 - task: DotNetCoreCLI@2

azure-pipelines.yml

@@ -19,7 +19,7 @@ steps:
   displayName: 'Use .NET 6.0 sdk'
   inputs:
     packageType: sdk
-    version: 6.0.101
+    version: 6.0.200
     installationPath: $(Agent.ToolsDirectory)/dotnet
 - script: echo Started restoring the source code
 - task: DotNetCoreCLI@2

examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Fixtures/TestFixture.cs

@@ -1,11 +1,4 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Xunit.Microsoft.DependencyInjection.Abstracts;
-using Xunit.Microsoft.DependencyInjection.ExampleTests.Services;
-
-namespace Xunit.Microsoft.DependencyInjection.ExampleTests.Fixtures;
+namespace Xunit.Microsoft.DependencyInjection.ExampleTests.Fixtures;
 
 public class TestFixture : TestBedFixture
 {
@@ -17,8 +10,14 @@ protected override void AddServices(IServiceCollection services, IConfiguration?
     protected override ValueTask DisposeAsyncCore()
         => new();
 
+    [Obsolete]
     protected override IEnumerable<string> GetConfigurationFiles()
     {
         yield return "appsettings.json";
     }
+
+    protected override IEnumerable<TestAppSettings> GetTestAppSettings()
+    {
+        yield return new() { Filename = "appsettings.json", IsOptional = false };
+    }
 }

examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj

@@ -14,7 +14,7 @@
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
 		<PackageReference Include="coverlet.collector" Version="3.1.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />

src/Abstracts/TestBedFixture.cs

@@ -40,25 +40,28 @@ public IServiceProvider GetServiceProvider(ITestOutputHelper testOutputHelper)
 		=> GetServiceProvider(testOutputHelper).GetService<T>();
 
 	protected abstract void AddServices(IServiceCollection services, IConfiguration? configuration);
+	
+	[Obsolete("This method is deprecated. Please override and use GetTestAppSettings() method instead.", true)]
 	protected abstract IEnumerable<string> GetConfigurationFiles();
+	protected abstract IEnumerable<TestAppSettings> GetTestAppSettings();
 
 	protected virtual ILoggingBuilder AddLoggingProvider(ILoggingBuilder loggingBuilder, ILoggerProvider loggerProvider)
 		=> loggingBuilder.AddProvider(loggerProvider);
 
 	private IConfigurationRoot? GetConfigurationRoot()
 	{
-		var configurationFiles = GetConfigurationFiles();
+		var testAppSettings = GetTestAppSettings();
 		return
-			configurationFiles.All(c => !string.IsNullOrEmpty(c))
-			? GetConfigurationRoot(configurationFiles)
+			testAppSettings.All(setting => !string.IsNullOrEmpty(setting.Filename))
+			? GetConfigurationRoot(testAppSettings)
 			: default;
 	}
 
-	private IConfigurationRoot GetConfigurationRoot(IEnumerable<string> configurationFiles)
+	private IConfigurationRoot GetConfigurationRoot(IEnumerable<TestAppSettings> configurationFiles)
 	{
 		foreach (var configurationFile in configurationFiles)
 		{
-			ConfigurationBuilder.AddJsonFile(configurationFile);
+			ConfigurationBuilder.AddJsonFile(configurationFile.Filename, optional: configurationFile.IsOptional);
 		}
 		ConfigurationBuilder.AddEnvironmentVariables();
 		return ConfigurationBuilder.Build();

src/TestAppSettings.cs

@@ -0,0 +1,7 @@
+namespace Xunit.Microsoft.DependencyInjection;
+
+public class TestAppSettings
+{
+	public string? Filename { get; set; }
+	public bool IsOptional { get; set; } = false;
+}