diff --git a/.vsts-pipelines/builds/ci-public-21.yml b/.vsts-pipelines/builds/ci-public-21.yml new file mode 100644 index 0000000000..7542fca220 --- /dev/null +++ b/.vsts-pipelines/builds/ci-public-21.yml @@ -0,0 +1,32 @@ +trigger: +- release/2.2 + +# See https://github.com/aspnet/BuildTools +resources: + repositories: + - repository: buildtools + type: github + endpoint: DotNet-Bot GitHub Connection + name: aspnet/BuildTools + ref: refs/heads/release/2.2 + +phases: +- template: .azure\templates\jobs\default-build.yml@buildtools + parameters: + agentOs: Windows + codeSign: false + buildArgs: /p:BuildServerIIS21=true /p:SkipIISExpressTests=true /p:SkipIISBackwardsCompatibilityTests=true + beforeBuild: + - powershell: "& ./tools/UpdateIISExpressCertificate.ps1; & ./tools/update_schema.ps1; & ./tools/SetupTestEnvironment.ps1 SetupDumps" + displayName: Prepare repo + afterBuild: + - powershell: "& ./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: artifacts/logs \ No newline at end of file diff --git a/build/dependencies.props b/build/dependencies.props index 5f13736d12..c7b53f9f88 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -58,4 +58,12 @@ 2.2.0-preview3-35458 2.2.0-preview3-35458 + + 2.1.0 + 2.1.0 + 2.1.0 + 2.1.0 + 4.5.2 + 4.5.0 + diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index 22d494a606..53145c2b29 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -18,7 +18,9 @@ + + @@ -27,6 +29,16 @@ + + + + + + + + + + False diff --git a/version.props b/version.props index 6ccce8b1c1..023ad472eb 100644 --- a/version.props +++ b/version.props @@ -2,12 +2,14 @@ 2 2 + 1 0 $(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion) 12 - $(DotNetMinorVersion) + 2 $(DotNetPatchVersion) rtm + -ancm-oob $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000