cleanup

Author: BrennanConroy

src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs

@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Hosting;
 
 internal sealed class GenericWebHostBuilder : WebHostBuilderBase, ISupportsStartup
 {
-    private const string _startupConfigName = "__UseStartup.StartupType";
+    private const string _startupConfigName = "__UseStartup.StartupObject";
     private readonly object _startupKey = new object();
 
     private AggregateException? _hostingStartupErrors;

src/Hosting/Hosting/test/WebHostBuilderTests.cs

@@ -1681,11 +1681,11 @@ public void Configure(IWebHostBuilder builder)
                        // This check is required because MVC still uses the
                        // IWebHostEnvironment instance before the container is baked
 #pragma warning disable CS0618 // Type or member is obsolete
-                       var heDescriptor = services.FirstOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
+                       var heDescriptor = services.LastOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
                        Assert.NotNull(heDescriptor);
                        Assert.NotNull(heDescriptor.ImplementationInstance);
 #pragma warning restore CS0618 // Type or member is obsolete
-                       var wheDescriptor = services.FirstOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
+                       var wheDescriptor = services.LastOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
                        Assert.NotNull(wheDescriptor);
                        Assert.NotNull(wheDescriptor.ImplementationInstance);
                    })