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

.vsts-pipelines/templates/build-steps.yml

@@ -3,7 +3,7 @@ phases:
   parameters:
     agentOs: Windows
     beforeBuild:
-      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; Restart-Service w3svc"
+      - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1"
         displayName: Prepare repo
     afterBuild:
       - task: PublishBuildArtifacts@1

build/dependencies.props

@@ -47,6 +47,7 @@
     <SystemNumericsVectorsPackageVersion>4.6.0-preview1-26727-04</SystemNumericsVectorsPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview1-26727-04</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview1-26727-04</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview1-26727-04</SystemServiceProcessServiceControllerPackageVersion>
     <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>

src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs

@@ -6,12 +6,14 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.ServiceProcess;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.Extensions.Logging;
 using Microsoft.Web.Administration;
+using TimeoutException = System.TimeoutException;
 
 namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
 {
@@ -164,6 +166,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
 
         private async Task WaitUntilSiteStarted()
         {
+            ServiceController serviceController = new ServiceController("w3svc");
+            Logger.LogInformation("W3SVC status " + serviceController.Status);
+
+            if (serviceController.Status != ServiceControllerStatus.Running &&
+                serviceController.Status != ServiceControllerStatus.StartPending)
+            {
+                Logger.LogInformation("Starting W3SVC");
+
+                serviceController.Start();
+                serviceController.WaitForStatus(ServiceControllerStatus.Running, _timeout);
+            }
+
             var sw = Stopwatch.StartNew();
 
             while (sw.Elapsed < _timeout)

src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -20,6 +20,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" ExcludeAssets="contentfiles" PrivateAssets="None" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
     <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
     <PackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(VCTargetsPath)' != ''">