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 'release/dev17.14' => 'release/dev18.0' #18428

Closed

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
  • MangelMaxime
  • KevinRansom
  • majocha
  • Martin521
  • carlossanlop
  • 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 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.

mthalman and others added 11 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) <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
* Use correct TFM for source build when OfficialBuildId isn't set (#18397)

* Update dependencies coming from maintenance-packages (#18329)

* 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) <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>

---------

Co-authored-by: Matt Thalman <[email protected]>
Co-authored-by: Carlos Sánchez López <[email protected]>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
* update devcontainer sdk (#18412)

* deal with hanging test (#18411)

* typo (#18413)

---------

Co-authored-by: Martin <[email protected]>
Co-authored-by: Jakub Majocha <[email protected]>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
* 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
[automated] Merge branch 'main' => 'release/dev17.14'
@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Apr 7, 2025
Copy link
Contributor Author

github-actions bot commented Apr 7, 2025

❗ Release notes required

@github-actions[bot],

Caution

No release notes found for the changed paths (see table below).

Please make sure to add an entry with an informative description of the change as well as link to this pull request, issue and language suggestion if applicable. Release notes for this repository are based on Keep A Changelog format.

The following format is recommended for this repository:

* <Informative description>. ([PR #XXXXX](https://github.com/dotnet/fsharp/pull/XXXXX))

See examples in the files, listed in the table below or in th full documentation at https://fsharp.github.io/fsharp-compiler-docs/release-notes/About.html.

If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request.

You can open this PR in browser to add release notes: open in github.dev

Change path Release notes path Description
src/FSharp.Core docs/release-notes/.FSharp.Core/10.0.100.md No release notes found or release notes format is not correct
src/Compiler docs/release-notes/.FSharp.Compiler.Service/10.0.100.md No release notes found or release notes format is not correct
vsintegration/src docs/release-notes/.VisualStudio/18.0.md No release notes found or release notes format is not correct

@KevinRansom KevinRansom closed this Apr 8, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Done in F# Compiler and Tooling Apr 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

7 participants