From 4e9e13628e73e4e914521080531d8ab6acf67260 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Jul 2018 12:26:20 -0700 Subject: [PATCH 1/7] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 33 +++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a48a35722f..783fdd1af0 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,25 +3,25 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17099 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 - 2.2.0-preview1-34806 + 2.2.0-preview1-17102 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34806 + 2.2.0-preview1-34823 15.6.1 2.0.3 1.4.0 @@ -29,5 +29,6 @@ 2.3.1 2.4.0 + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 27e2e80f9a..6b8da29e6b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17099 -commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 +version:2.2.0-preview1-17102 +commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 From 1be04d8a1a42596f73c6046568bedb30e149f0db Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 5 Aug 2018 19:27:22 +0000 Subject: [PATCH 2/7] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 783fdd1af0..55285e295b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,25 +3,25 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17102 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-20180731.1 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34823 + 2.2.0-preview1-34882 15.6.1 2.0.3 1.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 6b8da29e6b..c7af2292c7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17102 -commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 +version:2.2.0-preview1-20180731.1 +commithash:29fde58465439f4bb9df40830635ed758e063daf From 37ed92da14b3ed7fb060f67b99224ccd7d51ba7f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 6 Aug 2018 20:50:51 +0000 Subject: [PATCH 3/7] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 55285e295b..5c3f1822c1 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,24 +4,24 @@ 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 15.6.1 2.0.3 1.4.0 From f2ddea2aa925b596499988be472adb4e989d0618 Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Thu, 9 Aug 2018 09:07:40 -0700 Subject: [PATCH 4/7] Temporarily bump the version of IntegrationTesting.IIS --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5c3f1822c1..dc1384c661 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -10,7 +10,7 @@ 2.2.0-preview1-34896 2.2.0-preview1-34896 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-a-preview1-tratcher-share-17121 2.2.0-preview1-34896 2.2.0-preview1-34896 2.2.0-preview1-34896 From bb09589fb1e19ae7bcffb0362024add8ae678da3 Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Thu, 9 Aug 2018 13:09:52 -0700 Subject: [PATCH 5/7] Remove travis --- .travis.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7ec025af34..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: csharp -sudo: required -dist: trusty -env: - global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -addons: - apt: - packages: - - libunwind8 -mono: none -os: -- linux -- osx -osx_image: xcode9.3beta -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -before_install: -- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl nginx; - ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib - /usr/local/lib/; else apt-get install nginx; fi -install: -- export PATH="$PATH:$HOME/nginxinstall/sbin/" -script: -- ./build.sh From 89506dfcf023cba439a664a6dbcbc75d433c952d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:29:24 +0000 Subject: [PATCH 6/7] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index dc1384c661..bfcd68226e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,25 +3,25 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-a-preview1-tratcher-share-17121 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 15.6.1 2.0.3 1.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c7af2292c7..3fbcc80189 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From 30b01d24605f6132475783e5a33dddc065822d0d Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 16 Aug 2018 12:08:58 -0700 Subject: [PATCH 7/7] Stop using IISExpress .config templates (#142) --- .../HelloWorldTest.cs | 8 +- .../Helpers.cs | 27 +- .../NoCompression.config | 1026 ----------------- .../ResponseCompressionTests.cs | 40 +- .../ResponseTests.cs | 8 +- 5 files changed, 47 insertions(+), 1062 deletions(-) delete mode 100644 test/ServerComparison.FunctionalTests/NoCompression.config diff --git a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs index 55cbe2a006..4575a7f370 100644 --- a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs @@ -38,10 +38,14 @@ namespace ServerComparison.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { - ApplicationPath = Helpers.GetApplicationPath(), - ServerConfigTemplateContent = Helpers.GetNginxConfigContent(variant.Server, "nginx.conf"), + ApplicationPath = Helpers.GetApplicationPath() }; + if (variant.Server == ServerType.Nginx) + { + deploymentParameters.ServerConfigTemplateContent = Helpers.GetNginxConfigContent("nginx.conf"); + } + using (var deployer = IISApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { var deploymentResult = await deployer.DeployAsync(); diff --git a/test/ServerComparison.FunctionalTests/Helpers.cs b/test/ServerComparison.FunctionalTests/Helpers.cs index 3e1ef3979d..5054bd157b 100644 --- a/test/ServerComparison.FunctionalTests/Helpers.cs +++ b/test/ServerComparison.FunctionalTests/Helpers.cs @@ -29,33 +29,10 @@ namespace ServerComparison.FunctionalTests throw new Exception($"Solution root could not be found using {applicationBasePath}"); } - public static string GetConfigContent(ServerType serverType, string iisConfig, string nginxConfig) + public static string GetNginxConfigContent(string nginxConfig) { var applicationBasePath = AppContext.BaseDirectory; - - string content = null; - if (serverType == ServerType.IISExpress) - { - content = File.ReadAllText(Path.Combine(applicationBasePath, iisConfig)); - } - else if (serverType == ServerType.Nginx) - { - content = File.ReadAllText(Path.Combine(applicationBasePath, nginxConfig)); - } - - return content; - } - - public static string GetNginxConfigContent(ServerType serverType, string nginxConfig) - { - var applicationBasePath = AppContext.BaseDirectory; - - string content = null; - if (serverType == ServerType.Nginx) - { - content = File.ReadAllText(Path.Combine(applicationBasePath, nginxConfig)); - } - + var content = File.ReadAllText(Path.Combine(applicationBasePath, nginxConfig)); return content; } } diff --git a/test/ServerComparison.FunctionalTests/NoCompression.config b/test/ServerComparison.FunctionalTests/NoCompression.config deleted file mode 100644 index 9d9e0e6b42..0000000000 --- a/test/ServerComparison.FunctionalTests/NoCompression.config +++ /dev/null @@ -1,1026 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs b/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs index 19e5fe9842..283f8286b2 100644 --- a/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs +++ b/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs @@ -9,7 +9,9 @@ using System.Net; using System.Net.Http; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -81,9 +83,9 @@ namespace ServerComparison.FunctionalTests return ResponseCompression(variant, CheckAppCompressionAsync, hostCompression: true); } - private async Task ResponseCompression(TestVariant variant, - Func scenario, - bool hostCompression, + private async Task ResponseCompression(TestVariant variant, + Func scenario, + bool hostCompression, [CallerMemberName] string testName = null) { testName = $"{testName}_{variant.Server}_{variant.Tfm}_{variant.Architecture}_{variant.ApplicationType}"; @@ -96,13 +98,37 @@ namespace ServerComparison.FunctionalTests ApplicationPath = Helpers.GetApplicationPath(), EnvironmentName = "ResponseCompression", }; - if (hostCompression) + + if (variant.Server == ServerType.Nginx) { - deploymentParameters.ServerConfigTemplateContent = Helpers.GetNginxConfigContent(variant.Server, "nginx.conf"); + deploymentParameters.ServerConfigTemplateContent = hostCompression + ? Helpers.GetNginxConfigContent("nginx.conf") + : Helpers.GetNginxConfigContent("NoCompression.conf"); } - else + else if (variant.Server == ServerType.IISExpress && !hostCompression) { - deploymentParameters.ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "NoCompression.config", "NoCompression.conf"); + var iisDeploymentParameters = new IISDeploymentParameters(deploymentParameters); + iisDeploymentParameters.ServerConfigActionList.Add( + (element, _) => { + var compressionElement = element + .RequiredElement("system.webServer") + .RequiredElement("httpCompression"); + + compressionElement + .RequiredElement("dynamicTypes") + .Elements() + .SkipLast(1) + .Remove(); + + compressionElement + .RequiredElement("staticTypes") + .Elements() + .SkipLast(1) + .Remove(); + // last element in both dynamicTypes and staticTypes disables compression + // + }); + deploymentParameters = iisDeploymentParameters; } using (var deployer = IISApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/ServerComparison.FunctionalTests/ResponseTests.cs b/test/ServerComparison.FunctionalTests/ResponseTests.cs index cd646bc3b9..72ef1f6d48 100644 --- a/test/ServerComparison.FunctionalTests/ResponseTests.cs +++ b/test/ServerComparison.FunctionalTests/ResponseTests.cs @@ -87,10 +87,14 @@ namespace ServerComparison.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { ApplicationPath = Helpers.GetApplicationPath(), - EnvironmentName = "Responses", - ServerConfigTemplateContent = Helpers.GetNginxConfigContent(variant.Server, "nginx.conf"), + EnvironmentName = "Responses" }; + if (variant.Server == ServerType.Nginx) + { + deploymentParameters.ServerConfigTemplateContent = Helpers.GetNginxConfigContent("nginx.conf"); + } + using (var deployer = IISApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { var deploymentResult = await deployer.DeployAsync();