Skip to content

[automated] Merge branch 'release/dev17.14' => 'release/dev18.0' #18409

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

Merged
merged 27 commits into from
Mar 27, 2025

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/dev17.14 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 release/dev17.14 by the following committers:

  • T-Gro
  • majocha
  • dotnet-maestro[bot]
  • dawedawe
  • KevinRansom
  • ViktorHofer
  • 0101
  • psfinaki
  • vzarytovskii

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

# 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/fsharp HEAD:merge/release/dev17.14-to-release/dev18.0
or if you are using SSH
git push [email protected]:dotnet/fsharp HEAD:merge/release/dev17.14-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/release/dev17.14-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/release/dev17.14-to-release/dev18.0 origin/release/dev18.0
git pull https://github.com/dotnet/fsharp merge/release/dev17.14-to-release/dev18.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/fsharp HEAD:merge/release/dev17.14-to-release/dev18.0
or if you are using SSH
git fetch
git checkout -b merge/release/dev17.14-to-release/dev18.0 origin/release/dev18.0
git pull [email protected]:dotnet/fsharp merge/release/dev17.14-to-release/dev18.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/fsharp HEAD:merge/release/dev17.14-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.

vzarytovskii and others added 26 commits January 17, 2025 15:18
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
* Update fantomas

* Update fantomas - vsintegration
* initial

* testing

* temp

* Fantomas, readme

* temp

* nowarn quotes for fantomas

* tests
…ence-packages build 20250320.3 (#18398)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25163.3 -> To Version 9.0.0-alpha.1.25170.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0324.8 (#18405)

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.13.21-preview-25169-06 -> To Version 17.13.22-preview-25174-08

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
[automated] Merge branch 'main' => 'release/dev17.14'
Copy link
Contributor Author

github-actions bot commented Mar 26, 2025

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Mar 26, 2025
@KevinRansom KevinRansom added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Mar 26, 2025
@KevinRansom KevinRansom enabled auto-merge (squash) March 26, 2025 20:26
@mmitche
Copy link
Member

mmitche commented Mar 26, 2025

I think it might just be a hiccup on the github side:

/azp run

@mmitche mmitche closed this Mar 27, 2025
auto-merge was automatically disabled March 27, 2025 00:02

Pull request was closed

@mmitche mmitche reopened this Mar 27, 2025
@T-Gro T-Gro merged commit 7f44b41 into release/dev18.0 Mar 27, 2025
35 of 36 checks passed
@T-Gro T-Gro deleted the merge/release/dev17.14-to-release/dev18.0 branch March 27, 2025 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

9 participants