From e30ae8cc3dbe4e59ae999a870c99c7cda9898f77 Mon Sep 17 00:00:00 2001 From: Luke Latham <1622880+guardrex@users.noreply.github.com> Date: Fri, 5 Oct 2018 10:11:04 -0500 Subject: [PATCH 1/3] Fix typo (#1559) --- src/Microsoft.Extensions.Hosting.Abstractions/IHostLifetime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Extensions.Hosting.Abstractions/IHostLifetime.cs b/src/Microsoft.Extensions.Hosting.Abstractions/IHostLifetime.cs index 129fb44c8a..2788478d83 100644 --- a/src/Microsoft.Extensions.Hosting.Abstractions/IHostLifetime.cs +++ b/src/Microsoft.Extensions.Hosting.Abstractions/IHostLifetime.cs @@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Hosting public interface IHostLifetime { /// - /// Called at the start of which will wait until it's compete before + /// Called at the start of which will wait until it's complete before /// continuing. This can be used to delay startup until signaled by an external event. /// Task WaitForStartAsync(CancellationToken cancellationToken); From dd2056ae1afdc729adfea584d7de79ef7f1534c0 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 7 Oct 2018 19:15:05 +0000 Subject: [PATCH 2/3] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 62 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b09c3954c4..af90a17bb7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,44 +3,44 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180928.5 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview2-20181004.6 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 2.0.9 2.1.3 - 2.2.0-preview3-26927-02 + 2.2.0-preview3-27001-02 1.0.1 15.6.1 4.7.49 2.0.3 1.4.0 - 3.2.0 + 4.0.0 4.5.0 4.5.0 1.6.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 0507680073..3e92dd5543 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180928.5 -commithash:43faa29f679f47b88689d645b39e6be5e0055d70 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac From 27e4e1aca3863389098b9be6dd9c5b7c030180b8 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 9 Oct 2018 10:41:52 -0700 Subject: [PATCH 3/3] Remove RestoreOnPublish parameter (#1533) --- .../ApplicationPublisher.cs | 4 +--- .../CachingApplicationPublisher.cs | 5 ----- .../Common/DeploymentParameters.cs | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/ApplicationPublisher.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/ApplicationPublisher.cs index 1af71c3ae9..4d576db725 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/ApplicationPublisher.cs +++ b/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. diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/CachingApplicationPublisher.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/CachingApplicationPublisher.cs index 582297ccc7..e32d8e22db 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/CachingApplicationPublisher.cs +++ b/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, diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs index 4b94657743..5e347e4933 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Common/DeploymentParameters.cs @@ -147,11 +147,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting /// public string AdditionalPublishParameters { get; set; } - /// - /// Publish restores by default, this property opts out by default. - /// - public bool RestoreOnPublish { get; set; } - /// /// To publish the application before deployment. ///