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.

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

[automated] Merge branch 'main' => 'release/dev17.15' #77901

Merged
merged 10 commits into from
Mar 31, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • jasonmalinowski
  • akhera99

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

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/dev17.15'. 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/dev17.15 origin/release/dev17.15
git pull https://github.com/dotnet/roslyn merge/main-to-release/dev17.15
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev17.15
or if you are using SSH
git fetch
git checkout -b merge/main-to-release/dev17.15 origin/release/dev17.15
git pull git@github.com:dotnet/roslyn merge/main-to-release/dev17.15
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev17.15

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.

jasonmalinowski and others added 7 commits March 24, 2025 18:09
The original reason to upgrade to this is carries along updates
to the Fast Up to Date Check support, which means Roslyn can delete
our own copy of the targets.

The upgrade caused one break: there's newer support in the VS SDK now
where they look for ForceIncludeInVSIX metadata on PackageReferences
as a way to bypass the suppression logic that exists to ensure certain
references don't end up in the final VSIX. We had our own custom logic
where you'd set just IncludeInVSIX="true" as metadata, which would
produce items under teh covers with ForceIncludeInVSIX=true. There's
arguably a bug in the targets that they should be respecting our
underlying metadata rather than looking back to the PackageReference
metadata, but it still seems reasonable for us just to adopt the same
metadata name as the VS SDK. At this point it's not clear to me if
we even need our custom logic anymore or if it's now obsolete.

# Conflicts:
#	eng/Versions.props
#	src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj

# Conflicts:
#	src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj
* wip

* loading state works

* clean up

* feedback/comments

* fix formatting

* fix formatting

* feedback

* change enqueueaction

* last feedback

* feedback

* commented out line of code
The original reason to upgrade to this is carries along updates to the
Fast Up to Date Check support, which means Roslyn can delete our own
copy of the targets.

The upgrade caused one break: there's newer support in the VS SDK now
where they look for ForceIncludeInVSIX metadata on PackageReferences as
a way to bypass the suppression logic that exists to ensure certain
references don't end up in the final VSIX. We had our own custom logic
where you'd set just IncludeInVSIX="true" as metadata, which would
produce items under teh covers with ForceIncludeInVSIX=true. There's
arguably a bug in the targets that they should be respecting our
underlying metadata rather than looking back to the PackageReference
metadata, but it still seems reasonable for us just to adopt the same
metadata name as the VS SDK. At this point it's not clear to me if we
even need our custom logic anymore or if it's now obsolete.
These branches no longer exist.
@github-actions github-actions bot requested review from a team as code owners March 28, 2025 21:03
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Mar 28, 2025
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approve

@dotnet-policy-service dotnet-policy-service bot merged commit 48f7b0a into release/dev17.15 Mar 31, 2025
28 checks passed
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.

4 participants