diff --git a/.nuspec/Microsoft.Maui.Controls.targets b/.nuspec/Microsoft.Maui.Controls.targets index 34ccd310181c..bcc18b349d4a 100644 --- a/.nuspec/Microsoft.Maui.Controls.targets +++ b/.nuspec/Microsoft.Maui.Controls.targets @@ -129,6 +129,7 @@ OptimizeIL = "true" DebugSymbols = "$(DebugSymbols)" DebugType = "$(DebugType)" + DefaultCompile = "true" ValidateOnly = "$(_MauiXamlCValidateOnly)" KeepXamlResources = "$(MauiKeepXamlResources)" /> diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/GradientGalleries/GradientViewsGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/GradientGalleries/GradientViewsGallery.xaml.cs index f6ac2a4124df..8fd69368eacd 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/GradientGalleries/GradientViewsGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/GradientGalleries/GradientViewsGallery.xaml.cs @@ -1,7 +1,9 @@ using Microsoft.Maui.Graphics; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.GradientGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class GradientViewsGallery : ContentPage { public GradientViewsGallery() @@ -106,4 +108,4 @@ void UpdateBackground(Brush background) TimePicker.Background = background; } } -} \ No newline at end of file +} diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs index e07db9bec7f8..dca7424a97d5 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs @@ -1,9 +1,12 @@ using System; +using Microsoft.Maui.Controls.Xaml; + using Microsoft.Maui.Controls.Internals; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class BasicSwipeGallery : ContentPage { public BasicSwipeGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/HorizontalSwipeThresholdGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/HorizontalSwipeThresholdGallery.xaml.cs index f57108fb85d8..ebc551089dba 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/HorizontalSwipeThresholdGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/HorizontalSwipeThresholdGallery.xaml.cs @@ -1,5 +1,8 @@ -namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries +using Microsoft.Maui.Controls.Xaml; + +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class HorizontalSwipeThresholdGallery : ContentPage { public HorizontalSwipeThresholdGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs index 1f19f5fc57d8..5db8520d450a 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs @@ -1,8 +1,10 @@ using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class ResourceSwipeItemsGallery : ContentPage { public ResourceSwipeItemsGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs index cd120be655ad..3c9b1126e8ff 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs @@ -1,10 +1,12 @@ using System.Collections.ObjectModel; using System.Windows.Input; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeBindableLayoutGallery : ContentPage { public SwipeBindableLayoutGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs index ba62ed0f21c9..2dec36f9fbec 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs @@ -1,8 +1,10 @@ using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeCarouselViewGallery : ContentPage { public SwipeCarouselViewGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs index b518166f2dcf..746f3de500dc 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs @@ -1,8 +1,10 @@ using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeHorizontalCollectionViewGallery : ContentPage { public SwipeHorizontalCollectionViewGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs index 6047941edc4b..b938e2733d57 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs @@ -1,8 +1,10 @@ using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeListViewGallery : ContentPage { public SwipeListViewGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs index 74423d60503b..a25ad193fff6 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs @@ -1,8 +1,10 @@ using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeVerticalCollectionViewGallery : ContentPage { public SwipeVerticalCollectionViewGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewBindingContextGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewBindingContextGallery.xaml.cs index b040bb4ba9ef..04a50a848379 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewBindingContextGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewBindingContextGallery.xaml.cs @@ -1,10 +1,12 @@ using System.Collections.ObjectModel; using System.Windows.Input; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeViewBindingContextGallery : ContentPage { public SwipeViewBindingContextGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs index 0d2f3a29740b..aaebd8f0a586 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewGestureRecognizerGallery.xaml.cs @@ -1,5 +1,8 @@ -namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries +using Microsoft.Maui.Controls.Xaml; + +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeViewGestureRecognizerGallery : ContentPage { public SwipeViewGestureRecognizerGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs index aceb57d8037d..f7b1b205378d 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/SwipeViewVisualStatesCollectionGallery.xaml.cs @@ -1,5 +1,8 @@ -namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries +using Microsoft.Maui.Controls.Xaml; + +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class SwipeViewVisualStatesCollectionGallery : ContentPage { public SwipeViewVisualStatesCollectionGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/VerticalSwipeThresholdGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/VerticalSwipeThresholdGallery.xaml.cs index 9ac2f4c94b3c..c08c55ca57f8 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/VerticalSwipeThresholdGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/SwipeViewGalleries/VerticalSwipeThresholdGallery.xaml.cs @@ -1,5 +1,8 @@ -namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries +using Microsoft.Maui.Controls.Xaml; + +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.SwipeViewGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class VerticalSwipeThresholdGallery : ContentPage { public VerticalSwipeThresholdGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DualScreenStateTriggerGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DualScreenStateTriggerGallery.xaml.cs index d70e8dc26956..0ce5f1b30aaa 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DualScreenStateTriggerGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/DualScreenStateTriggerGallery.xaml.cs @@ -1,5 +1,8 @@ -namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.VisualStateManagerGalleries +using Microsoft.Maui.Controls.Xaml; + +namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.VisualStateManagerGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class DualScreenStateTriggerGallery : ContentPage { public DualScreenStateTriggerGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggerEventsGallery.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggerEventsGallery.xaml.cs index f27e26dbd282..abe145bfb057 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggerEventsGallery.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggerEventsGallery.xaml.cs @@ -1,8 +1,10 @@ using System; using System.Windows.Input; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.VisualStateManagerGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class StateTriggerEventsGallery : ContentPage { public StateTriggerEventsGallery() diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggersDirectlyOnElements.xaml.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggersDirectlyOnElements.xaml.cs index fe3e5b6c9103..9b2956b4ae72 100644 --- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggersDirectlyOnElements.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/VisualStateManagerGalleries/StateTriggersDirectlyOnElements.xaml.cs @@ -1,7 +1,9 @@ using System.Windows.Input; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages.VisualStateManagerGalleries { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class StateTriggersDirectlyOnElements : ContentPage { public StateTriggersDirectlyOnElements() diff --git a/src/Compatibility/ControlGallery/src/Core/HanselForms/BlogPage.xaml.cs b/src/Compatibility/ControlGallery/src/Core/HanselForms/BlogPage.xaml.cs index fcd7ab7f94d5..462fae6b22fe 100644 --- a/src/Compatibility/ControlGallery/src/Core/HanselForms/BlogPage.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/HanselForms/BlogPage.xaml.cs @@ -7,9 +7,11 @@ using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class BlogPage : ContentPage { diff --git a/src/Compatibility/ControlGallery/src/Core/HanselForms/TwitterPage.xaml.cs b/src/Compatibility/ControlGallery/src/Core/HanselForms/TwitterPage.xaml.cs index 2b313ce1b365..563a0b9c7d6a 100644 --- a/src/Compatibility/ControlGallery/src/Core/HanselForms/TwitterPage.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/HanselForms/TwitterPage.xaml.cs @@ -2,9 +2,11 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class TwitterPage : ContentPage { diff --git a/src/Compatibility/ControlGallery/src/Core/LegacyRepro/Page1.xaml.cs b/src/Compatibility/ControlGallery/src/Core/LegacyRepro/Page1.xaml.cs index 85c079132e07..8c5292d1dbf5 100644 --- a/src/Compatibility/ControlGallery/src/Core/LegacyRepro/Page1.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/LegacyRepro/Page1.xaml.cs @@ -7,9 +7,12 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Xaml; + namespace App2 { + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Page1 : ContentPage { public Page1() diff --git a/src/Compatibility/ControlGallery/src/Core/XamStore/Views/DemoShellPage.xaml.cs b/src/Compatibility/ControlGallery/src/Core/XamStore/Views/DemoShellPage.xaml.cs index 886242947f94..f847c6f29499 100644 --- a/src/Compatibility/ControlGallery/src/Core/XamStore/Views/DemoShellPage.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Core/XamStore/Views/DemoShellPage.xaml.cs @@ -10,6 +10,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.XamStore { [Preserve(AllMembers = true)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class DemoShellPage : ContentPage { diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29107.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29107.xaml.cs index 752206791b9b..0c8eaf582043 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29107.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29107.xaml.cs @@ -1,5 +1,6 @@ using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { @@ -8,6 +9,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues #endif [Preserve(AllMembers = true)] [Issue(IssueTracker.Bugzilla, 29107, "Xamarin.Android ScrollView text overlaps", PlatformAffected.Android)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Bugzilla29107 : TestContentPage { public Bugzilla29107() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45284.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45284.xaml.cs index 39b42cf3f418..f52594f061d4 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45284.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45284.xaml.cs @@ -4,6 +4,7 @@ using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { @@ -13,6 +14,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues #endif [Preserve(AllMembers = true)] [Issue(IssueTracker.Bugzilla, 45284, "[iOS10] Extra tab icons display in iOS when binding Title on TabbedPage", PlatformAffected.iOS)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Bugzilla45284 : TabbedPage { public Bugzilla45284() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla54977.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla54977.xaml.cs index c63fe44109a6..c0e79943782f 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla54977.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla54977.xaml.cs @@ -1,5 +1,6 @@ using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { @@ -9,6 +10,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues #endif [Preserve(AllMembers = true)] [Issue(IssueTracker.Bugzilla, 54977, "Toolbaritems do not appear", PlatformAffected.Android, NavigationBehavior.PushAsync)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Bugzilla54977 : ContentPage { string _prefix; diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12910.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12910.xaml.cs index 82e4edcbd19f..d9f5dcd80bf4 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12910.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12910.xaml.cs @@ -5,6 +5,7 @@ using System.Windows.Input; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; #if UITEST using Xamarin.UITest; @@ -21,6 +22,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues [Issue(IssueTracker.Github, 12910, "[Bug] 'Cannot access a disposed object. Object name: 'DefaultRenderer' - on ios with CollectionView and EmptyView", PlatformAffected.iOS)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue12910 : TestContentPage { readonly Issue12910ViewModel _viewModel; diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653.xaml.cs index 6a36291c409f..386032319386 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653.xaml.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Maui.Controls.Xaml; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; @@ -16,6 +17,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues #endif [Preserve(AllMembers = true)] [Issue(IssueTracker.Github, 1653, "ScrollView exceeding bounds", PlatformAffected.Android | PlatformAffected.iOS | PlatformAffected.WinPhone)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue1653 : ContentPage { public Issue1653() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653v2.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653v2.xaml.cs index 2d9f8e707bf5..16561708a062 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653v2.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1653v2.xaml.cs @@ -3,6 +3,7 @@ using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { @@ -12,6 +13,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues #endif [Preserve(AllMembers = true)] [Issue(IssueTracker.Github, 1653, "ScrollView exceeding bounds - v2", PlatformAffected.Android | PlatformAffected.iOS | PlatformAffected.WinPhone)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue1653v2 : ContentPage { public Issue1653v2() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2282.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2282.xaml.cs index 7ba0bfd0e3c6..fba62c0b145f 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2282.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2282.xaml.cs @@ -8,12 +8,14 @@ using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { #if APP [Preserve(AllMembers = true)] [Issue(IssueTracker.Github, 2282, "ListView ItemTapped issue on Windows phone", PlatformAffected.WinPhone)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue2282 : ContentPage { public Issue2282() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2357.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2357.xaml.cs index a1b66609beeb..39f020b865c0 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2357.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2357.xaml.cs @@ -8,6 +8,8 @@ using System.Threading.Tasks; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; + #if UITEST using Xamarin.UITest; using NUnit.Framework; @@ -24,6 +26,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues // this doesn't fail on Uwp but it leaves a browser window open and breaks later tests [Category(UITestCategories.UwpIgnore)] #endif + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue2357 : FlyoutPage { public Issue2357() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2951.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2951.xaml.cs index 525503ffac3a..1b3144b40df0 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2951.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2951.xaml.cs @@ -6,6 +6,7 @@ using Microsoft.Maui.Controls; using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; #if UITEST using Xamarin.UITest.Queries; @@ -23,6 +24,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues #endif [Preserve(AllMembers = true)] [Issue(IssueTracker.Github, 2951, "On Android, button background is not updated when color changes ")] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue2951 : TestContentPage { public Issue2951() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8715.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8715.xaml.cs index 21c5dfbcab79..72fce198f1ba 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8715.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8715.xaml.cs @@ -12,6 +12,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues { [Issue(IssueTracker.Github, 8715, "NullReferenceException Microsoft.Maui.Controls.Platform.iOS.StructuredItemsViewRenderer [Bug]", PlatformAffected.iOS)] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class Issue8715 : TestShell { public Issue8715() diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/RectTest.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/RectTest.xaml.cs index 889d9b361ec4..7849e5de7e2c 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/RectTest.xaml.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/RectTest.xaml.cs @@ -1,5 +1,6 @@ using Microsoft.Maui.Controls.CustomAttributes; using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Xaml; #if UITEST using Xamarin.UITest; @@ -11,6 +12,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues [Preserve(AllMembers = true)] [Issue(IssueTracker.None, 1, "Using Rect struct to position items")] + [XamlCompilation(XamlCompilationOptions.Skip)] public partial class RectTest : TestContentPage { public RectTest() diff --git a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj index a1e32fe7f146..3de8c2a659a9 100644 --- a/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj @@ -66,6 +66,9 @@ {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Controls.Core + + Controls.Xaml + {d816b818-f58f-4738-93ae-924efab7a07f} Controls.CustomAttributes diff --git a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj index b7b9d2a2d44a..8c08f435ceca 100644 --- a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj @@ -72,6 +72,9 @@ {de354790-6107-468a-b388-e1eff1416240} Controls.Maps-net6 + + Controls.Xaml-net6 + {af64451f-e2bd-41c2-b083-f60c26ae2a9f} Controls.Core-net6 diff --git a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj index 9a011e4d1c83..3db84bf9e278 100644 --- a/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj @@ -66,6 +66,9 @@ {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Controls.Core + + Controls.Xaml + {d816b818-f58f-4738-93ae-924efab7a07f} Controls.CustomAttributes diff --git a/src/Controls/src/Build.Tasks/XamlCTask.cs b/src/Controls/src/Build.Tasks/XamlCTask.cs index 578c246f5e7f..e7cf50be8062 100644 --- a/src/Controls/src/Build.Tasks/XamlCTask.cs +++ b/src/Controls/src/Build.Tasks/XamlCTask.cs @@ -18,12 +18,7 @@ public class XamlCTask : XamlTask bool hasCompiledXamlResources; public bool KeepXamlResources { get; set; } public bool OptimizeIL { get; set; } - - [Obsolete("OutputGeneratedILAsCode is obsolete as of version 2.3.4. This option is no longer available.")] - [EditorBrowsable(EditorBrowsableState.Never)] - public bool OutputGeneratedILAsCode { get; set; } - - public bool CompileByDefault { get; set; } + public bool DefaultCompile { get; set; } public bool ForceCompile { get; set; } public IAssemblyResolver DefaultAssemblyResolver { get; set; } @@ -41,7 +36,7 @@ public override bool Execute(out IList thrownExceptions) { thrownExceptions = null; LoggingHelper.LogMessage(Normal, $"{new string(' ', 0)}Compiling Xaml, assembly: {Assembly}"); - var skipassembly = !CompileByDefault; + var skipassembly = !DefaultCompile; bool success = true; if (!File.Exists(Assembly)) @@ -226,11 +221,6 @@ public override bool Execute(out IList thrownExceptions) initComp.Body.Optimize(); LoggingHelper.LogMessage(Low, $"{new string(' ', 8)}done."); } - -#pragma warning disable 0618 - if (OutputGeneratedILAsCode) - LoggingHelper.LogMessage(Low, $"{new string(' ', 6)}Decompiling option has been removed. Use a 3rd party decompiler to admire the beauty of the IL generated"); -#pragma warning restore 0618 resourcesToPrune.Add(resource); } if (hasCompiledXamlResources)