Improve templates for GA #32251
Merged
Improve templates for GA #32251
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
There was a problem hiding this comment.
Pull Request Overview
This PR re-enables integration tests for MAUI templates with sample content that were previously disabled due to Community Toolkit compatibility issues with .NET 10. The changes unblock testing of the --sample-content flag now that the blocking issue has been resolved.
Key Changes
- Re-enabled two test cases for MAUI templates with
--sample-contentflag in both Debug and Release configurations - Removed TODO comment explaining the temporary disablement
mattleibow
commented
Oct 28, 2025
Comment on lines
+22
to
+23
| <!-- https://github.com/CommunityToolkit/Maui/issues/2921 --> | ||
| <NoWarn>NU1608</NoWarn> |
There was a problem hiding this comment.
This avoids the nuget restore warnings:
warning NU1608: Detected package version outside of dependency constraint:
CommunityToolkit.Maui 11.1.1 requires Microsoft.Maui.Controls (>= 9.0.30 && < 10.0.0)
but version Microsoft.Maui.Controls 10.0.0 was resolved.
warning NU1608: Detected package version outside of dependency constraint:
CommunityToolkit.Maui.Core 11.1.1 requires Microsoft.Maui.Core (>= 9.0.30 && < 10.0.0)
but version Microsoft.Maui.Core 10.0.0 was resolved.
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" /> | ||
| <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" /> |
There was a problem hiding this comment.
This fixes
error NU1107: Version conflict detected for Microsoft.Maui.Essentials.
Install/reference Microsoft.Maui.Essentials 10.0.0 directly to project MauiApp1 to resolve this issue.
MauiApp1 -> Microsoft.Maui.Controls 10.0.0 -> Microsoft.Maui.Controls.Core 10.0.0 -> Microsoft.Maui.Core 10.0.0 -> Microsoft.Maui.Essentials (>= 10.0.0)
MauiApp1 -> CommunityToolkit.Maui 11.1.1 -> CommunityToolkit.Maui.Core 11.1.1 -> Microsoft.Maui.Essentials (>= 9.0.30 && < 10.0.0).
There was a problem hiding this comment.
Can you put this inside a block, so it's only there for --sample-content?
2 tasks
|
/backport to release/10.0.1xx |
|
Started backporting to |
|
@mattleibow backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Improve templates for GA
Using index info to reconstruct a base tree...
M src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
CONFLICT (content): Merge conflict in src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Improve templates for GA
Error: The process '/usr/bin/git' failed with exit code 128 |
|
/backport to release/10.0.1xx |
|
Started backporting to |
|
@rmarinho backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Improve templates for GA
Using index info to reconstruct a base tree...
M src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
CONFLICT (content): Merge conflict in src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Improve templates for GA
Error: The process '/usr/bin/git' failed with exit code 128 |
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.
Description of Change
Issues Fixed
The issue is that the Maui Community Toolkit specifically excludes .NET 10 stable from the supported versions. This means that until Add .NET 10 Support CommunityToolkit/Maui#2902 lands, there will be a warning.
This PR just hides the first error with conflicting versions. The warnings of incompatible MCT still exist.
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>will still fail the build.<NoWarn>NU1608</NoWarn>will hide the warningsSee also: [BUG] .NET 10 projects fail to restore CommunityToolkit/Maui#2921
Release backport: #32255