-
Notifications
You must be signed in to change notification settings - Fork 815
[automated] Merge branch 'main' => 'feature/lsp' #18480
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
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
Merge main to release/dev17.14
Merge main to release/dev17.14
Merge main to release/dev17.14
Merge main to release/dev17.14
Merge main to release/dev17.14
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
* 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]>
[automated] Merge branch 'main' => 'release/dev17.14'
…ence-packages build 20250423.3 (#18494) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25209.1 -> To Version 9.0.0-alpha.1.25223.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…18491) * Fix overbuilding fsharp & define solution to build in script FSharp was building two solutions in the VMR on Windows which resulted in the inner-build building the same thing but in parallel. The builds each take 7-8 minutes. Fix that by introducing a productBuild switch (which is already exposed in the Arcade scripts) and condition which solution to build on it or the existing source-build switch. Remove the /p:Projects property from DotNetBuild.props. * proto fix * Fix repo source-build * Fixes * fix * Add YML test fix * try * fix200 * Fix201 * Update azure-pipelines-PR.yml * Fixesss
…ion across the repo (#18431)
Imp[rove Caret
…0414.9 (#18478) Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 17.13.24-preview-25209-01 -> To Version 17.13.25-preview-25214-09 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 main branch which have not been merged yet to feature/lsp. I'm a robot and am configured to help you automatically keep feature/lsp up to date, so I've opened this PR.
This PR merges commits made on main 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/main-to-feature/lsp'. 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. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.