From 79b038afb44b5267f429efdc270659de77519361 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 23 Mar 2018 08:35:53 -0700 Subject: [PATCH] Revert "Merge branch 'dev' into release/2.1" This reverts commit 88d40dacf93c9fbb5dfca8326363511c467e66f0, reversing changes made to ed801f0e882b5e32b93856cf465db0f52ce54807. --- build/dependencies.props | 66 +++++++++---------- korebuild-lock.txt | 4 +- .../OutOfProcess/HelloWorldTest.cs | 11 ++-- .../OutOfProcess/HttpsTest.cs | 10 +-- .../OutOfProcess/NtlmAuthentationTest.cs | 4 +- 5 files changed, 48 insertions(+), 47 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 36524c989a..d2cb0c14a9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,45 +3,45 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15726 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 0.5.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-pk-corefx0-16426 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 - 2.1.0-preview2-30220 + 2.1.0-preview2-15746 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 0.5.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 1.1.0 - 2.1.0-preview2-30220 + 2.1.0-preview2-30355 2.0.0 - 2.1.0-preview2-26308-01 - 2.1.0-preview2-30220 + 2.1.0-preview2-26314-02 + 2.1.0-preview2-30355 15.6.0 7.0.0 - 4.5.0-preview2-26308-02 - 4.5.0-preview2-26308-02 + 4.5.0-preview2-26313-01 + 4.5.0-preview2-26313-01 6.1.7601.17515 - 4.5.0-preview2-26308-02 - 4.5.0-preview2-26308-02 - 4.5.0-preview2-26308-02 - 4.5.0-preview2-26308-02 + 4.5.0-preview2-26313-01 + 4.5.0-preview2-26313-01 + 4.5.0-preview2-26313-01 + 4.5.0-preview2-26313-01 2.3.1 2.4.0-beta.1.build3945 - \ No newline at end of file + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index bdaa7048b3..e21a153898 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15726 -commithash:599e691c41f502ed9e062b1822ce13b673fc916e +version:2.1.0-preview2-15746 +commithash:d5f868ce395d404711be71181179fcf63643641e diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 6125b0df84..19f272a491 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #if NETCOREAPP2_0 || NETCOREAPP2_1 -using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; @@ -20,13 +19,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] public Task HelloWorld_IISExpress_Clr_X64_Portable() { return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable); } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact] public Task HelloWorld_IISExpress_CoreClr_X64_Portable() { return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable); @@ -59,7 +58,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { var deploymentResult = await deployer.DeployAsync(); - deploymentResult.HttpClient.Timeout = TimeSpan.FromSeconds(5); // Request to base address and check if various parts of the body are rendered & measure the cold startup time. var response = await RetryHelper.RetryRequest(() => @@ -86,7 +84,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests response = await deploymentResult.HttpClient.GetAsync("/Auth"); responseText = await response.Content.ReadAsStringAsync(); - Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth"); + + // We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled + // We now expect that windows auth is enabled rather than disabled. + Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth"); } catch (XunitException) { diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index 40d1a6f66f..a91a3b78d3 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")] public Task Https_HelloWorld_CLR_X64() { return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396); } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact] public Task Https_HelloWorld_CoreCLR_X64_Portable() { return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394); @@ -93,13 +93,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact] public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable() { return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false); } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] public Task Https_HelloWorld_NoClientCert_Clr_X64() { return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false); @@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { ApplicationBaseUriHint = applicationBaseUrl, EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', - ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null, + ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", ApplicationType = applicationType, diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index e0bcb5e5e5..fe3b583a0f 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] public Task NtlmAuthentication_Clr_X64() { return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051); } - [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")] + [Fact] public Task NtlmAuthentication_CoreClr_X64_Portable() { return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052);