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-vs-deps' => 'release/dev18.0' #77659

Merged

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the main-vs-deps 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-vs-deps by the following committers:

  • dotnet-policy-service[bot]
  • jjonescz
  • akhera99
  • 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-vs-deps
git pull --ff-only
git checkout release/dev18.0
git pull --ff-only
git merge --no-ff main-vs-deps

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

dotnet-maestro bot and others added 4 commits March 18, 2025 08:56
…ence-packages build 20250317.1 (#77649)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 10.0.616401 -> To Version 10.0.616701

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* wip

* works end to end

* some feedback

* feedback

* fix bugs

* tests

* revert settings

* fix code analysis service

* fix formatting

* Feedback
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:

* jjonescz
* akhera99
* 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.

<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />

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.

``` sh
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
```

<details>
<summary>or if you are using SSH</summary>

```
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-main-vs-deps
```

</details>


After PR checks are complete push the branch
```
git push
```

## Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].

[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-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
```

<details>
    <summary>or if you are using SSH</summary>

```
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
```

</details>

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.
@github-actions github-actions bot force-pushed the merge/main-vs-deps-to-release/dev18.0 branch from 809e2e2 to e64e81c Compare March 18, 2025 19:15
@github-actions github-actions bot requested review from a team as code owners March 18, 2025 19:15
@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 18, 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 1d3482a into release/dev18.0 Mar 18, 2025
34 of 37 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants