Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/dev17.12 to main #10803

Merged
merged 47 commits into from
Aug 28, 2024
Merged

Merge release/dev17.12 to main #10803

merged 47 commits into from
Aug 28, 2024

Conversation

dotnet-bot
Copy link
Contributor

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

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:

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.

git fetch --all
git checkout -t upstream/merges/release/dev17.12-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.12
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.12-to-main --force

dotnet-maestro bot added 30 commits June 27, 2024 10:09
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
b62de07 
…624.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
26fefec 
…624.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
924c61e 
…624.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
64797b3 
…626.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
f74d573 
…626.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
3c5c32c 
…628.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
5c55c19 
…628.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
dbd10ce 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
c32fa83 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
d38b2e0 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
5b7918d 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
79ee27e 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
01b3f2e 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
957031b 
…702.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
dc5f567 
…709.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
a8e6845 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
7f06c7a 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
f7808e9 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
cb6e9fd 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
4139db6 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
4905457 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
833e6d2 
…710.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
f74dda3 
…716.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
4d773ef 
…717.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
bb866eb 
…717.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
30dc292 
…717.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
0c8a3f2 
…717.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
495ffdb 
…717.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
0024af6 
…722.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
e932e48 
…722.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
dotnet-maestro bot and others added 17 commits July 25, 2024 13:30
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
ccac853 
…722.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
bb46e79 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
cfb4682 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
2d8f6a4 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
a141136 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
4ef57e5 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
beeba17 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
31d1732 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
60562e8 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
caef67c 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
f0a3b5a 
…726.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
718cea3 
…812.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
f38b165 
…813.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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
6970dee 
…821.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
@dibarbet
[release/dev17.11] Update dependencies from dotnet/arcade (#10552)
b5e50df 
This pull request updates the following dependencies

[marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)
## From https://github.com/dotnet/arcade
- **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2
- **Build**: 20240821.4
- **Date Produced**: August 21, 2024 6:41:26 PM UTC
- **Commit**: 4460b755f3c7c89e9660d9580ff79afc4218dd85
- **Branch**: refs/heads/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
8.0.0-beta.24413.2 to 8.0.0-beta.24421.4][44]
- **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24413.2 to
8.0.0-beta.24421.4][44]

[44]: dotnet/arcade@51321b7...4460b75

[DependencyUpdate]: <> (End)


[marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)
@dibarbet
Merge remote-tracking branch 'upstream/release/dev17.11' into merges/…
79c46c0 
…release/dev17.11-to-release/dev17.12
@dotnet-bot
Merge release/dev17.11 to release/dev17.12 (#10785)
da86194 
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 dotnet-bot added area-infrastructure auto-merge Squash merge once all PR checks are complete and reviewers have approved labels Aug 28, 2024
@dotnet-bot dotnet-bot enabled auto-merge August 28, 2024 00:03
@dotnet-bot dotnet-bot merged commit a530667 into main Aug 28, 2024
12 checks passed
@dotnet-bot dotnet-bot deleted the merges/release/dev17.12-to-main branch August 28, 2024 02:40
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Aug 28, 2024
This was referenced Sep 4, 2024
Closed
Closed
@dotnet-bot dotnet-bot mentioned this pull request Sep 14, 2024
Closed
@phil-allen-msft phil-allen-msft modified the milestones: Next, 17.12 P3 Oct 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidwengier davidwengier davidwengier approved these changes

Assignees

@davidwengier davidwengier

Labels
area-infrastructure auto-merge Squash merge once all PR checks are complete and reviewers have approved
Projects
None yet
Milestone
17.12 P3
Development

Successfully merging this pull request may close these issues.
4 participants
@dotnet-bot @davidwengier @phil-allen-msft @dibarbet