From ed7e6db79eb62be28fc17a3c21324707ee710c48 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Sat, 21 Apr 2018 08:01:30 -0700 Subject: [PATCH 1/2] Attempt to fix more failing tests in prodcon builds --- .../Deployers/SelfHostDeployer.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs index 2bf3c731f5..64d0b34f78 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs @@ -93,7 +93,9 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0"); executableName = DotnetCommandName; - executableArgs = $"run --no-restore --framework {targetFramework} {DotnetArgumentSeparator}"; + // 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. + executableArgs = $"run --no-restore --framework {targetFramework} -p:VerifyMatchingImplicitPackageVersion=false {DotnetArgumentSeparator}"; } executableArgs += $" --server.urls {hintUrl} " From 0f131ac2459280c01f8a3c8d3592cb6e0363693c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Sat, 21 Apr 2018 08:13:29 -0700 Subject: [PATCH 2/2] Disambiguate /p from -p on dotnet-run --- .../Deployers/SelfHostDeployer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs index 64d0b34f78..9f1c64dca1 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting executableName = DotnetCommandName; // 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. - executableArgs = $"run --no-restore --framework {targetFramework} -p:VerifyMatchingImplicitPackageVersion=false {DotnetArgumentSeparator}"; + executableArgs = $"run --no-restore --framework {targetFramework} /p:VerifyMatchingImplicitPackageVersion=false {DotnetArgumentSeparator}"; } executableArgs += $" --server.urls {hintUrl} "