Skip to content

Commit

Permalink
Don't autocomplete servicing insertions (#11283)
Browse files Browse the repository at this point in the history
  • Loading branch information
JanProvaznik authored Jan 15, 2025
1 parent 1048ce7 commit 31744df
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
12 changes: 11 additions & 1 deletion azure-pipelines/vs-insertion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,16 @@ extends:
$propsValue = $props -join ";"
Write-Host "Setting InsertPackagePropsValues to '$propsValue'"
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($propsValue)"
# autocomplete main
$autocomplete = "false"
if ("$(InsertTargetBranch)" -eq "main")
{
$autocomplete = "true"
}
Write-Host "Setting AutoCompleteEnabled to '$autocomplete'"
Write-Host "##vso[task.setvariable variable=AutoCompleteEnabled]$($autocomplete)"
- task: 1ES.PublishNuGet@1
displayName: 'Push MSBuild CoreXT packages'
condition: ${{ eq(parameters.SkipUploadingPackages, false) }}
Expand Down Expand Up @@ -268,6 +278,6 @@ extends:
DefaultConfigValues: $(InsertConfigValues)
InsertionReviewers: MSBuild,VS ProTools
CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
AutoCompletePR: true
AutoCompletePR: $(AutoCompleteEnabled)
AutoCompleteMergeStrategy: Squash
InsertionBuildPolicy: Request Perf DDRITs
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.8.17</VersionPrefix>
<VersionPrefix>17.8.18</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
Expand Down

0 comments on commit 31744df

Please sign in to comment.