Update .NET SDK

Update .NET SDK to pick up fix for issues with IConfiguration and remove workaround.

Author: martincostello

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21373.1",
+    "version": "6.0.100-rc.1.21374.7",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

tests/TodoApp.Tests/TodoApp.Tests.csproj

@@ -8,7 +8,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="JustEat.HttpClientInterception" Version="3.1.0" />
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0-rc.1.21373.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0-rc.1.21374.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Microsoft.Playwright" Version="1.13.0" />
     <PackageReference Include="Shouldly" Version="4.0.3" />

tests/TodoApp.Tests/TodoAppFixture.cs

@@ -61,24 +61,18 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             builder.Sources.Clear();
 
             builder.AddJsonFile(fullPath)
-                    .AddInMemoryCollection(config);
+                   .AddInMemoryCollection(config);
         });
 
         builder.ConfigureLogging((loggingBuilder) => loggingBuilder.ClearProviders().AddXUnit(this))
-                .UseSolutionRelativeContentRoot(Path.Combine("src", "TodoApp"));
+               .UseSolutionRelativeContentRoot(Path.Combine("src", "TodoApp"));
 
         builder.ConfigureServices((services) =>
         {
             services.AddSingleton<IHttpMessageHandlerBuilderFilter, HttpRequestInterceptionFilter>(
                 (_) => new HttpRequestInterceptionFilter(Interceptor));
 
             services.AddSingleton<IPostConfigureOptions<GitHubAuthenticationOptions>, RemoteAuthorizationEventsFilter>();
-
-            // HACK Remove the IConfiguration that WebApplication(Builder) adds that
-            // does not reflect the changes applied by ConfigureAppConfiguration() above.
-            // See https://github.com/dotnet/aspnetcore/issues/33876.
-            var configs = services.Where((p) => p.ServiceType == typeof(IConfiguration)).ToList();
-            services.Remove(configs[1]);
         });
 
         Interceptor.RegisterBundle("oauth-http-bundle.json");