Skip to content

Improve templates for GA #32251

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.

Sign up for GitHub

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 4 commits into from
Oct 29, 2025
Merged

Improve templates for GA #32251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53cbedd
Improve templates for GA
mattleibow Oct 28, 2025
877ff35
Update MauiApp.1.csproj for warnings and dependencies
mattleibow Oct 28, 2025
5dd1e24
Microsoft.Maui.Platform
mattleibow Oct 28, 2025
2702a86
ws
mattleibow Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!--#if (IncludeSampleContent) -->
<!-- https://github.com/CommunityToolkit/Maui/issues/2205 -->
<NoWarn>XC0103</NoWarn>
<!-- https://github.com/CommunityToolkit/Maui/issues/2921 -->
<NoWarn>NU1608</NoWarn>
Comment on lines +22 to +23
Copy link
Member Author

Choose a reason for hiding this comment

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

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.

<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
<!--#endif -->

Expand Down Expand Up @@ -76,6 +76,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
Copy link
Member Author

Choose a reason for hiding this comment

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

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).

Copy link
Member

Choose a reason for hiding this comment

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

Can you put this inside a block, so it's only there for --sample-content?

<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="MS_EXT_LOG_DEBUG_VERSION" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions src/Templates/src/templates/maui-mobile/MauiProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ public static MauiApp CreateMauiApp()
handler.PlatformView.SingleSelectionFollowsFocus = false;
});

Microsoft.Maui.Handlers.ContentViewHandler.Mapper.AppendToMapping(nameof(Pages.Controls.CategoryChart), (handler, view) =>
{
if (view is Pages.Controls.CategoryChart && handler.PlatformView is ContentPanel contentPanel)
{
contentPanel.IsTabStop = true;
}
});
Microsoft.Maui.Handlers.ContentViewHandler.Mapper.AppendToMapping(nameof(Pages.Controls.CategoryChart), (handler, view) =>
{
if (view is Pages.Controls.CategoryChart && handler.PlatformView is Microsoft.Maui.Platform.ContentPanel contentPanel)
{
contentPanel.IsTabStop = true;
}
});
#endif
})
})
//+:cnd:noEmit
#endif
.ConfigureFonts(fonts =>
Expand Down
5 changes: 2 additions & 3 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ public class SimpleTemplateTest : BaseTemplateTests
[TestCase("maui", DotNetPrevious, "Release", false, "", "")]
[TestCase("maui", DotNetCurrent, "Debug", false, "", "")]
[TestCase("maui", DotNetCurrent, "Release", false, "", "TrimMode=partial")]
// TODO: Re-enable tests once the Community Toolkit supports .NET 10. More details: https://github.com/dotnet/maui/issues/32151
//[TestCase("maui", DotNetCurrent, "Debug", false, "--sample-content", "")]
//[TestCase("maui", DotNetCurrent, "Release", false, "--sample-content", "TrimMode=partial")]
[TestCase("maui", DotNetCurrent, "Debug", false, "--sample-content", "")]
[TestCase("maui", DotNetCurrent, "Release", false, "--sample-content", "TrimMode=partial")]
//Debug not ready yet
//[TestCase("maui", DotNetCurrent, "Debug", false, "--sample-content", "UseMonoRuntime=false")]
//[TestCase("maui", DotNetCurrent, "Release", false, "--sample-content", "UseMonoRuntime=false EnablePreviewFeatures=true")]
Expand Down
Loading