Skip to content

[automated] Merge branch 'release/dev17.14' => 'main' #18746

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

Closed
wants to merge 27 commits into from

Conversation

github-actions[bot]
Copy link
Contributor

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

This PR merges commits made on release/dev17.14 by the following committers:

  • T-Gro
  • KevinRansom

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

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

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.

KevinRansom and others added 24 commits April 15, 2025 09:51
Fix PM

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix

#### PR Summary
This pull request addresses issues with the package manager for the release `/dev17.14`, ensuring proper handling of script project options and text view caret positions.
- `FSharpProjectOptionsManager.fs`: Refactored handling of `textViewAndCaret` to improve script project options retrieval.
- `ScriptClosure.fs`: Fixed filtering logic for package manager lines.
- `Extensions.fs`: Corrected parameter in `GetActiveView` method to ensure proper text buffer handling.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
#### AI description  (iteration 1)
#### PR Classification
This pull request is for a NuGet patch release, focusing on updating build configurations and dependencies.

#### PR Summary
This pull request updates build scripts and configuration files to support a new NuGet patch release, ensuring compatibility with updated Microsoft Build packages.
- `/eng/build.sh`: Added no-operation implementations for `--runtimesourcefeed` and `--runtimesourcefeedkey` arguments.
- `/eng/Versions.props`: Updated Microsoft Build package versions to use a unified `MicrosoftBuildVersion` variable.
- `/eng/SourceBuildPrebuiltBaseline.xml`: Added new usages for Microsoft Build packages with version `17.13.26`.
- `/azure-pipelines.yml`: Enabled internal sources for source build parameters.
- `/NuGet.config`: Added a new package source for `msbuild-Trusted`.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
rel/d17.14

----
#### AI description  (iteration 1)
#### PR Classification
NuGet package update for a specific release branch.

#### PR Summary
This pull request updates the Azure Pipelines configuration to target the `rel/d17.14` branch for Visual Studio insertion. This change ensures that the build and release processes are aligned with the correct branch for the upcoming release.
- Updated `azure-pipelines.yml` to set `VSInsertionTargetBranchName` to `rel/d17.14`.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Otel exported led to a fatal crash in CI:

[xUnit.net 00:00:00.79] FSharp.Build.UnitTests: Catastrophic failure: System.IO.FileNotFoundException: Could not load file or assembly 'System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' or one of its dependencies. The system cannot find the file specified.
File name: 'System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
   at OpenTelemetry.Trace.TracerProviderBuilderBase.Build()
   at OpenTelemetry.Trace.TracerProviderBuilderExtensions.Build(TracerProviderBuilder tracerProviderBuilder)
   at <StartupCode$FSharp-Test-Utilities>.$XunitHelpers.CreateExecutor@130.RunTestCases(IEnumerable`1 testCases, IMessageSink executionMessageSink, ITestFrameworkExecutionOptions executionOptions) in D:\a\_work\1\s\tests\FSharp.Test.Utilities\XunitHelpers.fs:line 142



Revisit this with conditional setting or a binding redirect
17.14 - increase fsharpcore build version number
T-Gro added 3 commits July 10, 2025 09:20
…20231

Sync from Azure DevOps: release/dev17.14
…v17.14

[release/dev17.14] Update MicroBuildShipTasks from v3 to v5
@T-Gro T-Gro closed this Jul 22, 2025
@T-Gro T-Gro deleted the merge/release/dev17.14-to-main branch July 22, 2025 09:57
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.

2 participants