- Notifications
You must be signed in to change notification settings - Fork825
[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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
github-actions wants to merge27 commits intomainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Fix PM----#### AI description (iteration 1)#### PR ClassificationBug fix#### PR SummaryThis 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 ClassificationThis pull request is for a NuGet patch release, focusing on updating build configurations and dependencies.#### PR SummaryThis 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 ClassificationNuGet package update for a specific release branch.#### PR SummaryThis 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 142Revisit this with conditional setting or a binding redirect
17.14 - increase fsharpcore build version number
…20231Sync from Azure DevOps: release/dev17.14
…v17.14[release/dev17.14] Update MicroBuildShipTasks from v3 to v5
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. Seehttps://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.