Skip to content

Update dependencies coming from maintenance-packages - #18329

Merged
KevinRansom merged 14 commits into
dotnet:mainfrom
carlossanlop:UpdateMP
Mar 25, 2025
Merged

Update dependencies coming from maintenance-packages#18329
KevinRansom merged 14 commits into
dotnet:mainfrom
carlossanlop:UpdateMP

Conversation

@carlossanlop

@carlossanlopcarlossanlop commented Feb 18, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actionsBot commented Feb 18, 2025

Copy link
Copy Markdown
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 ownerMarch 18, 2025 20:16
@carlossanlop

carlossanlop commented Mar 18, 2025

Copy link
Copy Markdown
ContributorAuthor

@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

carlossanlop commented Mar 19, 2025

Copy link
Copy Markdown
ContributorAuthor

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

@carlossanlopcarlossanlop mentioned this pull request Mar 19, 2025
Merged
@carlossanlopcarlossanlop mentioned this pull request Mar 24, 2025
Merged
@carlossanlop

carlossanlop commented Mar 24, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

@carlossanlop
carlossanlop marked this pull request as draft March 25, 2025 00:57
dotnet-maestroBotand others added 2 commits March 24, 2025 18:07
@dotnet-maestro@carlossanlop
Update dependencies fromhttps://github.com/dotnet/source-build-refer…
c04382a
…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
Merge remote-tracking branch 'origin/UpdateMP' into UpdateMP
6d1fd7c
@carlossanlop

carlossanlop commented Mar 25, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

KevinRansom commented Mar 25, 2025

Copy link
Copy Markdown
Contributor

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

carlossanlop commented Mar 25, 2025

Copy link
Copy Markdown
ContributorAuthor

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-automationgithub-project-automationBot moved this from New to In Progress in F# Compiler and ToolingMar 25, 2025
@KevinRansom
KevinRansom enabled auto-merge (squash) March 25, 2025 17:02
@carlossanlopcarlossanlop mentioned this pull request Mar 25, 2025
Merged
@carlossanlop

carlossanlop commented Mar 25, 2025

Copy link
Copy Markdown
ContributorAuthor

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
carlossanlop
carlossanlop commented Mar 25, 2025
View reviewed changes
Comment threadeng/Versions.props Outdated
carlossanlop
carlossanlop commented Mar 25, 2025
View reviewed changes
Comment threadeng/Versions.props
@KevinRansom
KevinRansom enabled auto-merge (squash) March 25, 2025 21:21
@KevinRansom
KevinRansom merged commit d4a9f13 into dotnet:mainMar 25, 2025
@github-project-automationgithub-project-automationBot moved this from In Progress to Done in F# Compiler and ToolingMar 25, 2025
@carlossanlop
carlossanlop deleted the UpdateMP branch March 25, 2025 22:40
@carlossanlopcarlossanlop mentioned this pull request Mar 25, 2025
Merged
T-Gro added a commit that referenced this pull request Mar 26, 2025
@T-Gro@mthalman
@carlossanlop@dotnet-maestro@KevinRansom
[automated] Merge branch 'main' => 'release/dev17.14' (#18410)
3b56f75
* 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>
This was referenced Apr 25, 2025
Closed
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@T-GroT-GroT-Gro approved these changes
+1 more reviewer
@KevinRansomKevinRansomKevinRansom approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

F# Compiler and Tooling
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@carlossanlop@KevinRansom@T-Gro