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

Merged
merged 33 commits into from
Mar 25, 2025

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the main branch which have not been merged yet to release/dev17.14. I'm a robot and am configured to help you automatically keep release/dev17.14 up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • T-Gro
  • brianrourkeboll
  • Martin521
  • muqiuhan
  • psfinaki
  • MangelMaxime
  • benhopkinstech
  • majocha

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/dev17.14
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/dev17.14
or if you are using SSH
git push [email protected]:dotnet/fsharp HEAD:merge/main-to-release/dev17.14

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

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.

majocha and others added 11 commits February 25, 2025 13:11
* msbuild

* Update Versions.props

* Revert "Update Versions.props"

This reverts commit c1c61eb.

* Update SourceBuildPrebuiltBaseline.xml

---------

Co-authored-by: Kevin Ransom (msft) <[email protected]>
…kProject (#18366)

* added test that fails with transparent compiler only

* fix for missing parse diagnostics in TransparentCompiler.ComputeParseAndCheckProject

* Fantomas

* release notes

* ilverify baseline updated
…ion (#18352) (#18353)

- Update test, release note and comment for Array.InsertManyAt

Co-authored-by: Kevin Ransom (msft) <[email protected]>
@github-actions github-actions bot force-pushed the merge/main-to-release/dev17.14 branch from 25edc45 to 88f8041 Compare March 11, 2025 14:10
@github-actions github-actions bot requested review from a team as code owners March 11, 2025 14:10
psfinaki and others added 12 commits March 12, 2025 12:35
…eady loaded, 2) Use ConcurrentDictionary in thread-safe way (#18377)
* cherrypick 18355

* revert attributes feature (#18355)

* revert attributes

* release notes
* Revive E2E tests

* up

* try this

* Revert "try this"

This reverts commit fea7c91.

* Revert "up"

This reverts commit 39ffc4c.

* Revert "Revive E2E tests"

This reverts commit 7056cb8.

* up
* fix delegate with option parameter

* release note

* typo

* fix struct optional parameter

* fix test

* fix test

---------

Co-authored-by: ijklam <[email protected]>
Co-authored-by: Petr <[email protected]>
…ence-packages build 20250313.3 (#18383)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Petr <[email protected]>
…ect (#18380)

* fix duplicate parse errors for GetBackgroundCheckResultsForFileInProject

* added release notes

---------

Co-authored-by: Petr <[email protected]>
* Update dependencies from https://github.com/dotnet/msbuild build 20250306.7

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.11.0-preview-24178-03 -> To Version 17.14.0-preview-25156-07

* Update other deps

* Update Versions.props

* up

* Update SourceBuildPrebuiltBaseline.xml

* Update dependencies from https://github.com/dotnet/msbuild build 20250307.7

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.11.0-preview-24178-03 -> To Version 17.14.0-preview-25157-07

* Update Version.Details.xml

* Update dependencies from https://github.com/dotnet/msbuild build 20250310.8

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.11.0-preview-24178-03 -> To Version 17.14.0-preview-25160-08

* Update dependencies from https://github.com/dotnet/msbuild build 20250311.14

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.11.0-preview-24178-03 -> To Version 17.14.0-preview-25161-14

* Update dependencies from https://github.com/dotnet/msbuild build 20250228.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.11.0-preview-24178-03 -> To Version 17.13.19-preview-25128-01

* Update

* up

* Update dependencies from https://github.com/dotnet/msbuild build 20250312.14

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.11.0-preview-24178-03 -> To Version 17.13.20-preview-25162-14

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Petr <[email protected]>
* xUnit - move custom initialization from test framework constructor to executor

* Update tests/FSharp.Test.Utilities/XunitHelpers.fs

Co-authored-by: Tomas Grosup <[email protected]>

---------

Co-authored-by: Petr <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20250311.4

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

* Update dependencies from https://github.com/dotnet/arcade build 20250314.2

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

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Petr <[email protected]>
* improve caller info attribute error message range

* release note

---------

Co-authored-by: ijklam <[email protected]>
Co-authored-by: Petr <[email protected]>
@T-Gro T-Gro enabled auto-merge (squash) March 20, 2025 09:00
@T-Gro T-Gro disabled auto-merge March 20, 2025 09:00
@T-Gro T-Gro enabled auto-merge March 20, 2025 09:00
…0319.6 (#18396)

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.13.20-preview-25162-14 -> To Version 17.13.21-preview-25169-06

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
KevinRansom and others added 9 commits March 24, 2025 16:08
* 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]>
@T-Gro
Copy link
Member

T-Gro commented Mar 25, 2025

@dotnet/source-build : Could you please approve?

@T-Gro
Copy link
Member

T-Gro commented Mar 25, 2025

@benhopkinstech : Could you please approve, this merge includes the xcopy changes from you.

@T-Gro T-Gro merged commit 127fd83 into release/dev17.14 Mar 25, 2025
33 checks passed
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.