diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index b94c59e9412..812e8a97336 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -15,8 +15,11 @@ parameters: default: 'default' - name: enableOptProf displayName: Enable OptProf data collection for this build + # vs17.12 is in servicing and no longer collects fresh OptProf data: the VS + # bootstrapper build (required only for OptProf collection) is disabled by default. + # We keep applying the last-collected optimization data (see SkipApplyOptimizationData below). type: boolean - default: true + default: false - name: enableSigningValidation displayName: Enable Signing Validation type: boolean @@ -42,10 +45,11 @@ variables: value: ${{ parameters.OptProfDropName }} - name: SourceBranch value: '' - # Override SkipApplyOptimizationData to true when disabling OptProf data collection - - ${{ if eq(parameters.EnableOptProf, false) }}: - - name: SkipApplyOptimizationData - value: true + # NOTE (vs17.12 servicing): historically, disabling OptProf collection also forced + # SkipApplyOptimizationData to true (stop applying data). On this branch we intentionally + # decouple the two: collection is disabled, but we keep applying the last-collected + # optimization data so shipped binaries stay optimized. SkipApplyOptimizationData is + # therefore governed solely by the pipeline variable (default 'false' = apply existing data). - name: EnableReleaseOneLocBuild value: false # Disable loc for vs17.12 - name: Codeql.Enabled diff --git a/azure-pipelines/.vsts-dotnet-build-jobs.yml b/azure-pipelines/.vsts-dotnet-build-jobs.yml index 759bab0d93a..3d491a08fd1 100644 --- a/azure-pipelines/.vsts-dotnet-build-jobs.yml +++ b/azure-pipelines/.vsts-dotnet-build-jobs.yml @@ -140,7 +140,8 @@ jobs: ArtifactName: MicroBuildOutputs ArtifactType: Container displayName: 'OptProf - Publish Artifact: MicroBuildOutputs' - condition: succeeded() + # Only produced when the OptProf bootstrapper runs; skip when OptProf collection is disabled. + condition: and(succeeded(), ${{ parameters.enableOptProf }}) - task: 1ES.PublishBuildArtifacts@1 displayName: 'Publish Artifact: logs' @@ -235,4 +236,3 @@ jobs: name: $(DncEngInternalBuildPool) image: $(WindowsImage) os: windows - diff --git a/eng/Versions.props b/eng/Versions.props index 27be754efc3..af89c8976f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.12.72 + 17.12.73 release 17.11.4 15.1.0.0