Skip to content
New issue

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

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

Already on GitHub? # to your account

[automated] Merge branch 'release/8.0.4xx' => 'main' #42694

Merged
merged 15 commits into from
Aug 14, 2024

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/8.0.4xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/8.0.4xx by the following committers:

  • marcpopMSFT
  • v-wuzhai
  • dotnet-bot
  • rainersigwald

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/8.0.4xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0.4xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/8.0.4xx-to-main
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/8.0.4xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0.4xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0.4xx-to-main main
git pull https://github.com/dotnet/sdk merge/release/8.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/8.0.4xx-to-main
or if you are using SSH
git checkout -b merge/release/8.0.4xx-to-main main
git pull git@github.com:dotnet/sdk merge/release/8.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/8.0.4xx-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

rainersigwald and others added 12 commits July 23, 2024 14:12
MSBuild only respects a .deps.json in the net8.0 engine, so there's no
need to create it for a net472 task. It includes references that aren't
part of the SDK, like the downlevel `System.Text.Json` that is provided
by MSBuild/Visual Studio, so removing it can avoid false positives from
dependency scanners.
```
darc add-dependency --name Microsoft.IO.Redist --version 6.0.1 --repo https://github.com/dotnet/runtime --commit e77011b31a3e5c47d931248a64b47f9b2d47853d --type toolset
```

And manually add the `PackageVersion` to `Directory.Packages.props`.
…12.2

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24381.2 -> To Version 9.0.0-preview.24412.2
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Aug 13, 2024
@marcpopMSFT marcpopMSFT merged commit f6b5eb1 into main Aug 14, 2024
37 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/8.0.4xx-to-main branch August 14, 2024 16:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants