Remove instances of '#if NET6_0_OR_GREATER' (#24126)

We're way past that, so deleting these unused cases.
dotnet · Aug 10, 2024 · 27b00f1 · 27b00f1
1 parent 8363dcf
commit 27b00f1
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 30 deletions.
diff --git a/src/Compatibility/Core.LegacyRenderers/Android/Cells/CellAdapter.cs b/src/Compatibility/Core.LegacyRenderers/Android/Cells/CellAdapter.cs
@@ -10,11 +10,7 @@
 using AListView = Android.Widget.ListView;
 using AView = Android.Views.View;
 using Microsoft.Maui.Controls.Platform;
-#if NET6_0_OR_GREATER
 using AMenu = Android.Views.IMenu;
-#else
-using AMenu = Android.Views.Menu;
-#endif
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {

diff --git a/src/Controls/samples/Controls.Sample/MauiProgram.cs b/src/Controls/samples/Controls.Sample/MauiProgram.cs
@@ -5,6 +5,7 @@
 using Maui.Controls.Sample.Pages;
 using Maui.Controls.Sample.Services;
 using Maui.Controls.Sample.ViewModels;
+using Microsoft.AspNetCore.Components.WebView.Maui;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -21,11 +22,6 @@
 using Microsoft.Maui.Controls.Compatibility.Hosting;
 #endif
 
-
-#if NET6_0_OR_GREATER
-using Microsoft.AspNetCore.Components.WebView.Maui;
-#endif
-
 #if ANDROID
 using Android.Gms.Common;
 using Android.Gms.Maps;
@@ -112,11 +108,9 @@ public static MauiApp CreateMauiApp()
 						{"Logging:LogLevel:Default", "Warning"}
 					});
 
-#if NET6_0_OR_GREATER
 			services.AddMauiBlazorWebView();
 #if DEBUG
 			services.AddBlazorWebViewDeveloperTools();
-#endif
 #endif
 
 			services.AddLogging(logging =>
@@ -147,12 +141,7 @@ public static MauiApp CreateMauiApp()
 					PageType.Main => typeof(CustomNavigationPage),
 					PageType.FlyoutPage => typeof(CustomFlyoutPage),
 					PageType.TabbedPage => typeof(Pages.TabbedPageGallery),
-					PageType.Blazor =>
-#if NET6_0_OR_GREATER
-						typeof(BlazorPage),
-#else
-						throw new NotSupportedException("Blazor requires .NET 6 or higher."),
-#endif
+					PageType.Blazor => typeof(BlazorPage),
 					_ => throw new Exception(),
 				});
 

diff --git a/src/Controls/samples/Controls.Sample/Pages/Blazor/BlazorPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Blazor/BlazorPage.xaml.cs
@@ -1,9 +1,6 @@
 using Maui.Controls.Sample.Pages.Base;
-
-#if NET6_0_OR_GREATER
 using Maui.Controls.Sample.Pages.Blazor;
 using Microsoft.AspNetCore.Components.Web;
-#endif
 
 namespace Maui.Controls.Sample.Pages
 {
@@ -13,9 +10,7 @@ public BlazorPage()
 		{
 			InitializeComponent();
 
-#if NET6_0_OR_GREATER
 			bwv.RootComponents.RegisterForJavaScript<MyDynamicComponent>("my-dynamic-root-component");
-#endif
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/MainViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/MainViewModel.cs
@@ -38,10 +38,8 @@ public MainViewModel(IConfiguration configuration, ITextService textService, IDi
 
 		protected override IEnumerable<SectionModel> CreateItems() => new[]
 		{
-#if NET6_0_OR_GREATER
 			new SectionModel(typeof(BlazorPage), "Blazor",
 				"The BlazorWebView control allow to easily embed Razor components into native UI."),
-#endif
 
 			new SectionModel(typeof(CompatibilityPage), "Compatibility",
 				"Functionality available using the compatibility package."),

diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellAdapter.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellAdapter.cs
@@ -11,11 +11,7 @@
 using AListView = Android.Widget.ListView;
 using AView = Android.Views.View;
 using Microsoft.Maui.Controls.Platform;
-#if NET6_0_OR_GREATER
 using AMenu = Android.Views.IMenu;
-#else
-using AMenu = Android.Views.Menu;
-#endif
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {

diff --git a/src/Controls/src/Core/Interactivity/PlatformBehavior.cs b/src/Controls/src/Core/Interactivity/PlatformBehavior.cs
@@ -8,7 +8,7 @@
 using PlatformView = Microsoft.UI.Xaml.FrameworkElement;
 #elif TIZEN
 using PlatformView = Tizen.NUI.BaseComponents.View;
-#elif NET6_0_OR_GREATER || (NETSTANDARD || !PLATFORM)
+#elif NETSTANDARD || !PLATFORM
 using PlatformView = System.Object;
 #endif
 

diff --git a/src/Controls/tests/DeviceTests/Elements/PlatformBehaviorTests.cs b/src/Controls/tests/DeviceTests/Elements/PlatformBehaviorTests.cs
@@ -14,7 +14,7 @@
 using PlatformView = Android.Views.View;
 #elif WINDOWS
 using PlatformView = Microsoft.UI.Xaml.FrameworkElement;
-#elif NET6_0_OR_GREATER || (NETSTANDARD || !PLATFORM)
+#elif NETSTANDARD || !PLATFORM
 using PlatformView = System.Object;
 #endif