From 03cb4a6e1491318a0e9acd787cd88acbc2dc33fd Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 19 Dec 2018 11:32:23 +1300 Subject: [PATCH 1/3] Add missing dependencies to the MVC dependencies.props (#5714) --- src/Mvc/build/dependencies.props | 1 + .../Microsoft.AspNetCore.Mvc.Core.csproj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Mvc/build/dependencies.props b/src/Mvc/build/dependencies.props index dd90f902bb..30a3d6a350 100644 --- a/src/Mvc/build/dependencies.props +++ b/src/Mvc/build/dependencies.props @@ -85,6 +85,7 @@ 2.2.0-rtm-35519 2.2.0-rtm-35519 2.2.0-rtm-35519 + 2.2.0-rtm-35519 2.0.9 2.1.3 2.2.0-preview3-27014-02 diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj index 161671b41e..9e9a1556ca 100644 --- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj @@ -17,6 +17,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + @@ -45,10 +46,9 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - - + From de954ce7028ffe9ef7797506374603f12bb3c686 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 18 Dec 2018 18:46:56 -0500 Subject: [PATCH 2/3] Fixing IIS Tests (#5682) --- build/dependencies.props | 1 + .../Microsoft.AspNetCore.FunctionalTests.csproj | 1 + src/Servers/IIS/ResolveIisReferences.targets | 6 +++--- .../Microsoft.AspNetCore.Server.IIS.csproj | 11 +++++++++-- ...spNetCore.Server.IntegrationTesting.IIS.csproj | 15 +++++++++++++++ .../Common.FunctionalTests/Utilities/Helpers.cs | 2 +- .../Utilities/IISTestSiteFixture.cs | 2 +- .../BackwardsCompatibilityTests.cs | 2 +- .../ForwardsCompatibilityTests.cs | 2 +- .../IIS/test/IIS.Tests/Utilities/TestServer.cs | 3 ++- .../IISExpress.FunctionalTests.csproj | 2 +- .../InProcessWebSite.csproj | 2 +- 12 files changed, 37 insertions(+), 12 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 6f676dc4b9..99e0759095 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -130,6 +130,7 @@ 2.2.0 2.2.0 2.2.1 + 2.2.0 5.2.6 1.7.1 2.3.2 diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index a6bf62fe99..a36f80c0fd 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -18,5 +18,6 @@ + diff --git a/src/Servers/IIS/ResolveIisReferences.targets b/src/Servers/IIS/ResolveIisReferences.targets index b69a024af0..11b7c2a16c 100644 --- a/src/Servers/IIS/ResolveIisReferences.targets +++ b/src/Servers/IIS/ResolveIisReferences.targets @@ -16,7 +16,7 @@ with the right MSBuild incantations to get output copied to the right place. - + @@ -26,7 +26,7 @@ with the right MSBuild incantations to get output copied to the right place. Platform=x64 - x64\ + x64\%(HandlerPath)\ false @@ -48,7 +48,7 @@ with the right MSBuild incantations to get output copied to the right place. Platform=x86 - x86\ + x86\%(HandlerPath)\ false diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index bc3c92fbb7..0adabf3592 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -19,9 +19,16 @@ + + + + + + + + - - diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 8f241ac01b..c5e4d7c8e6 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -13,10 +13,25 @@ false + + + + + + + + + + + + diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs index 1e31126eab..7876403e65 100644 --- a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs +++ b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static string GetTestWebSitePath(string name) { - return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "WebSites", name); + return Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"),"test", "testassets", name); } public static string GetInProcessTestSitesPath() diff --git a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index e8cfd8f641..275b3c834f 100644 --- a/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { } - public IISTestSiteFixture(Action configure) + internal IISTestSiteFixture(Action configure) { var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly); _loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)); diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs index 2e4a7b1c40..d42a5ce40c 100644 --- a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs +++ b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { if (handle.ModuleName == "aspnetcorev2.dll") { - Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion); + Assert.Equal("12.2.18316.0", handle.FileVersionInfo.FileVersion); return; } } diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs index 5f4ebb5608..02b247ac4b 100644 --- a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs +++ b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { if (handle.ModuleName == "aspnetcorev2_inprocess.dll") { - Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion); + Assert.Equal("12.2.18316.0", handle.FileVersionInfo.FileVersion); return; } } diff --git a/src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs b/src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs index 351b826316..0b94ea4dc3 100644 --- a/src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs +++ b/src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs @@ -31,7 +31,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests private const string HWebCoreDll = "hwebcore.dll"; internal static string HostableWebCoreLocation => Environment.ExpandEnvironmentVariables($@"%windir%\system32\inetsrv\{HWebCoreDll}"); - internal static string BasePath => Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath); + internal static string BasePath => Path.Combine(Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath), + Environment.Is64BitProcess ? "x64" : "x86"); internal static string AspNetCoreModuleLocation => Path.Combine(BasePath, AspNetCoreModuleDll); diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index cfeed6eca7..e2038387de 100644 --- a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.2 diff --git a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index 0b4bd072d5..e58313842f 100644 --- a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -18,7 +18,7 @@ - + From 4601a26ec2cbadbc829204a2549b981c8c01841b Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 21 Dec 2018 07:33:54 +1300 Subject: [PATCH 3/3] Fix order in DFA matcher test (#5954) --- src/Http/HttpAbstractions.sln | 15 +++++++++++++++ .../test/UnitTests/Matching/DfaMatcherTest.cs | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index ab84dfd3ff..f47dfad71e 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -91,6 +91,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{A0C7AE95-BBE7-4F75-9508-F5881C8A456D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -461,6 +463,18 @@ Global {A0C7AE95-BBE7-4F75-9508-F5881C8A456D}.Release|x64.Build.0 = Release|Any CPU {A0C7AE95-BBE7-4F75-9508-F5881C8A456D}.Release|x86.ActiveCfg = Release|Any CPU {A0C7AE95-BBE7-4F75-9508-F5881C8A456D}.Release|x86.Build.0 = Release|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Debug|x64.ActiveCfg = Debug|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Debug|x64.Build.0 = Debug|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Debug|x86.ActiveCfg = Debug|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Debug|x86.Build.0 = Debug|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Release|Any CPU.Build.0 = Release|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Release|x64.ActiveCfg = Release|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Release|x64.Build.0 = Release|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Release|x86.ActiveCfg = Release|Any CPU + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -498,6 +512,7 @@ Global {30BDD853-AF73-4D15-B4FB-621E7969B9C9} = {A4913006-307E-46FE-93BF-C39AC4AD70D7} {716CC743-D9FA-4EF6-8767-152A8E70C52A} = {793FFE24-138A-4C3D-81AB-18D625E36230} {A0C7AE95-BBE7-4F75-9508-F5881C8A456D} = {793FFE24-138A-4C3D-81AB-18D625E36230} + {735DAFBA-8F07-4E68-BC46-A16E8A5A5F74} = {793FFE24-138A-4C3D-81AB-18D625E36230} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {85B5E151-2E9D-419C-83DD-0DDCF446C83A} diff --git a/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs b/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs index 6227bda5b1..4c4a14e4ac 100644 --- a/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs +++ b/src/Http/Routing/test/UnitTests/Matching/DfaMatcherTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -294,8 +294,8 @@ namespace Microsoft.AspNetCore.Routing.Matching var endpointDataSource = new DefaultEndpointDataSource(new List { CreateEndpoint("/One", 0), - CreateEndpoint("/{p:int}", 0), - CreateEndpoint("/x-{id}-y", 0), + CreateEndpoint("/{p:int}", 1), + CreateEndpoint("/x-{id}-y", 2), }); var sink = new TestSink();