Skip to content

Revert "Remove InternalsVisibleTo for Toolkit"#29321

Merged
PureWeen merged 1 commit intonet10.0from
revert-28994-net10-remove-ivt-toolkit
May 8, 2025
Merged

Revert "Remove InternalsVisibleTo for Toolkit"#29321
PureWeen merged 1 commit intonet10.0from
revert-28994-net10-remove-ivt-toolkit

Conversation

@jfversluis
Copy link
Member

@jfversluis jfversluis commented May 5, 2025

Reverts #28994

Revert for now because the timing doesn't line up yet. We don't have a version of the Toolkit that uses the public types so with this change, the .NET 10 preview templates (using --sample-content) using the Toolkit will break immediately.

We probably want to think about maybe some pre-release of the Toolkit or maybe make the needed types public first, make the changes in the Toolkit and only then remove InternalsVisibleTo

Fixes #29320

Copilot AI review requested due to automatic review settings May 5, 2025 13:50
@jfversluis jfversluis requested a review from a team as a code owner May 5, 2025 13:50
@jfversluis jfversluis requested review from PureWeen and tj-devel709 May 5, 2025 13:51
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR reverts a previous change that removed InternalsVisibleTo attributes for CommunityToolkit.Maui, ensuring that .NET 10 preview templates using the Toolkit do not break. Key changes include reintroducing the missing InternalsVisibleTo attributes in multiple AssemblyInfo files, restoring public/internal API boundaries in the PublicAPI.Unshipped.txt files, and reverting interface declaration modifications in Controls (e.g. ITextElement, ITextAlignmentElement, ILineHeightElement, ICornerElement).

Reviewed Changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
src/Essentials/src/AssemblyInfo/AssemblyInfo.shared.cs Re-added InternalsVisibleTo attributes for CommunityToolkit.Maui assemblies.
src/Core/src/Properties/AssemblyInfo.cs Reintroduced InternalsVisibleTo attributes; note duplicate declaration for Controls.TestCases.HostApp.
src/Controls/src/Xaml/Properties/AssemblyInfo.cs Added InternalsVisibleTo attributes for CommunityToolkit.Maui assemblies.
PublicAPI.Unshipped.txt (various targets) Adjusted public API listings to revert previous removals.
src/Controls/src/Core/ITextElement.cs, ITextAlignmentElement.cs, ILineHeightElement.cs, ICornerElement.cs Reverted XML documentation and access modifiers changes on internal interfaces.
Comments suppressed due to low confidence (1)

src/Controls/src/Core/Properties/AssemblyInfo.cs:57

  • There is a duplicate declaration for 'Controls.TestCases.HostApp'. Consider removing the redundant attribute to improve clarity and maintainability.
[assembly: InternalsVisibleTo("Controls.TestCases.HostApp")]

@PureWeen PureWeen added this to the .NET 10.0-preview4 milestone May 7, 2025
@PureWeen PureWeen added the p/0 Current heighest priority issues that we are targeting for a release. label May 7, 2025
@PureWeen PureWeen moved this from Todo to Ready To Review in MAUI SDK Ongoing May 7, 2025
@github-project-automation github-project-automation bot moved this from Ready To Review to Approved in MAUI SDK Ongoing May 8, 2025
@PureWeen PureWeen merged commit 4c5fef6 into net10.0 May 8, 2025
128 checks passed
@PureWeen PureWeen deleted the revert-28994-net10-remove-ivt-toolkit branch May 8, 2025 15:42
@github-project-automation github-project-automation bot moved this from Approved to Done in MAUI SDK Ongoing May 8, 2025
@PureWeen
Copy link
Member

PureWeen commented May 8, 2025

/backport to release/10.0.1xx-preview4

@github-actions
Copy link
Contributor

github-actions bot commented May 8, 2025

Started backporting to release/10.0.1xx-preview4: https://github.com/dotnet/maui/actions/runs/14910467822

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

p/0 Current heighest priority issues that we are targeting for a release.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants