Merge release/dev17.11 to release/dev17.12 (#11218)

This is an automatically generated pull request from release/dev17.11
into release/dev17.12.


Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯

## Troubleshooting conflicts

### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.11
- https://github.com/dotnet/razor/find/release/dev17.12

Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.

### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12
git reset --hard upstream/release/dev17.12
git merge upstream/release/dev17.11
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.11-to-release/dev17.12 --force
```
This commit is contained in:
dotnet bot 2024-11-15 16:09:24 +01:00 коммит произвёл GitHub
Родитель 8bf9ad1ce4 b4ba32397a
Коммит 88f8675df4
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
1 изменённых файлов: 14 добавлений и 1 удалений

Просмотреть файл

@ -49,6 +49,18 @@ pr:
include: include:
- '*' - '*'
schedules:
- cron: "0 8 23-29 * 0" # Fourth Sunday of each month at 8:00 UTC
displayName: "Monthly smoke test"
branches:
include:
- main
- release/*
exclude:
- ""
always: true # Run even if there have been no source code changes since the last successful scheduled run
batch: false # Do not run the pipeline if the previously scheduled run is in-progress
resources: resources:
repositories: repositories:
- repository: 1ESPipelineTemplates - repository: 1ESPipelineTemplates
@ -203,8 +215,9 @@ extends:
-sign -sign
$(_BuildArgs) $(_BuildArgs)
$(_PublishArgs) $(_PublishArgs)
/p:DeployExtension=false
name: Build name: Build
displayName: Build and Deploy displayName: Build
condition: succeeded() condition: succeeded()
- script: eng\CIBuild.cmd - script: eng\CIBuild.cmd