Commits on Sep 4, 2024

1. Update dependencies from https://github.com/dotnet/arcade build 20240… …

   …826.2 (#10808)
   
   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>

   

   dotnet-maestro[bot] and dotnet-maestro[bot] authored Sep 4, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for 41acbde
   • Browse repository at this point

   Copy the full SHA

   41acbde View commit details

   Browse the repository at this point in the history

2. Merge branch 'release/dev17.12' into merges/release/dev17.11-to-relea… …

   …se/dev17.12

   

   davidwengier authored Sep 4, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for 976f723
   • Browse repository at this point

   Copy the full SHA

   976f723 View commit details

   Browse the repository at this point in the history

3. Merge release/dev17.11 to release/dev17.12 (#10832) …

   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
   ```

   

   dotnet-bot authored Sep 4, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for 1d04db3
   • Browse repository at this point

   Copy the full SHA

   1d04db3 View commit details

   Browse the repository at this point in the history