Skip to content

Conversation

@github-actions
Copy link
Contributor

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

This PR merges commits made on main by the following committers:

  • akhera99
  • sharwell
  • CyrusNajmabadi

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 main
git pull --ff-only
git checkout release/dev18.0
git pull --ff-only
git merge --no-ff main

# 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/roslyn HEAD:merge/main-to-release/dev18.0
or if you are using SSH
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev18.0

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/main-to-release/dev18.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

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

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.

akhera99 and others added 10 commits February 26, 2025 10:09
* check for excluded files

* remove unused usings

* fix indentation
Fixes dotnet/sdk#46780

This issue was introduced by #74623, which changed
`Document.WithSyntaxRoot` to always use the encoding specified by the
new syntax root. APIs like SyntaxRewriter do not preserve the input
encoding during node rewrites, so `Formatter.Format` would overwrite the
document syntax root with a node that did not specify any encoding. The
fix _allows_ `WithSyntaxRoot` to specify a new encoding, but for cases
where the encoding of the new syntax root is not known, we fall back to
the original behavior of preserving the encoding from the previous root
and/or document text.
…77369)

* allow insertion to run on commit that isn't latest

* remove comments

* Allow PR Val pipeline runs to opt-out of the latest commit validation

* Update CI excludes paths to include some yml files

* Update setup-pr-validation.ps1

* Apply suggestions from code review

---------

Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
@github-actions github-actions bot force-pushed the merge/main-to-release/dev18.0 branch from 8865193 to afca91b Compare February 28, 2025 13:10
@github-actions github-actions bot requested review from a team as code owners February 28, 2025 13:10
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Feb 28, 2025
@akhera99 akhera99 enabled auto-merge March 3, 2025 18:20
@akhera99 akhera99 merged commit 7926b6a into release/dev18.0 Mar 3, 2025
47 of 49 checks passed
JoeRobich added a commit to dotnet/roslyn-tools that referenced this pull request Mar 6, 2025
The Arcade inter-branch merge GH action creates merge commits with a
differently formatted message (ex. `[automated] Merge branch
'prerelease' => 'main' (#8039)`)

Tested by generating PR list between Roslyn main and Roslyn
release/dev18.0:
*Before*:
```md
### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0):
[View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77445)](dotnet/roslyn#77445)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77441)](dotnet/roslyn#77441)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77431)](dotnet/roslyn#77431)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77409)](dotnet/roslyn#77409)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77374)](dotnet/roslyn#77374)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77292)](dotnet/roslyn#77292)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77226)](dotnet/roslyn#77226)
- [[automated] Merge branch 'main' => 'release/dev18.0' (77153)](dotnet/roslyn#77153)
- [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138)
```

*After*:
```md
### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0):
[View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1)
- [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138)
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead VSCode

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants