Merge branch 'release/2.2'

src/Microsoft.AspNetCore.Server.IntegrationTesting/ApplicationPublisher.cs

@@ -35,9 +35,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                                  + $" --output \"{publishDirectory.FullName}\""
                                  + $" --framework {deploymentParameters.TargetFramework}"
                                  + $" --configuration {deploymentParameters.Configuration}"
-                                 + (deploymentParameters.RestoreOnPublish
-                                     ? string.Empty
-                                     : " --no-restore -p:VerifyMatchingImplicitPackageVersion=false");
+                                 + " --no-restore -p:VerifyMatchingImplicitPackageVersion=false";
                 // Set VerifyMatchingImplicitPackageVersion to disable errors when Microsoft.NETCore.App's version is overridden externally
                 // This verification doesn't matter if we are skipping restore during tests.
 

src/Microsoft.AspNetCore.Server.IntegrationTesting/CachingApplicationPublisher.cs

@@ -35,11 +35,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 throw new InvalidOperationException("DeploymentParameters.PublishedApplicationRootPath not supported");
             }
 
-            if (deploymentParameters.RestoreOnPublish)
-            {
-                throw new InvalidOperationException("DeploymentParameters.RestoreOnPublish not supported");
-            }
-
             var dotnetPublishParameters = new DotnetPublishParameters
             {
                 TargetFramework = deploymentParameters.TargetFramework,

src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs

@@ -147,11 +147,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         /// </summary>
         public string AdditionalPublishParameters { get; set; }
 
-        /// <summary>
-        /// Publish restores by default, this property opts out by default.
-        /// </summary>
-        public bool RestoreOnPublish { get; set; }
-
         /// <summary>
         /// To publish the application before deployment.
         /// </summary>

src/Microsoft.Extensions.Hosting.Abstractions/IHostLifetime.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Hosting
     public interface IHostLifetime
     {
         /// <summary>
-        /// Called at the start of <see cref="IHost.StartAsync(CancellationToken)"/> which will wait until it's compete before
+        /// Called at the start of <see cref="IHost.StartAsync(CancellationToken)"/> which will wait until it's complete before
         /// continuing. This can be used to delay startup until signaled by an external event.
         /// </summary>
         Task WaitForStartAsync(CancellationToken cancellationToken);