diff --git a/azure-pipelines/vs-insertion-experimental.yml b/azure-pipelines/vs-insertion-experimental.yml index 965ceb7d478..ab2ce364131 100644 --- a/azure-pipelines/vs-insertion-experimental.yml +++ b/azure-pipelines/vs-insertion-experimental.yml @@ -2,16 +2,6 @@ trigger: none name: $(Date:yyyyMMdd).$(Rev:r) -# Since our release branch is the one flowing into main -# we will keep our main experimental insertions to make sure everything is alright -schedules: - - cron: '0 3 * * 1,3,5' # Runs every Monday, Wednesday and Friday at 3AM UTC - displayName: Experimental VS insertion main - branches: - include: - - main - always: false # Don't run if there are no code changes - resources: pipelines: - pipeline: 'MSBuild' diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml index 2f2046c4687..db30a164fc2 100644 --- a/azure-pipelines/vs-insertion.yml +++ b/azure-pipelines/vs-insertion.yml @@ -12,13 +12,13 @@ trigger: none pr: none name: $(Date:yyyyMMdd).$(Rev:r) -# schedules: -# - cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC -# displayName: Daily VS insertion main -# branches: -# include: -# - main -# always: false # Don't run if there are no code changes +schedules: + - cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC + displayName: Daily VS insertion main + branches: + include: + - main + always: false # Don't run if there are no code changes resources: pipelines: @@ -66,7 +66,7 @@ variables: # `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS - name: AutoInsertTargetBranch ${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}: - value: 'main' + value: 'rel/d17.14' ${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}: value: 'rel/d17.13' ${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.12') }}: @@ -227,7 +227,7 @@ 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") diff --git a/eng/Versions.props b/eng/Versions.props index 58189c65b5e..5884c720d40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.14.10release + 17.14.11release 17.13.9 15.1.0.0 servicing