[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'#28668
Merged
dsplaisted merged 20 commits intodotnet:release/7.0.2xxfrom Nov 1, 2022
Merged
Conversation
…imeIdentifierInference.targets Co-authored-by: Rainer Sigwald <raines@microsoft.com>
…nto nagilson-exe-rids
…s Exe Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
…013.10 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.0-beta.22513.2 -> To Version 7.0.0-beta.22513.10
…221019-01 (dotnet#28654) Microsoft.NET.Test.Sdk From Version 17.4.0-release-20220926-01 -> To Version 17.4.0-release-20221019-01 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ada8-e8dc-4d72-a457-0b52420d8269 [release/7.0.1xx] Update dependencies from dotnet/fsharp
…gets-import-order Return workload manifests in defined, controllable order
7b52159 to
63b3654
Compare
Allow Implicit RID Opt Out + Don't Infer RID for non EXE Type Projects
2d9a611 to
24f5a85
Compare
nagilson
approved these changes
Oct 21, 2022
Member
|
We are changing some tests but everything else is good, might want to wait but it doesn't really matter as it'll flow again. |
Contributor
|
There's a conflict with main. @nagilson can one of you please fix it? |
Contributor
|
This is blocking the branding PR for runtime as described here: dotnet/runtime#77549 (comment) |
…lease/7.0.1xx-to-release/7.0.2xx
Member
|
@carlossanlop Should be resolved now, thanks! |
Member
|
@carlossanlop can this be merged now? |
Contributor
|
@dsplaisted was there a specific reason why you disable auto-merge, or can we already get this merged? Also, "merge" or "squash"? |
Member
|
@carlossanlop I've merged this. I turned off auto-merge because I was considering force merging it with a failing leg yesterday |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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/7.0.1xx branch which have not been merged yet to release/7.0.2xx. I'm a robot and am configured to help you automatically keep release/7.0.2xx up to date, so I've opened this PR.
This PR merges commits made on release/7.0.1xx 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/7.0.1xx-to-release/7.0.2xx'. 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.