From f901bca8a7183d7c0d93262fb597bddafc535557 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Fri, 27 Jul 2018 15:00:04 -0700
Subject: [PATCH] Fixing jenkins agents. (#1106)

---
 build/buildpipeline/windows.groovy                            | 2 +-
 build/dependencies.props                                      | 4 ++--
 .../IISDeployer.cs                                            | 4 +++-
 test/Common.FunctionalTests/AppHostConfig/IIS.config          | 2 --
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy
index dcd6894cb7..3aa3d99283 100644
--- a/build/buildpipeline/windows.groovy
+++ b/build/buildpipeline/windows.groovy
@@ -9,7 +9,7 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') {
     }
     stage ('Build') {
         def logFolder = getLogFolder()
-        def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}';\$env:ASPNETCORE_TEST_SKIP_IIS='true';"
+        def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'"
         bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"&.\\tools\\update_schema.ps1;${environment};&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\""
     }
 }
diff --git a/build/dependencies.props b/build/dependencies.props
index 665c81f665..9dc782a008 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
@@ -14,7 +14,7 @@
     <MicrosoftAspNetCoreHttpOverridesPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreHttpOverridesPackageVersion>
     <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreHttpPackageVersion>
     <MicrosoftAspNetCoreHttpSysSourcesPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
-    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview1-34755</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
+    <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-a-preview1-IISVariants-17101</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
     <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreServerKestrelPackageVersion>
     <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreTestHostPackageVersion>
     <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34755</MicrosoftAspNetCoreTestingPackageVersion>
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
index 3f7425fce6..18b8e5d2ea 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
@@ -61,7 +61,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
                 // For now, only support using published output
                 DeploymentParameters.PublishApplicationBeforeDeployment = true;
 
-
                 if (DeploymentParameters.ApplicationType == ApplicationType.Portable)
                 {
                     DefaultWebConfigActions.Add(
@@ -75,6 +74,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
                     DotnetPublish();
                     contentRoot = DeploymentParameters.PublishedApplicationRootPath;
                     IISDeploymentParameters.AddDebugLogToWebConfig(Path.Combine(contentRoot, $"{_application.WebSiteName}.txt"));
+                    DefaultWebConfigActions.Add(WebConfigHelpers.AddOrModifyHandlerSection(
+                        key: "modules",
+                        value: DeploymentParameters.AncmVersion.ToString()));
                     RunWebConfigActions();
                 }
 
diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config
index 4d30d2ad0f..c8c4848e25 100644
--- a/test/Common.FunctionalTests/AppHostConfig/IIS.config
+++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config
@@ -225,7 +225,6 @@
             <add name="AnonymousAuthenticationModule" image="%windir%\System32\inetsrv\authanon.dll" />
             <add name="RequestFilteringModule" image="%windir%\System32\inetsrv\modrqflt.dll" />
             <add name="CustomErrorModule" image="%windir%\System32\inetsrv\custerr.dll" />
-            <add name="AspNetCoreModule" image="%SystemRoot%\system32\inetsrv\aspnetcore.dll" />
             <!--<add name="WebSocketModule" image="%windir%\System32\inetsrv\iiswsock.dll" />-->
         </globalModules>
 
@@ -282,7 +281,6 @@
             <add name="AnonymousAuthenticationModule" lockItem="true" />
             <add name="RequestFilteringModule" lockItem="true" />
             <add name="CustomErrorModule" lockItem="true" />
-            <add name="AspNetCoreModule" />
             <!--<add name="WebSocketModule" lockItem="true" />-->
         </modules>