Skip to content

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

Merged
dotnet-policy-service[bot] merged 3 commits intomain-vs-depsfrom
merge/main-to-main-vs-deps
Mar 11, 2025
Merged

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

Conversation

@github-actions
Copy link
Copy Markdown
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:

  • jasonmalinowski

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.

This shouldn't be needed anymore, and prevents some design time build
breaks if NuGet restore wasn't able to get this package.

Fixes #74923
This shouldn't be needed anymore, and prevents some design time build
breaks if NuGet restore wasn't able to get this package.

Fixes #74923
@github-actions github-actions bot requested a review from a team as a code owner March 10, 2025 21:03
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Mar 10, 2025
Copy link
Copy Markdown
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

buildArguments: -msbuildEngine vs /p:Projects='"$(Build.Repository.LocalPath)\src\VisualStudio\IntegrationTest\IntegrationTestBuildProject.csproj"'

- stage: ${{ parameters.configuration }}_Integration
condition: and(succeeded(), ne(variables['System.PullRequest.TargetBranchName'], 'main-vs-deps'))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

As an alternative, you could add main-vs-deps to the branch excludes in azure-pipelines-integration.yml

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, you're right, I can try that, thanks. I'm not sure if the repository-wide rule that "roslyn-integration-CI" is required CI check won't mind that it didn't run at all though.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It works the way we would expect unlike GH Actions paths-ignore =/

@jjonescz jjonescz force-pushed the merge/main-to-main-vs-deps branch from 72ac722 to a3d6b18 Compare March 11, 2025 07:47
@dotnet-policy-service dotnet-policy-service bot merged commit 72ff2f9 into main-vs-deps Mar 11, 2025
24 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Mar 11, 2025
@jjonescz jjonescz modified the milestones: Next, 17.14 P3 Apr 1, 2025
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants