Skip to content

Rebase CSS trimmable PR onto latest net11.0#34010

Closed
Copilot wants to merge 6 commits into
dev/simonrozsival/css-trimmablefrom
copilot/sub-pr-33160
Closed

Rebase CSS trimmable PR onto latest net11.0#34010
Copilot wants to merge 6 commits into
dev/simonrozsival/css-trimmablefrom
copilot/sub-pr-33160

Conversation

Copilot AI commented Feb 12, 2026

Copy link
Copy Markdown
Contributor

The original PR branch (dev/simonrozsival/css-trimmable) cannot be rebased due to a grafted first commit containing a full repository snapshot (~1000 files) conflicting with 200+ files that evolved independently in net11.0.

Analysis Completed

  • Grafted commit issue: First commit (c9d5572) is a repository snapshot, not an incremental change
  • Conflict scope: 200+ "both added" conflicts across .github/, eng/, loc/, src/ directories
  • Actual CSS changes: Clean and minimal in commits 2-5 (~220 lines across 9 files)

Files Requiring CSS Changes

The actual feature changes are isolated to:

  • src/Core/src/RuntimeFeature.cs - Feature switch infrastructure
  • src/Controls/src/Build.Tasks/ - CSS build task modifications
  • src/Controls/src/Core/Properties/AssemblyInfo.cs - Remove assembly-level StyleProperty attributes
  • src/Controls/src/Core/Registrar.cs - Move StyleProperty attributes here for trimmability
  • src/Controls/src/Core/StyleSheets/Style.cs - CSS disabled runtime checks
  • src/Controls/src/Core/VisualElement/VisualElement_StyleSheet.cs - CSS disabled runtime checks
  • src/Controls/tests/Core.UnitTests/StyleSheets/StyleTests.cs - Unit tests for CSS-disabled scenarios
  • src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj - Enable CSS for UI tests
  • docs/design/FeatureSwitches.md - Documentation

Resolution Required

Manual intervention needed to:

  1. Extract CSS-only changes from all 5 commits
  2. Apply cleanly onto net11.0 HEAD (e64f7e7)
  3. Preserve functional intent while adapting to evolved codebase

Recommendation: Original author should recreate branch from current net11.0, or approve programmatic extraction losing original commit structure.


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

simonrozsival and others added 6 commits January 31, 2026 01:40
- Add MauiCssEnabled=true to TestCases.HostApp.csproj since some UI tests use CSS functionality
- Add unit tests for CSS-disabled scenarios in StyleTests.cs
- Update NotSupportedException messages to explain why CSS is disabled and how to enable it
- Add MauiCssEnabled documentation to docs/design/FeatureSwitches.md
- Added follow-up reminder comment to PR for dotnet/maui-docs update
Copilot AI changed the title [WIP] Add support for trimmable stylesheets in MAUI Rebase CSS trimmable PR onto latest net11.0 Feb 12, 2026
Copilot AI requested a review from simonrozsival February 12, 2026 09:42
@simonrozsival simonrozsival force-pushed the dev/simonrozsival/css-trimmable branch from 7ded7f1 to 66d1243 Compare February 13, 2026 08:09
@simonrozsival simonrozsival deleted the copilot/sub-pr-33160 branch February 13, 2026 14:43
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 16, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants