Skip to content

[release/10.0.1xx] Improve templates for GA #32255

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 1 commit into from
Oct 29, 2025
Merged

[release/10.0.1xx] Improve templates for GA #32255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -18,8 +18,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>
<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
<!--#endif -->

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

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

Copilot AI Oct 29, 2025

Choose a reason for hiding this comment

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

Adding an explicit reference to Microsoft.Maui.Essentials may be unnecessary as it's typically included transitively through Microsoft.Maui.Controls. This could create maintenance overhead if the transitive dependency relationship changes in future versions. Verify if this explicit reference is truly required or if it's being added to work around a specific issue that should be documented.

Suggested change
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />

Copilot uses AI. Check for mistakes.
<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: Enable these tests back 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