[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #29290
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7 * Update dependencies from https://github.com/dotnet/arcade build 20221110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22560.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Deps.json should include project references that aren't present in project.assets.json
…. This should not flow to 7.0.1xx
…nup4xx Migrate the nuget state from earlier SDKs
…jectref Deps.json should include project references that aren't present in project.assets.json
dotnet-maestro-bot
force-pushed
the
merge/release/6.0.4xx-to-release/7.0.1xx
branch
from
d819166 to
2fc0b9c
Compare
ghost
added
the
dotnet-maestro-bot
requested review from
a team and
AntonLapounov
as code owners
Update the target framework for the desktop test projects
v-wuzhai
force-pushed
the
merge/release/6.0.4xx-to-release/7.0.1xx
branch
from
8cec597 to
c352fb2
Compare
marcpopMSFT
approved these changes
Nov 30, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/6.0.4xx branch which have not been merged yet to release/7.0.1xx. I'm a robot and am configured to help you automatically keep release/7.0.1xx up to date, so I've opened this PR.
This PR merges commits made on release/6.0.4xx by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0.4xx-to-release/7.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.