Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .vsts-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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).
Comment thread
AlesProkop marked this conversation as resolved.
- name: EnableReleaseOneLocBuild
value: false # Disable loc for vs17.12
- name: Codeql.Enabled
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines/.vsts-dotnet-build-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -235,4 +236,3 @@ jobs:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
os: windows

2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.12.72</VersionPrefix>
<VersionPrefix>17.12.73</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
Expand Down
Loading