Skip to content

Update dependencies coming from maintenance-packages #18329

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 14 commits into from
Mar 25, 2025

Conversation

carlossanlop
Copy link
Member

@carlossanlop carlossanlop commented Feb 18, 2025

This PR is result of testing the parallel dependency updates to ensure source-build does not break: dotnet/dotnet#133

IMPORTANT: I need to merge this PR at the same time as all the other PRs in the other repos, to prevent breaking the dependency ingestion in the dotnet/sdk repo.

cc @ericstj @ViktorHofer

Copy link
Contributor

✅ No release notes required

@carlossanlop carlossanlop marked this pull request as ready for review March 18, 2025 20:16
@carlossanlop carlossanlop requested a review from a team as a code owner March 18, 2025 20:16
@carlossanlop
Copy link
Member Author

@ViktorHofer @ericstj this is ready to review. Same changes as in the test PR in dotnet/dotnet: https://github.com/dotnet/dotnet/pull/155/files

@carlossanlop
Copy link
Member Author

The CI is failing because fsharp depends on source-build-reference-packages from release/9.0. Is that correct? See the branch of origin in all the recent PRs:

https://github.com/dotnet/fsharp/pulls?q=is%3Apr+source-build-reference-packages+is%3Aclosed

@carlossanlop
Copy link
Member Author

carlossanlop commented Mar 24, 2025

@dotnet/fsharp-team-msft This is blocked by #18398

@carlossanlop carlossanlop marked this pull request as draft March 25, 2025 00:57
dotnet-maestro bot and others added 2 commits March 24, 2025 18:07
…ence-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
@carlossanlop
Copy link
Member Author

carlossanlop commented Mar 25, 2025

Temporarily unblocking this PR by cherry-picking commit ee35b27 from #18398 so I can view the CI results.

Setting to draft to avoid merging while I confirm the results.

@KevinRansom
Copy link
Member

code formatting change is unrelated: PR to fix in process: #18404

@carlossanlop carlossanlop marked this pull request as ready for review March 25, 2025 16:33
@carlossanlop
Copy link
Member Author

CI looks good. I think the conditions that I removed are no longer needed, particularly because we have merged the ref packages to the source-build-reference-packages repo.

@KevinRansom or @T-Gro can you please merge?

@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Mar 25, 2025
@KevinRansom KevinRansom enabled auto-merge (squash) March 25, 2025 17:02
@carlossanlop
Copy link
Member Author

Mentioned offline to Kevin - This is now blocking the msbuild deps flow into sdk: dotnet/sdk#47853

@KevinRansom KevinRansom disabled auto-merge March 25, 2025 18:00
@KevinRansom KevinRansom enabled auto-merge (squash) March 25, 2025 21:21
@KevinRansom KevinRansom merged commit d4a9f13 into dotnet:main Mar 25, 2025
33 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in F# Compiler and Tooling Mar 25, 2025
@carlossanlop carlossanlop deleted the UpdateMP branch March 25, 2025 22:40
T-Gro added a commit that referenced this pull request Mar 26, 2025
* 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) <codecutter@hotmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>

---------

Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
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.

3 participants