diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj index 6e933fcf6b62..3add1e2bb2d5 100644 --- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj +++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj @@ -19,8 +19,8 @@ enable enable - - XC0103 + + NU1608 true @@ -76,6 +76,7 @@ + diff --git a/src/Templates/src/templates/maui-mobile/MauiProgram.cs b/src/Templates/src/templates/maui-mobile/MauiProgram.cs index 506153c5bfbe..6d39119e59bc 100644 --- a/src/Templates/src/templates/maui-mobile/MauiProgram.cs +++ b/src/Templates/src/templates/maui-mobile/MauiProgram.cs @@ -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 => diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs index 10038074f76d..ff1af653ea1a 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs @@ -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")]