Skip to content

[automated] Merge branch 'main' => 'main-vs-deps'#79441

Merged
dotnet-policy-service[bot] merged 4 commits intomain-vs-depsfrom
merge/main-to-main-vs-deps
Jul 17, 2025
Merged

[automated] Merge branch 'main' => 'main-vs-deps'#79441
dotnet-policy-service[bot] merged 4 commits intomain-vs-depsfrom
merge/main-to-main-vs-deps

Conversation

@github-actions
Copy link
Contributor

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

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

  • akhera99
  • JoeRobich
  • dotnet-maestro[bot]

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

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

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.

JoeRobich and others added 4 commits July 16, 2025 20:37
[main] Update dependencies from dotnet/arcade


 - Revert .NET SDK bump

 - Set NUGET_PACKAGES for bootstrap builds in CI

 - Set NUGET_PACKAGES for Correctness_Build_Artifacts

 - Add tracking issue for workarounds

 - Call nuget restore with the -publish flag

 - We need to restore where we publish

 - Add comment for strange restore behavior

 - Update comment
Fixes a double disposal issue which was causing v2 test runs to fail at
the end of test runs. see https://xunit.net/releases/visualstudio/3.1.3
* fix bug

* update test

* simplify

* comment

* clarity

* gracefully handle the document or languageservice being null
@github-actions github-actions bot requested review from a team as code owners July 17, 2025 18:05
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 3622450 into main-vs-deps Jul 17, 2025
21 of 39 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Jul 17, 2025
@RikkiGibson RikkiGibson modified the milestones: Next, 18.0 P1 Aug 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants