From e9b8bf085d04a0a0a2f59820d8d8369162b6255c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 15 May 2018 18:10:57 -0700 Subject: [PATCH] Fix dotnet publish issues with aspnetcorerh.dll (#835) --- build/dependencies.props | 2 +- build/testsite.props | 8 ++++---- .../Inprocess/StartupTests.cs | 2 +- .../OutOfProcess/HelloWorldTest.cs | 10 +++++++++- .../OutOfProcess/HttpsTest.cs | 4 ++-- .../OutOfProcess/NtlmAuthentationTest.cs | 2 +- test/TestTasks/InjectRequestHandler.cs | 6 +++--- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index f454a5cd9b..a59d3acf3e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,7 +14,7 @@ 2.2.0-preview1-34184 2.2.0-preview1-34184 2.2.0-preview1-34184 - 0.6.0-preview1-34184 + 0.6.0-a-preview1-portableFlag-17022 2.2.0-preview1-34184 2.2.0-preview1-34184 2.2.0-preview1-34184 diff --git a/build/testsite.props b/build/testsite.props index f45cefa7e1..aa60d852e4 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 6777c35188..de20779726 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -106,11 +106,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var logger = loggerFactory.CreateLogger("HelloWorldTest"); var deploymentParameters = GetBaseDeploymentParameters(); + deploymentParameters.ApplicationType = ApplicationType.Standalone; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { var deploymentResult = await deployer.DeployAsync(); - deploymentParameters.ApplicationType = ApplicationType.Standalone; // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await RetryHelper.RetryRequest(() => diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 7cee6a6777..7160366ac2 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task HelloWorld_IISExpress_Clr_X64_Portable(ANCMVersion ancmVersion) @@ -35,6 +35,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion); } + [Theory] + [InlineData(ANCMVersion.AspNetCoreModule)] + [InlineData(ANCMVersion.AspNetCoreModuleV2)] + public Task HelloWorld_IISExpress_CoreClr_X64_Standalone(ANCMVersion ancmVersion) + { + return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone, ancmVersion); + } + private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, ANCMVersion ancmVersion) { var serverType = ServerType.IISExpress; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index 9066c60c72..384c890f2e 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task Https_HelloWorld_CLR_X64(ANCMVersion ancmVersion) @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion); } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task Https_HelloWorld_NoClientCert_Clr_X64(ANCMVersion ancmVersion) diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index a5ed40c7c6..d9ce75a5c5 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] + [Theory] [InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task NtlmAuthentication_Clr_X64(ANCMVersion ancmVersion) diff --git a/test/TestTasks/InjectRequestHandler.cs b/test/TestTasks/InjectRequestHandler.cs index 639428ebd1..4da8129d71 100644 --- a/test/TestTasks/InjectRequestHandler.cs +++ b/test/TestTasks/InjectRequestHandler.cs @@ -14,9 +14,9 @@ namespace TestTasks { private static void Main(string[] args) { - var depsFile = args[2]; - var rid = args[0]; - var libraryLocation = args[1]; + string rid = args[0]; + string libraryLocation = args[1]; + string depsFile = args[2]; JToken deps; using (var file = File.OpenText(depsFile))