Adds HostingModel as an extra DeploymentParameter (#1261)

aspnet · Nov 10, 2017 · 40bd6e5 · 40bd6e5
1 parent a78b9c7
commit 40bd6e5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs
@@ -106,6 +106,8 @@ public DeploymentParameters(
 
         public string PublishedApplicationRootPath { get; set; }
 
+        public HostingModel HostingModel { get; set; }
+
         /// <summary>
         /// Environment variables to be set before starting the host.
         /// Not applicable for IIS Scenarios.

diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/HostingModel.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/HostingModel.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Server.IntegrationTesting
+{
+    public enum HostingModel
+    {
+        OutOfProcess,
+        InProcess
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/IISExpressDeployer.cs
@@ -142,6 +142,13 @@ public override async Task<DeploymentResult> DeployAsync()
 
                         DeploymentParameters.ServerConfigLocation = Path.GetTempFileName();
 
+                        if (serverConfig.Contains("[HostingModel]"))
+                        {
+                            var hostingModel = DeploymentParameters.HostingModel.ToString();
+                            serverConfig.Replace("[HostingModel]", hostingModel);
+                            Logger.LogDebug("Writing HostingModel '{hostingModel}' to config", hostingModel);
+                        }
+
                         Logger.LogDebug("Saving Config to {configPath}", DeploymentParameters.ServerConfigLocation);
 
                         if (Logger.IsEnabled(LogLevel.Trace))