Merge branch 'merge/release/2.2-to-master'

test/Common.FunctionalTests/AppOfflineTests.cs

@@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
             DeletePublishOutput(deploymentResult);
         }
 
-        [ConditionalFact(Skip = "https://github.com/aspnet/IISIntegration/issues/933")]
+        [ConditionalFact]
         public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess()
         {
             var deploymentResult = await DeployApp(HostingModel.InProcess);

test/IISExpress.FunctionalTests/InProcess/StartupTests.cs

@@ -145,6 +145,24 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
                 EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"),
                 EventLogHelpers.InProcessThreadException(deploymentResult, ".*?Application is running inside IIS process but is not configured to use IIS server"));
         }
+
+        [ConditionalFact]
+        public async Task LogsStartupExceptionExitError()
+        {
+            var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.StartupExceptionWebsite, publish: true);
+            deploymentParameters.TransformArguments((a, _) => $"{a} Throw");
+            
+            var deploymentResult = await DeployAsync(deploymentParameters);
+
+            var response = await deploymentResult.HttpClient.GetAsync("/");
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+
+            StopServer();
+
+            EventLogHelpers.VerifyEventLogEvents(deploymentResult,
+                EventLogHelpers.InProcessFailedToStart(deploymentResult, "CLR worker thread exited prematurely"),
+                EventLogHelpers.InProcessThreadException(deploymentResult, ", exception code = '0xe0434352'"));
+        }
         
         [ConditionalFact]
         public async Task LogsUnexpectedThreadExitError()

test/WebSites/StartupExceptionWebSite/Program.cs

@@ -44,6 +44,8 @@ namespace IISTestSite
                 case "Hang":
                     Thread.Sleep(Timeout.Infinite);
                     break;
+                case "Throw":
+                    throw new InvalidOperationException("Program.Main exception");
                 case "HangOnStop":
                     var host = new WebHostBuilder()
                         .UseIIS()