Skip to content

[automated] Merge branch 'main' => 'release/dev18.0' #18456

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 21 commits into from
Apr 8, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Apr 7, 2025

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

  • KevinRansom
  • dotnet-maestro[bot]
  • carlossanlop
  • bbatsov
  • Martin521
  • T-Gro
  • brianrourkeboll
  • edgarfgp
  • MangelMaxime
  • majocha
  • mthalman

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

mthalman and others added 20 commits March 25, 2025 18:24
* Update dependencies coming from maintenance-packages

* Remove temp feed

* Sort

* Push for real the changes this time

* Update to latest in nuget.org

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250320.3

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

* Bring back conditions

* missing space

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
* Remove a bunch of files from fantomas ignore
* see what happens - bunch of IFDEFs related to nullness removed to enable more fantomas
* nowarn specific nullness when proto builds f.c.s and fsharpbuild
* reenable unused binding detection

* fantomas

* vsintegration/tests - ignored unused bindings in selected test projects
There's no "mapping" parameter. I'm guessing this was a copy/paste mistake.
* Update maintenance-packages versions

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250404.3

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

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ence-packages build 20250404.3 (#18447)

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

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

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25164.2 -> To Version 9.0.0-beta.25204.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Copy link
Contributor Author

github-actions bot commented Apr 7, 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

@KevinRansom KevinRansom added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Apr 8, 2025
@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Apr 8, 2025
@KevinRansom KevinRansom merged commit a973a86 into release/dev18.0 Apr 8, 2025
34 of 35 checks passed
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.

None yet

10 participants