Skip to content

[net10.0] Make CV2 default for net10 #27567

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
rmarinho merged 3 commits into from
Feb 10, 2025
Merged

[net10.0] Make CV2 default for net10 #27567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8212c1
[iOS] Make cv2 the default CollectionView handlers
rmarinho Feb 4, 2025
4dcb9a5
Update MauiProgram.cs
rmarinho Feb 5, 2025
b56ed64
[tests] Remove CV2 test
rmarinho Feb 6, 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
6 changes: 6 additions & 0 deletions src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#elif IOS || MACCATALYST
using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
using Microsoft.Maui.Controls.Handlers.Compatibility;
using Microsoft.Maui.Controls.Handlers.Items2;
#elif TIZEN
using Microsoft.Maui.Controls.Handlers.Compatibility;
using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
Expand Down Expand Up @@ -61,8 +62,13 @@ public static partial class AppHostBuilderExtensions

internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCollection handlersCollection)
{
#if IOS || MACCATALYST
handlersCollection.AddHandler<CollectionView, CollectionViewHandler2>();
handlersCollection.AddHandler<CarouselView, CarouselViewHandler2>();
#else
handlersCollection.AddHandler<CollectionView, CollectionViewHandler>();
handlersCollection.AddHandler<CarouselView, CarouselViewHandler>();
#endif
handlersCollection.AddHandler<Application, ApplicationHandler>();
handlersCollection.AddHandler<ActivityIndicator, ActivityIndicatorHandler>();
handlersCollection.AddHandler<BoxView, BoxViewHandler>();
Expand Down
8 changes: 0 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 @@ -18,14 +18,6 @@ public static MauiApp CreateMauiApp()
#if (IncludeSampleContent)
.UseMauiCommunityToolkit()
.ConfigureSyncfusionToolkit()
.ConfigureMauiHandlers(handlers =>
{
//-:cnd:noEmit
#if IOS || MACCATALYST
handlers.AddHandler<Microsoft.Maui.Controls.CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();
#endif
//+:cnd:noEmit
})
#endif
.ConfigureFonts(fonts =>
{
Expand Down
28 changes: 0 additions & 28 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 @@ -333,32 +333,4 @@ public void BuildWithDifferentVersionNumber(string id, string config, string dis
Assert.IsTrue(DotnetInternal.Build(projectFile, config, properties: buildProps, msbuildWarningsAsErrors: true),
$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
}

// This test is super temporary and is just for the interim
// while we productize the CollectionViewHandler2. Once we
// ship it as the default, this test will fail and can be deleted.
[Test]
[TestCase("maui", DotNetCurrent, "", false)]
[TestCase("maui", DotNetCurrent, "--sample-content", true)]
public void SampleShouldHaveHandler2Registered(string id, string framework, string additionalDotNetNewParams, bool shouldHaveHandler2)
{
var projectDir = TestDirectory;
var programFile = Path.Combine(projectDir, "MauiProgram.cs");

Assert.IsTrue(DotnetInternal.New(id, projectDir, framework, additionalDotNetNewParams),
$"Unable to create template {id}. Check test output for errors.");

var programContents = File.ReadAllText(programFile);

if (shouldHaveHandler2)
{
AssertContains("#if IOS || MACCATALYST", programContents);
AssertContains("handlers.AddHandler<Microsoft.Maui.Controls.CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();", programContents);
}
else
{
AssertDoesNotContain("#if IOS || MACCATALYST", programContents);
AssertDoesNotContain("handlers.AddHandler<Microsoft.Maui.Controls.CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();", programContents);
}
}
}