diff --git a/IISIntegration.sln b/IISIntegration.sln index 59050d5d89..96aa2b6a92 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -36,10 +36,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E ProjectSection(SolutionItems) = preProject build\applicationhost.config = build\applicationhost.config build\applicationhost.iis.config = build\applicationhost.iis.config + build\build.msbuild = build\build.msbuild + build\Build.Settings = build\Build.Settings + build\Config.Definitions.Props = build\Config.Definitions.Props build\dependencies.props = build\dependencies.props build\Key.snk = build\Key.snk + build\launchSettings.json = build\launchSettings.json build\native.targets = build\native.targets build\repo.props = build\repo.props + build\repo.targets = build\repo.targets build\sources.props = build\sources.props build\testsite.props = build\testsite.props EndProjectSection @@ -180,12 +185,14 @@ Global {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86 {9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.Build.0 = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.ActiveCfg = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86 - {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x86 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64 + {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64 {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86 @@ -202,12 +209,14 @@ Global {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.Build.0 = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86 - {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x86 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64 + {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.Build.0 = Release|x64 {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.ActiveCfg = Release|x86 @@ -224,12 +233,14 @@ Global {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x64.Build.0 = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.ActiveCfg = Release|Any CPU {064D860B-4D7C-4B1D-918F-E020F1B99E2A}.Release|x86.Build.0 = Release|Any CPU - {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.ActiveCfg = Debug|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|Any CPU.Build.0 = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.ActiveCfg = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x64.Build.0 = Debug|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.ActiveCfg = Debug|x86 {FC2A97F8-A749-4C04-97D1-97500066A820}.Debug|x86.Build.0 = Debug|x86 - {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x86 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.ActiveCfg = Release|x64 + {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|Any CPU.Build.0 = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.ActiveCfg = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x64.Build.0 = Release|x64 {FC2A97F8-A749-4C04-97D1-97500066A820}.Release|x86.ActiveCfg = Release|x86 @@ -304,12 +315,14 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.Build.0 = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86 - {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x86 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64 + {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86 diff --git a/build/dependencies.props b/build/dependencies.props index f830eacdd0..bdb8feda3d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -14,7 +14,7 @@ 2.2.0-preview1-34326 2.2.0-preview1-34326 2.2.0-preview1-34326 - 0.6.0-preview1-34326 + 0.6.0-a-preview1-tratcher-exp-17050 2.2.0-preview1-34326 2.2.0-preview1-34326 2.2.0-preview1-34326 diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config index 771c84bcdd..b0de53397c 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config @@ -177,6 +177,8 @@ + + @@ -935,6 +937,7 @@ + diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config b/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config index a0fa1187f8..1543ebb97c 100644 --- a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config +++ b/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config @@ -194,7 +194,7 @@ - + diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index 4d497612b7..f679afb235 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -74,6 +74,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetInProcessTestSitesPath(), + PublishApplicationBeforeDeployment = true, }; var deploymentResult = await DeployAsync(deploymentParameters); @@ -93,13 +94,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Contains(TestSink.Writes, context => context.Message.Contains("Application is running inside IIS process but is not configured to use IIS server")); } - private DeploymentParameters GetBaseDeploymentParameters(string site = null) + private DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite") { - return new DeploymentParameters(Helpers.GetTestWebSitePath(site ?? "InProcessWebSite"), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = site == "InProcessWebSite", }; } diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs index 3d0822af04..bc54543067 100644 --- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs +++ b/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: true, Helpers.GetInProcessTestSitesPath(), - "Disabled"); + "Disabled", HostingModel.InProcess); } [Fact] @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: false, Helpers.GetInProcessTestSitesPath(), - _isWebsocketsSupported); + _isWebsocketsSupported, HostingModel.InProcess); } [Fact] @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: true, Helpers.GetOutOfProcessTestSitesPath(), - "Disabled"); + "Disabled", HostingModel.OutOfProcess); } [Fact] @@ -53,16 +53,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests return UpgradeFeatureDetectionDeployer( disableWebSocket: false, Helpers.GetOutOfProcessTestSitesPath(), - _isWebsocketsSupported); + _isWebsocketsSupported, HostingModel.OutOfProcess); } - private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected) + private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel) { var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = Tfm.NetCoreApp22, ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + AncmVersion = AncmVersion.AspNetCoreModuleV2, + HostingModel = hostingModel, + PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess, }; if (disableWebSocket) diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs index fb6cf40be8..9c6ba61513 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs @@ -16,19 +16,6 @@ namespace IISIntegration.FunctionalTests.Utilities { } - protected override Task DeployAsync(DeploymentParameters parameters) - { - if (parameters.SiteName == null) - { - parameters.SiteName = "HttpTestSite"; - } - if (parameters.ServerConfigTemplateContent == null) - { - parameters.ServerConfigTemplateContent = GetServerConfig(null); - } - return base.DeployAsync(parameters); - } - protected string GetServerConfig(Action transform) { var doc = XDocument.Load("AppHostConfig/Http.config"); diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs index 98cb337f4f..3cbaefa9e6 100644 --- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -24,12 +24,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - ServerConfigTemplateContent = File.ReadAllText("AppHostConfig/Http.config"), - SiteName = "HttpTestSite", TargetFramework = Tfm.NetCoreApp22, - ApplicationType = ApplicationType.Portable, AncmVersion = AncmVersion.AspNetCoreModuleV2, HostingModel = HostingModel.InProcess, + PublishApplicationBeforeDeployment = true, }; _deployer = ApplicationDeployerFactory.Create(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture))); diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs index e9db174529..2e5e8f5d6a 100644 --- a/test/WebSites/InProcessWebSite/Program.cs +++ b/test/WebSites/InProcessWebSite/Program.cs @@ -17,7 +17,7 @@ namespace IISTestSite factory.AddFilter("Console", level => level >= LogLevel.Information); }) .UseIIS() - .UseStartup(typeof(Program).Assembly.FullName) + .UseStartup() .Build(); host.Run(); diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/test/WebSites/OutOfProcessWebSite/Program.cs index 18104fa30a..52be26b80c 100644 --- a/test/WebSites/OutOfProcessWebSite/Program.cs +++ b/test/WebSites/OutOfProcessWebSite/Program.cs @@ -17,7 +17,7 @@ namespace TestSites factory.AddFilter("Console", level => level >= LogLevel.Information); }) .UseIISIntegration() - .UseStartup(typeof(Program).Assembly.FullName) + .UseStartup() .UseKestrel() .Build(); diff --git a/test/WebSites/OutOfProcessWebSite/web.config b/test/WebSites/OutOfProcessWebSite/web.config deleted file mode 100644 index 8286b650fe..0000000000 --- a/test/WebSites/OutOfProcessWebSite/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/test/WebSites/OverriddenServerWebSite/web.config b/test/WebSites/OverriddenServerWebSite/web.config deleted file mode 100644 index ccfab87ca0..0000000000 --- a/test/WebSites/OverriddenServerWebSite/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -