diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index da6de64a6b..11b06b530b 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -17,6 +17,7 @@ jobs: beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema + buildArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" - template: jobs/default-build.yml parameters: jobName: MacOs_Build @@ -29,3 +30,19 @@ jobs: jobDisplayName: "Build and test: Linux" agentOs: Linux buildScript: ./eng/scripts/cibuild.sh +- template: jobs/iisintegration-job.yml + parameters: + TestGroupName: IIS + skipArgs: " /p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=false /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" +- template: jobs/iisintegration-job.yml + parameters: + TestGroupName: IISExpress + skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=false /p:SkipIISForwardsCompatibilityTests=true" +- template: jobs/iisintegration-job.yml + parameters: + TestGroupName: IISForwardCompat + skipArgs: "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=false" +- template: jobs/iisintegration-job.yml + parameters: + TestGroupName: IISBackCompat + skipArgs: "/p:SkipIISBackwardsCompatibilityTests=false /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true" \ No newline at end of file diff --git a/.azure/pipelines/jobs/iisintegration-job.yml b/.azure/pipelines/jobs/iisintegration-job.yml index af3006a5b9..3ee3a2a307 100644 --- a/.azure/pipelines/jobs/iisintegration-job.yml +++ b/.azure/pipelines/jobs/iisintegration-job.yml @@ -1,6 +1,8 @@ jobs: - template: default-build.yml parameters: + buildScript: ./build.cmd + buildArgs: "-ci -restore -build -test -projects src/Servers/IIS/**/*.csproj ${{ parameters.skipArgs }}" beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1; & ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo @@ -8,15 +10,5 @@ jobs: - powershell: "& ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown" displayName: Stop AppVerifier condition: always() - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: eq(variables['system.pullrequest.isfork'], false) - inputs: - artifactName: logs - artifactType: Container - pathtoPublish: src/IISIntegration/artifacts/logs - buildDirectory: src/Servers/IIS - buildArgs: "/p:SkipIISBackwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }} /p:SkipIISTests=${{ parameters.SkipIISTests }} /p:SkipIISExpressTests=${{ parameters.SkipIISExpressTests }} /p:SkipIISForwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }}" - jobName: IISIntegration_${{ parameters.TestGroupName }} - jobDisplayName: IISIntegration_${{ parameters.TestGroupName }} - + jobName: ANCM_${{ parameters.TestGroupName }} + jobDisplayName: "Build and test: ANCM ${{ parameters.TestGroupName }}" diff --git a/build.ps1 b/build.ps1 index b9982b5beb..3214fbf70b 100644 --- a/build.ps1 +++ b/build.ps1 @@ -31,7 +31,7 @@ Run tests. Run code signing. .PARAMETER Projects -A list of projects to build. (Must be an absolute path.) Globbing patterns are supported, such as "$(pwd)/**/*.csproj" +A list of projects to build. Globbing patterns are supported, such as "$(pwd)/**/*.csproj" .PARAMETER All Build all project types. @@ -228,6 +228,10 @@ if ($All) { $MSBuildArguments += '/p:BuildAllProjects=true' } elseif ($Projects) { + if (![System.IO.Path]::IsPathRooted($Projects)) + { + $Projects = Join-Path (Get-Location) $Projects + } $MSBuildArguments += "/p:Projects=$Projects" } else { diff --git a/build/repo.targets b/build/repo.targets index 9d7959e552..150edb552e 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -46,7 +46,7 @@ $(GetArtifactInfoDependsOn);GetProjectArtifactInfo $(GetArtifactInfoDependsOn);ResolveSharedSourcesPackageInfo - $(GetArtifactInfoDependsOn);ResolveRepoInfo + $(GetArtifactInfoDependsOn);ResolveRepoInfo $(CodeSignDependsOn);RemoveSharedFrameworkOnlyRefsFromNuspec diff --git a/src/Servers/IIS/build/repo.props b/src/Servers/IIS/build/repo.props index 7397809756..727a2e970f 100644 --- a/src/Servers/IIS/build/repo.props +++ b/src/Servers/IIS/build/repo.props @@ -16,24 +16,7 @@ - - - - - - - - - - - - - - - - - diff --git a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj index ccdc7cced4..049345170d 100644 --- a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -1,7 +1,10 @@  + + netcoreapp3.0 + true