From 2e56f056d0034d999528483b2d35be8226bbe634 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Wed, 5 Dec 2018 08:24:12 -0800
Subject: [PATCH] Re-enable IISIntegration tests (#4377)

---
 .../Server.IntegrationTesting/src/ApplicationPublisher.cs    | 5 +++++
 src/IISIntegration/build/repo.props                          | 1 -
 .../test/Common.FunctionalTests/Inprocess/StartupTests.cs    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs b/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs
index 4d576db725..d332797b95 100644
--- a/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs
+++ b/src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs
@@ -43,6 +43,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 {
                     parameters += $" --runtime {GetRuntimeIdentifier(deploymentParameters)}";
                 }
+                else
+                {
+                    // Workaround for https://github.com/aspnet/websdk/issues/422
+                    parameters += " -p:UseAppHost=false";
+                }
 
                 parameters += $" {deploymentParameters.AdditionalPublishParameters}";
 
diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props
index 181d77ddf0..a859fa8cac 100644
--- a/src/IISIntegration/build/repo.props
+++ b/src/IISIntegration/build/repo.props
@@ -14,7 +14,6 @@
     <ExcludeFromTest Include="$(RepositoryRoot)test\TestSites\*.csproj" />
     <ExcludeFromTest Include="$(RepositoryRoot)test\IISTestSite\*.csproj" />
     <ExcludeSolutions Include="$(RepositoryRoot)IISIntegration.NoV1.sln" />
-    <ExcludeFromTest Include="$(RepositoryRoot)test\**\*.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(SkipIISTests)' == 'true'" >
diff --git a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs
index 3bcc134cb2..458d356eba 100644
--- a/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs
+++ b/src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs
@@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             await StartAsync(deploymentParameters);
         }
 
-        [ConditionalFact]
+        [ConditionalFact(Skip="https://github.com/aspnet/AspNetCore/issues/3950")]
         [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
         public async Task StartsWithPortableAndBootstraperExe()
         {