From b92c82e97f19f77c95752340066a64a337551e6d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 18 Oct 2018 13:58:56 -0700 Subject: [PATCH] Add static shim test (#1505) --- .appveyor.yml | 2 +- .vsts-pipelines/templates/build-steps.yml | 1 + IISIntegration.NoV1.sln | 17 +++++- IISIntegration.sln | 23 ++++++++ build/build.msbuild | 34 ----------- build/buildpipeline/pipeline.groovy | 2 + build/buildpipeline/windows-staticshim.groovy | 15 +++++ build/buildpipeline/windows.groovy | 2 +- build/dependencies.props | 5 +- build/functional-test-assets.targets | 10 ++++ build/repo.props | 12 ++++ build/testsite.props | 1 - ...tCore.Server.IntegrationTesting.IIS.csproj | 29 +++------- .../Inprocess/StartupTests.cs | 0 .../OutOfProcess/GlobalVersionTests.cs | 1 + .../BackwardsCompatibilityTests.cs | 49 ++++++++++++++++ ...kwardsCompatibility.FunctionalTests.csproj | 56 +++++++++++++++++++ .../RequiresNewShim.cs | 17 ++++++ .../IIS.FunctionalTests.csproj | 3 + test/IIS.FunctionalTests/RequiresNewShim.cs | 17 ++++++ .../DeployerSelector.cs | 0 .../Inprocess/StdOutRedirectionTests.cs | 0 .../MofFileTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RequiresIISAttribute.cs | 2 +- .../ServicesTests.cs | 0 test/IIS.Tests/IIS.Tests.csproj | 5 +- .../IISExpress.FunctionalTests.csproj | 2 + .../RequiresNewShim.cs | 17 ++++++ 29 files changed, 258 insertions(+), 64 deletions(-) delete mode 100644 build/build.msbuild create mode 100644 build/buildpipeline/windows-staticshim.groovy create mode 100644 build/functional-test-assets.targets rename test/{IIS.FunctionalTests => Common.FunctionalTests}/Inprocess/StartupTests.cs (100%) create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj create mode 100644 test/IIS.BackwardsCompatibility.FunctionalTests/RequiresNewShim.cs create mode 100644 test/IIS.FunctionalTests/RequiresNewShim.cs rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/DeployerSelector.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/Inprocess/StdOutRedirectionTests.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/MofFileTests.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/Properties/AssemblyInfo.cs (100%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/RequiresIISAttribute.cs (99%) rename test/{IIS.FunctionalTests => IIS.Shared.FunctionalTests}/ServicesTests.cs (100%) create mode 100644 test/IISExpress.FunctionalTests/RequiresNewShim.cs diff --git a/.appveyor.yml b/.appveyor.yml index 2bc93c45a8..f67ca4c0d5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,7 +16,7 @@ install: - git submodule update --init --recursive - net start w3svc build_script: - - ps: .\run.ps1 default-build + - ps: .\run.ps1 default-build /p:SkipIISBackwardsCompatibilityTests=true clone_depth: 1 environment: global: diff --git a/.vsts-pipelines/templates/build-steps.yml b/.vsts-pipelines/templates/build-steps.yml index 36219f533b..780a42a356 100644 --- a/.vsts-pipelines/templates/build-steps.yml +++ b/.vsts-pipelines/templates/build-steps.yml @@ -2,6 +2,7 @@ phases: - template: .vsts-pipelines/templates/phases/default-build.yml@buildtools parameters: agentOs: Windows + buildArgs: /p:SkipIISBackwardsCompatibilityTests=true beforeBuild: - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln index cbe801fc32..2ee59d14bf 100644 --- a/IISIntegration.NoV1.sln +++ b/IISIntegration.NoV1.sln @@ -36,10 +36,10 @@ 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\functional-test-assets.targets = build\functional-test-assets.targets build\Key.snk = build\Key.snk build\launchSettings.json = build\launchSettings.json build\native.targets = build\native.targets @@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -383,6 +385,18 @@ Global {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x64.Build.0 = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.ActiveCfg = Release|Any CPU {D17B7B35-5361-4A50-B499-E03E5C3CC095}.Release|x86.Build.0 = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.ActiveCfg = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x64.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.ActiveCfg = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Debug|x86.Build.0 = Debug|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|Any CPU.Build.0 = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x64.Build.0 = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.ActiveCfg = Release|Any CPU + {582B07BC-73F4-4689-8557-B039298BD82C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -413,6 +427,7 @@ Global {34135ED7-313D-4E68-860C-D6B51AA28523} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {C0310D84-BC2F-4B2E-870E-D35044DB3E3E} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {582B07BC-73F4-4689-8557-B039298BD82C} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/IISIntegration.sln b/IISIntegration.sln index 34a5050f7e..6e8b394d5a 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -121,6 +121,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "test\IIS.Tests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "test\Common.Tests\Common.Tests.csproj", "{A641A208-2974-4E48-BCFF-54E3AAFA4FB9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.FunctionalTests", "test\IIS.BackwardsCompatibility.FunctionalTests\IIS.BackwardsCompatibility.FunctionalTests.csproj", "{28055B05-25D4-4F17-9F36-A1D09FDDA607}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -637,6 +639,26 @@ Global {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x64.Build.0 = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.ActiveCfg = Release|Any CPU {A641A208-2974-4E48-BCFF-54E3AAFA4FB9}.Release|x86.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x64.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Debug|x86.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|Any CPU.Build.0 = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x64.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeDebug|x86.ActiveCfg = Debug|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|Any CPU.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x64.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.NativeRelease|x86.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|Any CPU.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x64.Build.0 = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.ActiveCfg = Release|Any CPU + {28055B05-25D4-4F17-9F36-A1D09FDDA607}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -670,6 +692,7 @@ Global {CE4FB142-91FB-4B34-BC96-A31120EF4009} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {A091777D-66B3-42E1-B95C-85322DE40706} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {A641A208-2974-4E48-BCFF-54E3AAFA4FB9} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {28055B05-25D4-4F17-9F36-A1D09FDDA607} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/build/build.msbuild b/build/build.msbuild deleted file mode 100644 index c97f1a53b5..0000000000 --- a/build/build.msbuild +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy index 7ccbca0b2a..7d4b4aef15 100644 --- a/build/buildpipeline/pipeline.groovy +++ b/build/buildpipeline/pipeline.groovy @@ -1,6 +1,7 @@ import org.dotnet.ci.pipelines.Pipeline def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') +def windowBackwardsCompatibilityPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows-BackwardsCompatibility.groovy') def configurations = [ 'Debug', @@ -15,4 +16,5 @@ configurations.each { configuration -> windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) windowsPipeline.triggerPipelineOnGithubPush(params) + windowBackwardsCompatibilityPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", params) } diff --git a/build/buildpipeline/windows-staticshim.groovy b/build/buildpipeline/windows-staticshim.groovy new file mode 100644 index 0000000000..b6b81e2f0b --- /dev/null +++ b/build/buildpipeline/windows-staticshim.groovy @@ -0,0 +1,15 @@ +@Library('dotnet-ci') _ + +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { + stage ('Checking out source') { + checkout scm + bat 'git submodule update --init --recursive' + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:Configuration=${params.Configuration}\";" + } +} diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy index 35bb4737ae..cc42e9ab4f 100644 --- a/build/buildpipeline/windows.groovy +++ b/build/buildpipeline/windows.groovy @@ -10,6 +10,6 @@ simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { stage ('Build') { def logFolder = getLogFolder() def environment = "\$env:ASPNETCORE_TEST_LOG_DIR='${WORKSPACE}\\${logFolder}'" - bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:Configuration=${params.Configuration}\";" + bat "powershell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command \"${environment};&.\\tools\\SetupTestEnvironment.ps1 SetupDumps;&.\\tools\\update_schema.ps1;&.\\tools\\UpdateIISExpressCertificate.ps1;&.\\run.cmd -CI default-build /p:SkipIISBackwardsCompatibilityTests=true /p:Configuration=${params.Configuration}\";" } } diff --git a/build/dependencies.props b/build/dependencies.props index 5c5ee5437f..5f13736d12 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -54,5 +54,8 @@ 2.4.0 - + + 2.2.0-preview3-35458 + 2.2.0-preview3-35458 + diff --git a/build/functional-test-assets.targets b/build/functional-test-assets.targets new file mode 100644 index 0000000000..81fb82b4a3 --- /dev/null +++ b/build/functional-test-assets.targets @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/build/repo.props b/build/repo.props index 77073056a2..fd4d80cb7a 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,6 +13,18 @@ + + + + + + + + + + + + Internal.AspNetCore.Universe.Lineup diff --git a/build/testsite.props b/build/testsite.props index 1ef6bf81cc..74f205b4cf 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -23,7 +23,6 @@ x64 -