* Update dependencies from https://github.com/dotnet/arcade build 20240624.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.1
* Update dependencies from https://github.com/dotnet/arcade build 20240624.7
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7
* Update dependencies from https://github.com/dotnet/arcade build 20240624.7
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7
* Update dependencies from https://github.com/dotnet/arcade build 20240624.7
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7
* Update dependencies from https://github.com/dotnet/arcade build 20240624.7
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7
* Update dependencies from https://github.com/dotnet/arcade build 20240626.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24326.4
* Update dependencies from https://github.com/dotnet/arcade build 20240626.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24326.4
* Update dependencies from https://github.com/dotnet/arcade build 20240628.2
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24328.2
* Update dependencies from https://github.com/dotnet/arcade build 20240628.2
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24328.2
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240702.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1
* Update dependencies from https://github.com/dotnet/arcade build 20240709.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24359.3
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240710.5
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5
* Update dependencies from https://github.com/dotnet/arcade build 20240716.7
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24366.7
* Update dependencies from https://github.com/dotnet/arcade build 20240717.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1
* Update dependencies from https://github.com/dotnet/arcade build 20240717.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1
* Update dependencies from https://github.com/dotnet/arcade build 20240717.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1
* Update dependencies from https://github.com/dotnet/arcade build 20240717.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1
* Update dependencies from https://github.com/dotnet/arcade build 20240717.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1
* Update dependencies from https://github.com/dotnet/arcade build 20240722.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24372.3
* Update dependencies from https://github.com/dotnet/arcade build 20240722.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24372.3
* Update dependencies from https://github.com/dotnet/arcade build 20240722.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24372.3
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240726.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1
* Update dependencies from https://github.com/dotnet/arcade build 20240812.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24376.1 -> To Version 8.0.0-beta.24412.1
* Update dependencies from https://github.com/dotnet/arcade build 20240813.2
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24412.1 -> To Version 8.0.0-beta.24413.2
* Update dependencies from https://github.com/dotnet/arcade build 20240821.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24413.2 -> To Version 8.0.0-beta.24421.4
* Update dependencies from https://github.com/dotnet/arcade build 20240826.2
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24421.4 -> To Version 8.0.0-beta.24426.2
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This is an automatically generated pull request from release/dev17.8
into release/dev17.10.
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.8
- https://github.com/dotnet/razor/find/release/dev17.10
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.8-to-release/dev17.10
git reset --hard upstream/release/dev17.10
git merge upstream/release/dev17.8
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.8-to-release/dev17.10 --force
```
* Update dependencies from https://github.com/dotnet/arcade build 20240621.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3
* Update dependencies from https://github.com/dotnet/arcade build 20240621.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24270.4 -> To Version 8.0.0-beta.24310.5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/arcade build
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24170.6
* Update dependencies from https://github.com/dotnet/arcade build
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24170.6
* Update dependencies from https://github.com/dotnet/arcade build
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24170.6
* Update dependencies from https://github.com/dotnet/arcade build
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24172.5
* Update dependencies from https://github.com/dotnet/arcade build 20240326.8
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24176.8
* Update dependencies from https://github.com/dotnet/arcade build 20240327.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24177.1
* Update dependencies from https://github.com/dotnet/arcade build 20240327.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24177.1
* Update dependencies from https://github.com/dotnet/arcade build 20240329.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24179.4
* Update dependencies from https://github.com/dotnet/arcade build 20240329.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24179.4
* Update dependencies from https://github.com/dotnet/arcade build 20240329.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24179.4
* Update dependencies from https://github.com/dotnet/arcade build 20240329.4
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24179.4
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240404.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24204.3
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240425.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24225.1
* Update dependencies from https://github.com/dotnet/arcade build 20240514.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24264.1
* Update dependencies from https://github.com/dotnet/arcade build 20240516.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24266.3
* Update dependencies from https://github.com/dotnet/arcade build 20240516.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24266.3
* Update dependencies from https://github.com/dotnet/arcade build 20240516.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24266.3
* Update dependencies from https://github.com/dotnet/arcade build 20240516.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24266.3
* Update dependencies from https://github.com/dotnet/arcade build 20240516.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24266.3
* Update dependencies from https://github.com/dotnet/arcade build 20240516.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24170.6 -> To Version 8.0.0-beta.24266.3
* more fixes
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jared Parsons <jared@paranoidcoding.org>
* Correctly stitch `@` characters to following identifiers when rewriting tag helpers (#10331)
Because of how we were rewriting tag helper attribute values, we didn't output a single, unified token when moving an implicit C# transition back to standard C#. This meant that, when we emit `#line` directives, we considered the `@` and the identifier that followed it to be separate tokens; when we added more precise info for FUSE, this then meant that they were emitted on separate lines during runtime codegen and everything fell apart. To fix this, we now unify those implicit transition tokens, rather than trying to keep them as separate tokens. Fixes https://github.com/dotnet/razor/issues/10186, for real this time.
(cherry picked from commit 26ce354a9f)
* Update baseline for 17.10 code.
This is an automatically generated pull request from release/dev17.9
into release/dev17.10.
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.9
- https://github.com/dotnet/razor/find/release/dev17.10
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.9-to-release/dev17.10
git reset --hard upstream/release/dev17.10
git merge upstream/release/dev17.9
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.9-to-release/dev17.10 --force
```
Back in 17.10p1, the FallbackProjectManager would apply changes to the
project snapshot manager without scheduling the updates on the
dispatcher. This had the potential to create correctness and reliability
problems if those changes collided with other updates that *were*
scheduled on the dispatcher.
To address the correctness problem, I made the FallbackProjectManager
async and awaited any updates to the project snapshot manager. However,
this created re-entrancy problems that resulted in deadlocks with
Roslyn. I fixed a couple of those re-entrancy problems in 17.10p2, but
hangs have persisted.
A recent Watson dump revealed another yet another re-entrancy issue with
background document promotion in the IRazorDynamicFileInfoProvider. The
hang occurs when waiting for the FallbackProjectManager to add the file,
which causes the project snapshot manager to notify listeners of the
update, which causes one of the listener to try and perform the
background document promotion again, which causes the hang.
To address this, I've decided to just "fire-and-forget" the updates to
the project snapshot manager. The updates will still happen on the
dispatcher, but we won't wait for them and shouldn't hang.
Back in 17.10p1, the FallbackProjectManager would apply changes to the
project snapshot manager without scheduling the updates on the
dispatcher. This had the potential to create correctness and reliability
problems if those changes collided with other updates that *were*
scheduled on the dispatcher.
To address the correctness problem, I made the FallbackProjectManager
async and awaited any updates to the project snapshot manager. However,
this created re-entrancy problems that resulted in deadlocks with
Roslyn. I fixed a couple of those re-entrancy problems in 17.10p2, but
hangs have persisted.
A recent Watson dump revealed another yet another re-entrancy issue
with background document promotion in the IRazorDynamicFileInfoProvider.
The hang occurs when waiting for the FallbackProjectManager to add the
file, which causes the project snapshot manager to notify listeners
of the update, which causes one of the listener to try and perform the
background document promotion again, which causes the hang.
To address this, I've decided to just "fire-and-forget" the updates to
the project snapshot manager. The updates will still happen on the
dispatcher, but we won't wait for them and shouldn't hang.
Recently we regressed our image load count by pulling in the
MS.ANC.Razor.LanguageServer assembly when the legacy editor is used.
Fixing this is just a matter of moving shared code and an interface to
MS.CA.Razor.Workspaces.
We observed a hang during solution load because
`VisualStudioEditorDocumentManager` retrieves the
`IVsRunningDocumentTable` service in its constructor. When this
constructor is called on a background thread, it results in an implicit
marshal to the UI thread in order to retrieve the service and QI for its
COM interface. This change fixes that issue delaying the request for
`IVsRunningDocumentTable` until it is needed and running on the UI
thread.
In addition, `VisualStudioFileChangeTrackerFactory` had a similar issue
but with `IVsAsyncFileChangeEx`. Because `IFileChangeTrackerFactory` is
imported by `VisualStudioEditorDocumentManager`, I've fixed this service
as well.
`VisualStudioFileChangeTrackerFactory` retrieves an `IVsAsyncFileChangeEx` service in its constructor. Because this is an `[ImportingConstructor]` it will likely be called on the thread pool and implicitly marshal to the UI thread to perform a QI as part of retrieving the service. This can cause a hang if the UI thread is tied up with other work, such as when a solution is loaded.
This change avoids retrieving `IVsAsyncFileChangeEx` until its needed. This does block on retrieving the service. However, avoiding that will require a more substantial change that I'll follow up with on `main`.
The `VisualStudioEditorDocumentManager` listens for running document
table events and was retrieving the `IVsRunningDocumentTable` in its
constructor. Because this is an `[ImportingConstructor]` it will
almost certain be called on the thread pool and will implicitly
marshal to the UI thread to perform a QI as part of retrieving the
service. This can cause a hang if the UI thread is tied up with other
work, such as when a solution is loaded.
This change avoids retrieving the running doc table service until its
needed and we are already running on the UI thread.
The recent FUSE changes updated the `RazorConfigurationFormatter` to
write serialize/deserialize a new boolean. However,
`SerializationFormat.Version` for MessagePack wasn't updated, so it just
fails during deserialization when older `project.razor.bin` files are
initially read off disk. This tweaks the deserializer to be more
forgiving and handle the case that the boolean isn't present.
A similar change is not needed in the JSON serialization because that
deserializer was written to be a bit more forgiving and the JSON
`SerializationFormat.Version` was updated.
I ran into this when opening an old clone of OrchardCore that I'd opened
previously, and started hitting exceptions during message pack
deserialization.
There is a fair amount of lock contention in
`BackgroundDocumentGenerator` that contributes to a hang on 17.10p2. The
issue is caused by my recent changes to `FallbackProjectManager` to
perform `IProjectSnapshotManager` updates on the dispatcher. While this
change improves correctness it changes the interaction with Roslyn's
dynamic file info implementation enough that it is causing problems.
The particular issue that this should address deadlocks due to
`BackgroundDocumentGenerator._suppressedDocuments`.
1. `BackgroundDocumentGenerator.Suppressed(...)`: This adds or removes a
file path from `_suppressedDocuments`. However, it also holds the lock
while calling into `RazorDynamicFileInfoProvider.SuppressDocument(...)`.
0294056d5b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DynamicFiles/BackgroundDocumentGenerator.cs (L252-L268)
2. `BackgroundDocumentGenerator.UpdateFileInfo(...)`: This is just
looking up a file path in `_suppressedDocuemnts`. However, it continues
holding that lock when calling into
`RazorDynamicFileInfoProvider.UpdateFileInfo(...)`
0294056d5b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DynamicFiles/BackgroundDocumentGenerator.cs (L270-L282)
The chain reaction causing the hang starts with `UpdateFileInfo(...)`.
1. `BackgroundDocumentGenerator.UpdateFileInfo(...)` acquires the lock
and calls `RazorDynamicFileInfoProvider.UpdateFileInfo(...)` and
triggers the `IRazorDynamicFileInfoProvider.Updated` event, which Roslyn
listens to.
2. In response to the `Updated` event, Roslyn calls back into Razor via
`IRazorDynamicFileInfoProvider.GetDynamicFileInfoAsync(...)` and blocks
on the result.
3. `IRazorDynamicFileInfoProvider.GetDynamicFileInfoAsync(...)` calls
into `FallbackProjectManager.DynamicFileAddedAsync`, which ends up
awaiting the dispatcher to update the `IProjectSnapshotManager.
So, at this point, the lock on `_suppressedDocuments` has been acquired
and Roslyn is performing a block wait on a `Task` returned from Razor
that has to run on the dispatcher.
_Meanwhile..._
1. CPS has let Razor know about a project change, and
`DefaultWindowsRazorProjectHost` updated the `IProjectSnapshotManager`
on the dispatcher thread.
2. The project update triggers an `IProjectSnapshotManager.Changed`
event, which `BackgroundDocumentGenerator` listens to.
3. `BackgroundDocumentGenerator` processes the `Changed` event (still on
the dispatcher thread) and calls `Enqueue`.
4. `Enqueue` calls `Suppressed(...)`, which immediately tries to take a
lock on `_suppressedDocuments`. However, the lock is already held by the
call to `UpdateFileInfo(...)` above.
The end result is that the Razor `Task` that Roslyn is waiting on will
never run because Razor's dispatcher can't make progress because the
current code on the dispatcher is waiting to acquire the lock. OOF!
The fix I'm making here is to just remove the lock entirely.
`_suppressedDocuments` is just a `HashSet<string>`. So, I've replaced it
with an `ImmutableHashSet<string>` and used lock-free updates to its
field storage.
There is a fair amount of lock contention in `BackgroundDocumentGenerator` that contributes to a hang on 17.10p2. The issue is caused by my recent changes to `FallbackProjectManager` to perform `IProjectSnapshotManager` updates on the dispatcher. While this change improves correctness it changes the interaction with Roslyn's dynamic file info implementation enough that it is causing problems.
The particular issue that this should address locks on `BackgroundDocumentGenerator._suppressedDocuments`.
The recent FUSE changes updated the RazorConfigurationFormatter to write serialize/deserialize a new boolean. However, `SerializationFormat.Version` for MessagePack wasn't updated, so it just fails during deserialization when older project.razor.bin files are initially read off disk. This tweaks the deserializer to be more forgiving and handle the case that the boolean isn't present.
A similar change is not needed in the JSON serialization because that deserializer was written to be a bit more forgiving and the JSON `SerializationFormat.Version` was updated.
dotnet-maestro[bot]
dotnet-maestro[bot]
Fredric Silberberg
dotnet bot
Phil Allen
Jan Jones
Matt Mitchell
Andrew Hall
Jared Parsons
Dustin Campbell
Rikki Gibson
David Wengier