From 27e4e1aca3863389098b9be6dd9c5b7c030180b8 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 9 Oct 2018 10:41:52 -0700 Subject: [PATCH] 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. ///