diff --git a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider.csproj b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider.csproj index 742628fd56..6c47fed927 100644 --- a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider.csproj +++ b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider.csproj @@ -1,14 +1,13 @@ - net8.0 + net11.0 disable enable - - + diff --git a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Program.cs b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Program.cs index e8dfa2d6e1..8d910d1b11 100644 --- a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Program.cs +++ b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Program.cs @@ -3,9 +3,7 @@ var builder = WebApplication.CreateBuilder(args); // Add services to the container. -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle -builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +builder.Services.AddOpenApi(); builder.Services.AddControllers(); builder.Services.AddHostedService(); @@ -21,14 +19,13 @@ var app = builder.Build(); -var serviceScope = app.Services.CreateScope(); +using var serviceScope = app.Services.CreateScope(); var serviceInstance2 = serviceScope.ServiceProvider.GetRequiredService(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { - app.UseSwagger(); - app.UseSwaggerUI(); + app.MapOpenApi(); } app.UseHttpsRedirection(); diff --git a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Properties/launchSettings.json b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Properties/launchSettings.json index 79a9486354..73b130098a 100644 --- a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Properties/launchSettings.json +++ b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Properties/launchSettings.json @@ -5,7 +5,7 @@ "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "launchUrl": "swagger", + "launchUrl": "openapi/v1.json", "applicationUrl": "https://localhost:7006", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" diff --git a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Services/ExampleBackgroundService.cs b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Services/ExampleBackgroundService.cs index 85a62873c4..7b6b66e854 100644 --- a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Services/ExampleBackgroundService.cs +++ b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/HowToGetAnInstanceOfIServiceProvider/Services/ExampleBackgroundService.cs @@ -1,10 +1,10 @@ namespace HowToGetAnInstanceOfIServiceProvider.Services; -public class ExampleBackgroundService(IServiceProvider ServiceProvider) : BackgroundService +public class ExampleBackgroundService(IServiceProvider serviceProvider) : BackgroundService { protected override Task ExecuteAsync(CancellationToken stoppingToken) { - using var scope = ServiceProvider.CreateScope(); + using var scope = serviceProvider.CreateScope(); var service = scope.ServiceProvider.GetRequiredService(); return Task.CompletedTask; diff --git a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/HowToGetAnInstanceOfIServiceProvider.UnitTests.csproj b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/HowToGetAnInstanceOfIServiceProvider.UnitTests.csproj index 1b626fcd82..4782217f2f 100644 --- a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/HowToGetAnInstanceOfIServiceProvider.UnitTests.csproj +++ b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/HowToGetAnInstanceOfIServiceProvider.UnitTests.csproj @@ -1,7 +1,7 @@ - net8.0 + net11.0 enable disable @@ -10,12 +10,11 @@ - - - - - - + + + + + diff --git a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/IServiceProvideResolutionUnitTests.cs b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/IServiceProvideResolutionUnitTests.cs index bef38996a3..b9f0f35386 100644 --- a/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/IServiceProvideResolutionUnitTests.cs +++ b/dotnet-dependency-injection/HowToGetAnInstanceOfIServiceProvider/Tests/HowToGetAnInstanceOfIServiceProvider.UnitTests/IServiceProvideResolutionUnitTests.cs @@ -58,6 +58,21 @@ public void GivenProductionEnvironment_WhenServiceIsResolved_ThenShouldReturnExa Assert.IsType(exampleService); } + [Fact] + public void GivenUnregisteredService_WhenResolved_ThenGetServiceReturnsNullAndGetRequiredServiceThrows() + { + // Arrange + var serviceProvider = new ServiceCollection().BuildServiceProvider(); + + // Act + var service = serviceProvider.GetService(); + var exception = Record.Exception(() => serviceProvider.GetRequiredService()); + + // Assert + Assert.Null(service); + Assert.IsType(exception); + } + [Fact] public async Task GivenBackgroundService_WhenStartAsyncIsCalled_ThenShouldNotThrowException() {