From b6ce041f9e3c6f43a22f6c8e3462432fcca0c002 Mon Sep 17 00:00:00 2001 From: Igor Gritsenko Date: Thu, 3 Oct 2024 14:43:18 +0300 Subject: [PATCH] Fixed generated extension versions --- .../AdornerLayer_MarkupExtensions.g.cs | 2 +- .../Application_MarkupExtensions.g.cs | 12 ++++++------ .../AutoCompleteBox_MarkupExtensions.g.cs | 4 ---- .../AvaloniaObject_MarkupExtensions.g.cs | 4 ---- .../BezierSegment_MarkupExtensions.g.cs | 4 ---- .../BlurEffect_MarkupExtensions.g.cs | 4 ---- .../Border_MarkupExtensions.g.cs | 4 ---- .../Brush_MarkupExtensions.g.cs | 4 ---- .../ButtonSpinner_MarkupExtensions.g.cs | 4 ---- .../Button_MarkupExtensions.g.cs | 4 ---- .../CalendarButton_MarkupExtensions.g.cs | 4 ---- .../CalendarDatePicker_MarkupExtensions.g.cs | 4 ---- .../CalendarDayButton_MarkupExtensions.g.cs | 4 ---- .../CalendarItem_MarkupExtensions.g.cs | 4 ---- .../Calendar_MarkupExtensions.g.cs | 4 ---- .../Canvas_MarkupExtensions.g.cs | 4 ---- .../Carousel_MarkupExtensions.g.cs | 4 ---- .../ColumnDefinition_MarkupExtensions.g.cs | 4 ---- .../CombinedGeometry_MarkupExtensions.g.cs | 4 ---- .../ComboBox_MarkupExtensions.g.cs | 4 ---- .../ConicGradientBrush_MarkupExtensions.g.cs | 4 ---- .../ContentControl_MarkupExtensions.g.cs | 4 ---- .../ContentPresenter_MarkupExtensions.g.cs | 4 ---- .../ContextMenu_MarkupExtensions.g.cs | 4 ---- .../Control_MarkupExtensions.g.cs | 4 ---- .../CroppedBitmap_MarkupExtensions.g.cs | 4 ---- .../DashStyle_MarkupExtensions.g.cs | 4 ---- .../DataValidationErrors_MarkupExtensions.g.cs | 4 ---- .../DatePickerPresenter_MarkupExtensions.g.cs | 4 ---- .../DatePicker_MarkupExtensions.g.cs | 4 ---- .../DateTimePickerPanel_MarkupExtensions.g.cs | 4 ---- .../Decorator_MarkupExtensions.g.cs | 4 ---- .../DefinitionBase_MarkupExtensions.g.cs | 4 ---- .../DockPanel_MarkupExtensions.g.cs | 4 ---- .../DrawingBrush_MarkupExtensions.g.cs | 4 ---- .../DrawingGroup_MarkupExtensions.g.cs | 4 ---- .../DrawingImage_MarkupExtensions.g.cs | 4 ---- .../DropShadowDirectionEffect_MarkupExtensions.g.cs | 4 ---- .../DropShadowEffectBase_MarkupExtensions.g.cs | 4 ---- .../DropShadowEffect_MarkupExtensions.g.cs | 4 ---- .../Effect_MarkupExtensions.g.cs | 4 ---- .../EllipseGeometry_MarkupExtensions.g.cs | 4 ---- .../Expander_MarkupExtensions.g.cs | 4 ---- .../ExperimentalAcrylicBorder_MarkupExtensions.g.cs | 4 ---- ...ExperimentalAcrylicMaterial_MarkupExtensions.g.cs | 4 ---- .../FlyoutBase_MarkupExtensions.g.cs | 4 ---- .../Flyout_MarkupExtensions.g.cs | 4 ---- .../GeometryDrawing_MarkupExtensions.g.cs | 4 ---- .../GeometryGroup_MarkupExtensions.g.cs | 4 ---- .../Geometry_MarkupExtensions.g.cs | 4 ---- .../GlyphRunDrawing_MarkupExtensions.g.cs | 4 ---- .../GradientBrush_MarkupExtensions.g.cs | 4 ---- .../GradientStop_MarkupExtensions.g.cs | 4 ---- .../GridSplitter_MarkupExtensions.g.cs | 4 ---- .../Grid_MarkupExtensions.g.cs | 4 ---- .../HeaderedContentControl_MarkupExtensions.g.cs | 4 ---- .../HeaderedItemsControl_MarkupExtensions.g.cs | 4 ---- ...aderedSelectingItemsControl_MarkupExtensions.g.cs | 4 ---- .../HyperlinkButton_MarkupExtensions.g.cs | 4 ---- .../ImageBrush_MarkupExtensions.g.cs | 4 ---- .../ImageDrawing_MarkupExtensions.g.cs | 4 ---- .../Image_MarkupExtensions.g.cs | 4 ---- .../InlineUIContainer_MarkupExtensions.g.cs | 4 ---- .../Inline_MarkupExtensions.g.cs | 4 ---- .../InputElement_MarkupExtensions.g.cs | 4 ---- .../ItemsControl_MarkupExtensions.g.cs | 4 ---- .../ItemsPresenter_MarkupExtensions.g.cs | 4 ---- .../KeyBinding_MarkupExtensions.g.cs | 4 ---- .../Label_MarkupExtensions.g.cs | 4 ---- .../LayoutTransformControl_MarkupExtensions.g.cs | 4 ---- .../Layoutable_MarkupExtensions.g.cs | 4 ---- .../LineGeometry_MarkupExtensions.g.cs | 4 ---- .../LineSegment_MarkupExtensions.g.cs | 4 ---- .../Line_MarkupExtensions.g.cs | 4 ---- .../LinearGradientBrush_MarkupExtensions.g.cs | 4 ---- .../ListBoxItem_MarkupExtensions.g.cs | 4 ---- .../ListBox_MarkupExtensions.g.cs | 4 ---- ...dFileChooserOverwritePrompt_MarkupExtensions.g.cs | 4 ---- .../MaskedTextBox_MarkupExtensions.g.cs | 4 ---- .../MatrixTransform_MarkupExtensions.g.cs | 4 ---- .../MenuBase_MarkupExtensions.g.cs | 4 ---- .../MenuFlyout_MarkupExtensions.g.cs | 4 ---- .../MenuItem_MarkupExtensions.g.cs | 4 ---- .../NativeMenuBar_MarkupExtensions.g.cs | 4 ---- .../NativeMenuItem_MarkupExtensions.g.cs | 4 ---- .../NativeMenu_MarkupExtensions.g.cs | 4 ---- .../NotificationCard_MarkupExtensions.g.cs | 4 ---- .../NumericUpDown_MarkupExtensions.g.cs | 4 ---- .../OverlayPopupHost_MarkupExtensions.g.cs | 4 ---- .../Panel_MarkupExtensions.g.cs | 4 ---- .../PathFigure_MarkupExtensions.g.cs | 4 ---- .../PathGeometry_MarkupExtensions.g.cs | 4 ---- .../PathIcon_MarkupExtensions.g.cs | 4 ---- .../PathSegment_MarkupExtensions.g.cs | 4 ---- .../Path_MarkupExtensions.g.cs | 4 ---- .../Pen_MarkupExtensions.g.cs | 4 ---- .../PickerPresenterBase_MarkupExtensions.g.cs | 4 ---- .../PolyLineSegment_MarkupExtensions.g.cs | 4 ---- .../Polygon_MarkupExtensions.g.cs | 4 ---- .../PolylineGeometry_MarkupExtensions.g.cs | 4 ---- .../Polyline_MarkupExtensions.g.cs | 4 ---- .../PopupFlyoutBase_MarkupExtensions.g.cs | 4 ---- .../PopupRoot_MarkupExtensions.g.cs | 4 ---- .../Popup_MarkupExtensions.g.cs | 4 ---- .../ProgressBar_MarkupExtensions.g.cs | 4 ---- .../PullGestureRecognizer_MarkupExtensions.g.cs | 4 ---- .../QuadraticBezierSegment_MarkupExtensions.g.cs | 4 ---- .../RadialGradientBrush_MarkupExtensions.g.cs | 4 ---- .../RadioButton_MarkupExtensions.g.cs | 4 ---- .../RangeBase_MarkupExtensions.g.cs | 4 ---- .../RectangleGeometry_MarkupExtensions.g.cs | 4 ---- .../Rectangle_MarkupExtensions.g.cs | 4 ---- .../RefreshContainer_MarkupExtensions.g.cs | 4 ---- .../RefreshVisualizer_MarkupExtensions.g.cs | 4 ---- .../RelativePanel_MarkupExtensions.g.cs | 4 ---- .../RepeatButton_MarkupExtensions.g.cs | 4 ---- .../ReversibleStackPanel_MarkupExtensions.g.cs | 4 ---- .../Rotate3DTransform_MarkupExtensions.g.cs | 4 ---- .../RotateTransform_MarkupExtensions.g.cs | 4 ---- .../RowDefinition_MarkupExtensions.g.cs | 4 ---- .../Run_MarkupExtensions.g.cs | 4 ---- .../ScaleTransform_MarkupExtensions.g.cs | 4 ---- .../ScrollBar_MarkupExtensions.g.cs | 4 ---- .../ScrollContentPresenter_MarkupExtensions.g.cs | 4 ---- .../ScrollGestureRecognizer_MarkupExtensions.g.cs | 4 ---- .../ScrollViewer_MarkupExtensions.g.cs | 4 ---- .../Sector_MarkupExtensions.g.cs | 4 ---- .../SelectableTextBlock_MarkupExtensions.g.cs | 4 ---- .../SelectingItemsControl_MarkupExtensions.g.cs | 4 ---- .../Shape_MarkupExtensions.g.cs | 4 ---- .../SkewTransform_MarkupExtensions.g.cs | 4 ---- .../Slider_MarkupExtensions.g.cs | 4 ---- .../SolidColorBrush_MarkupExtensions.g.cs | 4 ---- .../Span_MarkupExtensions.g.cs | 4 ---- .../Spinner_MarkupExtensions.g.cs | 4 ---- .../SplitButton_MarkupExtensions.g.cs | 4 ---- .../SplitView_MarkupExtensions.g.cs | 4 ---- .../StackPanel_MarkupExtensions.g.cs | 4 ---- .../StyleBase_MarkupExtensions.g.cs | 4 ---- .../StyledElement_MarkupExtensions.g.cs | 4 ---- .../Styles_MarkupExtensions.g.cs | 4 ---- .../TabControl_MarkupExtensions.g.cs | 4 ---- .../TabItem_MarkupExtensions.g.cs | 4 ---- .../TemplatedControl_MarkupExtensions.g.cs | 4 ---- .../TextBlock_MarkupExtensions.g.cs | 4 ---- .../TextBox_MarkupExtensions.g.cs | 4 ---- .../TextDecoration_MarkupExtensions.g.cs | 4 ---- .../TextElement_MarkupExtensions.g.cs | 4 ---- .../TextPresenter_MarkupExtensions.g.cs | 4 ---- .../ThemeVariantScope_MarkupExtensions.g.cs | 4 ---- .../Thumb_MarkupExtensions.g.cs | 4 ---- .../TickBar_MarkupExtensions.g.cs | 4 ---- .../TileBrush_MarkupExtensions.g.cs | 4 ---- .../TimePickerPresenter_MarkupExtensions.g.cs | 4 ---- .../TimePicker_MarkupExtensions.g.cs | 4 ---- .../ToggleButton_MarkupExtensions.g.cs | 4 ---- .../ToggleSplitButton_MarkupExtensions.g.cs | 4 ---- .../ToggleSwitch_MarkupExtensions.g.cs | 4 ---- .../ToolTip_MarkupExtensions.g.cs | 4 ---- .../TopLevel_MarkupExtensions.g.cs | 4 ---- .../Track_MarkupExtensions.g.cs | 4 ---- .../TransformGroup_MarkupExtensions.g.cs | 4 ---- .../Transform_MarkupExtensions.g.cs | 4 ---- .../TransitionBase_MarkupExtensions.g.cs | 4 ---- ...TransitioningContentControl_MarkupExtensions.g.cs | 4 ---- .../TranslateTransform_MarkupExtensions.g.cs | 4 ---- .../TrayIcon_MarkupExtensions.g.cs | 4 ---- .../TreeViewItem_MarkupExtensions.g.cs | 4 ---- .../TreeView_MarkupExtensions.g.cs | 4 ---- .../UniformGrid_MarkupExtensions.g.cs | 4 ---- .../Viewbox_MarkupExtensions.g.cs | 4 ---- .../VirtualizingStackPanel_MarkupExtensions.g.cs | 4 ---- .../VisualBrush_MarkupExtensions.g.cs | 4 ---- .../Visual_MarkupExtensions.g.cs | 4 ---- .../WindowBase_MarkupExtensions.g.cs | 4 ---- .../WindowNotificationManager_MarkupExtensions.g.cs | 4 ---- .../Window_MarkupExtensions.g.cs | 4 ---- .../WrapPanel_MarkupExtensions.g.cs | 4 ---- .../ControlPropertyExtensions.cs | 6 +----- 179 files changed, 8 insertions(+), 716 deletions(-) diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AdornerLayer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AdornerLayer_MarkupExtensions.g.cs index f5d48db..fcda174 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AdornerLayer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AdornerLayer_MarkupExtensions.g.cs @@ -7,7 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.1.3.0")] +[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class AdornerLayer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Application_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Application_MarkupExtensions.g.cs index dcb51f0..806ad3c 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Application_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Application_MarkupExtensions.g.cs @@ -86,22 +86,22 @@ public static T Name(this T control, TValue value, FuncValueConverter< // ResourcesChanged /*ActionToEventGenerator*/ - public static T OnResourcesChanged(this T control, Action action) where T : Avalonia.Application => - control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.ResourcesChanged += h); +public static T OnResourcesChanged(this T control, Action action) where T : Avalonia.Application => + control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.ResourcesChanged += h); // UrlsOpened /*ActionToEventGenerator*/ - public static T OnUrlsOpened(this T control, Action action) where T : Avalonia.Application => - control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.UrlsOpened += h); +public static T OnUrlsOpened(this T control, Action action) where T : Avalonia.Application => + control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.UrlsOpened += h); // ActualThemeVariantChanged /*ActionToEventGenerator*/ - public static T OnActualThemeVariantChanged(this T control, Action action) where T : Avalonia.Application => - control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.ActualThemeVariantChanged += h); +public static T OnActualThemeVariantChanged(this T control, Action action) where T : Avalonia.Application => + control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.ActualThemeVariantChanged += h); diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AutoCompleteBox_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AutoCompleteBox_MarkupExtensions.g.cs index b590d25..602c000 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AutoCompleteBox_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AutoCompleteBox_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class AutoCompleteBox_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AvaloniaObject_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AvaloniaObject_MarkupExtensions.g.cs index 8c6be98..a3c539d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AvaloniaObject_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/AvaloniaObject_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class AvaloniaObject_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BezierSegment_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BezierSegment_MarkupExtensions.g.cs index 4f1d2ba..7261c10 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BezierSegment_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BezierSegment_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class BezierSegment_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BlurEffect_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BlurEffect_MarkupExtensions.g.cs index c56a861..a5f7c70 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BlurEffect_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/BlurEffect_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class BlurEffect_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Border_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Border_MarkupExtensions.g.cs index 1bd173a..853394b 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Border_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Border_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Border_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Brush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Brush_MarkupExtensions.g.cs index 8c69830..feabd76 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Brush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Brush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Brush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ButtonSpinner_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ButtonSpinner_MarkupExtensions.g.cs index 77f0d86..79dd108 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ButtonSpinner_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ButtonSpinner_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ButtonSpinner_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Button_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Button_MarkupExtensions.g.cs index 53b7a5c..002d3d9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Button_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Button_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Button_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarButton_MarkupExtensions.g.cs index 2511ff1..c8aec95 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class CalendarButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDatePicker_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDatePicker_MarkupExtensions.g.cs index 42c3777..9027d89 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDatePicker_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDatePicker_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class CalendarDatePicker_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDayButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDayButton_MarkupExtensions.g.cs index f8885bf..4b88eaf 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDayButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarDayButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class CalendarDayButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarItem_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarItem_MarkupExtensions.g.cs index b3a4804..f40db1e 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarItem_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CalendarItem_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class CalendarItem_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Calendar_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Calendar_MarkupExtensions.g.cs index 26ec5bb..b016813 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Calendar_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Calendar_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Calendar_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Canvas_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Canvas_MarkupExtensions.g.cs index e89d7bf..1dbf299 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Canvas_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Canvas_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Canvas_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Carousel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Carousel_MarkupExtensions.g.cs index 13e49cf..84f8fac 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Carousel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Carousel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Carousel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ColumnDefinition_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ColumnDefinition_MarkupExtensions.g.cs index 33db870..c16ce84 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ColumnDefinition_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ColumnDefinition_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ColumnDefinition_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CombinedGeometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CombinedGeometry_MarkupExtensions.g.cs index a167c28..630b125 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CombinedGeometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CombinedGeometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class CombinedGeometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ComboBox_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ComboBox_MarkupExtensions.g.cs index a2afed7..119298d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ComboBox_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ComboBox_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ComboBox_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ConicGradientBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ConicGradientBrush_MarkupExtensions.g.cs index 7559a4d..499590f 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ConicGradientBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ConicGradientBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ConicGradientBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentControl_MarkupExtensions.g.cs index f4d1e5b..e7fd4d8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ContentControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentPresenter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentPresenter_MarkupExtensions.g.cs index c8c6cee..4222fed 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentPresenter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContentPresenter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ContentPresenter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContextMenu_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContextMenu_MarkupExtensions.g.cs index 998dc91..bf02ff6 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContextMenu_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ContextMenu_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ContextMenu_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Control_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Control_MarkupExtensions.g.cs index 4436d8a..a4e23d8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Control_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Control_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Control_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CroppedBitmap_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CroppedBitmap_MarkupExtensions.g.cs index 80bac67..a6758f6 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CroppedBitmap_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/CroppedBitmap_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class CroppedBitmap_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DashStyle_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DashStyle_MarkupExtensions.g.cs index 6c54b0b..d888719 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DashStyle_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DashStyle_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DashStyle_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DataValidationErrors_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DataValidationErrors_MarkupExtensions.g.cs index 5b91c38..ee93398 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DataValidationErrors_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DataValidationErrors_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DataValidationErrors_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePickerPresenter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePickerPresenter_MarkupExtensions.g.cs index 119f9e5..ebf86b9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePickerPresenter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePickerPresenter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DatePickerPresenter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePicker_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePicker_MarkupExtensions.g.cs index 3571bed..156a4e2 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePicker_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DatePicker_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DatePicker_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DateTimePickerPanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DateTimePickerPanel_MarkupExtensions.g.cs index 3a216e9..d23a110 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DateTimePickerPanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DateTimePickerPanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DateTimePickerPanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Decorator_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Decorator_MarkupExtensions.g.cs index bc26706..42a9936 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Decorator_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Decorator_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Decorator_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DefinitionBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DefinitionBase_MarkupExtensions.g.cs index 633973b..df55599 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DefinitionBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DefinitionBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DefinitionBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DockPanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DockPanel_MarkupExtensions.g.cs index 71287de..6a902c7 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DockPanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DockPanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DockPanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingBrush_MarkupExtensions.g.cs index a2924f2..ed87a57 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DrawingBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingGroup_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingGroup_MarkupExtensions.g.cs index 48e58a1..a16ea08 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingGroup_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingGroup_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DrawingGroup_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingImage_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingImage_MarkupExtensions.g.cs index e8f80d3..04d50be 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingImage_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DrawingImage_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DrawingImage_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowDirectionEffect_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowDirectionEffect_MarkupExtensions.g.cs index 1904865..8263029 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowDirectionEffect_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowDirectionEffect_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DropShadowDirectionEffect_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffectBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffectBase_MarkupExtensions.g.cs index 4bb74e8..8a07f6e 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffectBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffectBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DropShadowEffectBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffect_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffect_MarkupExtensions.g.cs index 408fe56..bfa4b11 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffect_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/DropShadowEffect_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class DropShadowEffect_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Effect_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Effect_MarkupExtensions.g.cs index dc6353a..9be6ffb 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Effect_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Effect_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Effect_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/EllipseGeometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/EllipseGeometry_MarkupExtensions.g.cs index f431cde..563cd25 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/EllipseGeometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/EllipseGeometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class EllipseGeometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Expander_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Expander_MarkupExtensions.g.cs index 3f7d991..e779da8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Expander_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Expander_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Expander_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicBorder_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicBorder_MarkupExtensions.g.cs index 51660aa..f9ff6a7 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicBorder_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicBorder_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ExperimentalAcrylicBorder_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicMaterial_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicMaterial_MarkupExtensions.g.cs index 128a5a2..8b448ed 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicMaterial_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ExperimentalAcrylicMaterial_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ExperimentalAcrylicMaterial_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/FlyoutBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/FlyoutBase_MarkupExtensions.g.cs index f1042bf..dbb5f0c 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/FlyoutBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/FlyoutBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class FlyoutBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Flyout_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Flyout_MarkupExtensions.g.cs index bdb6ada..1270fac 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Flyout_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Flyout_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Flyout_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryDrawing_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryDrawing_MarkupExtensions.g.cs index 6ffd7d4..10da5c9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryDrawing_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryDrawing_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class GeometryDrawing_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryGroup_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryGroup_MarkupExtensions.g.cs index 9b06b51..105e208 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryGroup_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GeometryGroup_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class GeometryGroup_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Geometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Geometry_MarkupExtensions.g.cs index 63a3a5b..c8110cd 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Geometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Geometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Geometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GlyphRunDrawing_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GlyphRunDrawing_MarkupExtensions.g.cs index a817a8a..b46594c 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GlyphRunDrawing_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GlyphRunDrawing_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class GlyphRunDrawing_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientBrush_MarkupExtensions.g.cs index f3d8e9a..1e2de36 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class GradientBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientStop_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientStop_MarkupExtensions.g.cs index fcca2a5..ad3fe2b 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientStop_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GradientStop_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class GradientStop_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GridSplitter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GridSplitter_MarkupExtensions.g.cs index adae483..db6dad0 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GridSplitter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/GridSplitter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class GridSplitter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Grid_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Grid_MarkupExtensions.g.cs index e6efe12..b71e60a 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Grid_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Grid_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Grid_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedContentControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedContentControl_MarkupExtensions.g.cs index 276b406..74036ea 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedContentControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedContentControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class HeaderedContentControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedItemsControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedItemsControl_MarkupExtensions.g.cs index 36bfe26..61856e3 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedItemsControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedItemsControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class HeaderedItemsControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedSelectingItemsControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedSelectingItemsControl_MarkupExtensions.g.cs index 24aee0f..6687226 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedSelectingItemsControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HeaderedSelectingItemsControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class HeaderedSelectingItemsControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HyperlinkButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HyperlinkButton_MarkupExtensions.g.cs index f4efaa4..fd6ca3a 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HyperlinkButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/HyperlinkButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class HyperlinkButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageBrush_MarkupExtensions.g.cs index ddb2b4c..e534481 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ImageBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageDrawing_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageDrawing_MarkupExtensions.g.cs index f1cdec0..2b21524 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageDrawing_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ImageDrawing_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ImageDrawing_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Image_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Image_MarkupExtensions.g.cs index c9cf52b..84c99ab 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Image_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Image_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Image_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InlineUIContainer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InlineUIContainer_MarkupExtensions.g.cs index fd03bf3..31ed8e9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InlineUIContainer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InlineUIContainer_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class InlineUIContainer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Inline_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Inline_MarkupExtensions.g.cs index acb43ac..ab07dde 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Inline_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Inline_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Inline_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InputElement_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InputElement_MarkupExtensions.g.cs index a6a1cda..eb8b386 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InputElement_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/InputElement_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class InputElement_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsControl_MarkupExtensions.g.cs index 221aa79..331c397 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ItemsControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsPresenter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsPresenter_MarkupExtensions.g.cs index 5a1a516..d2af7ad 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsPresenter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ItemsPresenter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ItemsPresenter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/KeyBinding_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/KeyBinding_MarkupExtensions.g.cs index 0ba0891..328b6ae 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/KeyBinding_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/KeyBinding_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class KeyBinding_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Label_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Label_MarkupExtensions.g.cs index 5e89a10..b6ec1b3 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Label_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Label_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Label_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LayoutTransformControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LayoutTransformControl_MarkupExtensions.g.cs index 0e68117..e1522f9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LayoutTransformControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LayoutTransformControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class LayoutTransformControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Layoutable_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Layoutable_MarkupExtensions.g.cs index 7d38c7d..51c4728 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Layoutable_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Layoutable_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Layoutable_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineGeometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineGeometry_MarkupExtensions.g.cs index 6a37047..11745d8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineGeometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineGeometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class LineGeometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineSegment_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineSegment_MarkupExtensions.g.cs index 7801963..b776b74 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineSegment_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LineSegment_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class LineSegment_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Line_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Line_MarkupExtensions.g.cs index b6a1e91..bb87b10 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Line_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Line_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Line_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LinearGradientBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LinearGradientBrush_MarkupExtensions.g.cs index af5145b..505c2ac 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LinearGradientBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/LinearGradientBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class LinearGradientBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBoxItem_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBoxItem_MarkupExtensions.g.cs index c674f5e..6f8274a 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBoxItem_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBoxItem_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ListBoxItem_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBox_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBox_MarkupExtensions.g.cs index 6185ac4..7573369 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBox_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ListBox_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ListBox_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ManagedFileChooserOverwritePrompt_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ManagedFileChooserOverwritePrompt_MarkupExtensions.g.cs index df63a3e..bdd9af4 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ManagedFileChooserOverwritePrompt_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ManagedFileChooserOverwritePrompt_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ManagedFileChooserOverwritePrompt_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MaskedTextBox_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MaskedTextBox_MarkupExtensions.g.cs index 11defcc..cdededa 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MaskedTextBox_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MaskedTextBox_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class MaskedTextBox_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MatrixTransform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MatrixTransform_MarkupExtensions.g.cs index d93dbc0..3782a5d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MatrixTransform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MatrixTransform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class MatrixTransform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuBase_MarkupExtensions.g.cs index 57ebd66..efede16 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class MenuBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuFlyout_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuFlyout_MarkupExtensions.g.cs index 01b3a1d..a4e1561 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuFlyout_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuFlyout_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class MenuFlyout_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuItem_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuItem_MarkupExtensions.g.cs index 6d5f076..cadaff5 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuItem_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/MenuItem_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class MenuItem_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuBar_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuBar_MarkupExtensions.g.cs index eb68691..fcdce22 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuBar_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuBar_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class NativeMenuBar_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuItem_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuItem_MarkupExtensions.g.cs index 38c9d06..44bcb55 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuItem_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenuItem_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class NativeMenuItem_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenu_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenu_MarkupExtensions.g.cs index 3c6385e..5436ca8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenu_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NativeMenu_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class NativeMenu_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NotificationCard_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NotificationCard_MarkupExtensions.g.cs index 5174674..11b9694 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NotificationCard_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NotificationCard_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class NotificationCard_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NumericUpDown_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NumericUpDown_MarkupExtensions.g.cs index 08eca0e..3513563 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NumericUpDown_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/NumericUpDown_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class NumericUpDown_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/OverlayPopupHost_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/OverlayPopupHost_MarkupExtensions.g.cs index ebf4184..a6f8352 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/OverlayPopupHost_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/OverlayPopupHost_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class OverlayPopupHost_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Panel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Panel_MarkupExtensions.g.cs index fea086e..beb4595 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Panel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Panel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Panel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathFigure_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathFigure_MarkupExtensions.g.cs index 5af1351..850ed02 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathFigure_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathFigure_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PathFigure_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathGeometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathGeometry_MarkupExtensions.g.cs index 728ffa4..760ce84 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathGeometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathGeometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PathGeometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathIcon_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathIcon_MarkupExtensions.g.cs index c088033..18266ca 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathIcon_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathIcon_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PathIcon_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathSegment_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathSegment_MarkupExtensions.g.cs index faa564f..c52cf6a 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathSegment_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PathSegment_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PathSegment_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Path_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Path_MarkupExtensions.g.cs index bc6b70c..aaff9cb 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Path_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Path_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Path_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Pen_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Pen_MarkupExtensions.g.cs index 5cb5c77..9eb9e85 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Pen_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Pen_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Pen_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PickerPresenterBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PickerPresenterBase_MarkupExtensions.g.cs index bf6f638..f698523 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PickerPresenterBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PickerPresenterBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PickerPresenterBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolyLineSegment_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolyLineSegment_MarkupExtensions.g.cs index 365f268..5432c98 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolyLineSegment_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolyLineSegment_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PolyLineSegment_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polygon_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polygon_MarkupExtensions.g.cs index b0a7247..5ef075d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polygon_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polygon_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Polygon_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolylineGeometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolylineGeometry_MarkupExtensions.g.cs index 9d357cc..d441cf6 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolylineGeometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PolylineGeometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PolylineGeometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polyline_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polyline_MarkupExtensions.g.cs index 660af60..548b73b 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polyline_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Polyline_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Polyline_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupFlyoutBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupFlyoutBase_MarkupExtensions.g.cs index 8a3bd77..3c5701d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupFlyoutBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupFlyoutBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PopupFlyoutBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupRoot_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupRoot_MarkupExtensions.g.cs index 65c9334..033b31d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupRoot_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PopupRoot_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PopupRoot_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Popup_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Popup_MarkupExtensions.g.cs index 6f728c7..64c6850 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Popup_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Popup_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Popup_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ProgressBar_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ProgressBar_MarkupExtensions.g.cs index 3517ee5..bf58608 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ProgressBar_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ProgressBar_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ProgressBar_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PullGestureRecognizer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PullGestureRecognizer_MarkupExtensions.g.cs index 26ffeef..edbdcfa 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PullGestureRecognizer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/PullGestureRecognizer_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class PullGestureRecognizer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/QuadraticBezierSegment_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/QuadraticBezierSegment_MarkupExtensions.g.cs index 4908bd7..e8d0fb4 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/QuadraticBezierSegment_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/QuadraticBezierSegment_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class QuadraticBezierSegment_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadialGradientBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadialGradientBrush_MarkupExtensions.g.cs index 3dc8a74..019d816 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadialGradientBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadialGradientBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RadialGradientBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadioButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadioButton_MarkupExtensions.g.cs index ceebea1..c89f292 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadioButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RadioButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RadioButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RangeBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RangeBase_MarkupExtensions.g.cs index a8d0b05..138d934 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RangeBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RangeBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RangeBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RectangleGeometry_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RectangleGeometry_MarkupExtensions.g.cs index a11e212..9225ecb 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RectangleGeometry_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RectangleGeometry_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RectangleGeometry_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rectangle_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rectangle_MarkupExtensions.g.cs index 846a51e..1c2cd18 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rectangle_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rectangle_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Rectangle_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshContainer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshContainer_MarkupExtensions.g.cs index 84cea07..4d4e080 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshContainer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshContainer_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RefreshContainer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshVisualizer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshVisualizer_MarkupExtensions.g.cs index 20e9dd3..33132db 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshVisualizer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RefreshVisualizer_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RefreshVisualizer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RelativePanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RelativePanel_MarkupExtensions.g.cs index eb820a4..32cce48 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RelativePanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RelativePanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RelativePanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RepeatButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RepeatButton_MarkupExtensions.g.cs index b25f4fd..a6b1175 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RepeatButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RepeatButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RepeatButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ReversibleStackPanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ReversibleStackPanel_MarkupExtensions.g.cs index 3d034d6..aac054b 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ReversibleStackPanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ReversibleStackPanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ReversibleStackPanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rotate3DTransform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rotate3DTransform_MarkupExtensions.g.cs index 1b3a5b9..f40fa50 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rotate3DTransform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Rotate3DTransform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Rotate3DTransform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RotateTransform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RotateTransform_MarkupExtensions.g.cs index 4c26949..72c2838 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RotateTransform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RotateTransform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RotateTransform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RowDefinition_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RowDefinition_MarkupExtensions.g.cs index 84c1889..16b5f2a 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RowDefinition_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/RowDefinition_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class RowDefinition_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Run_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Run_MarkupExtensions.g.cs index e2db886..be34d86 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Run_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Run_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Run_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScaleTransform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScaleTransform_MarkupExtensions.g.cs index 1473fee..372efe6 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScaleTransform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScaleTransform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ScaleTransform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollBar_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollBar_MarkupExtensions.g.cs index 6a5bb2f..519bd42 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollBar_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollBar_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ScrollBar_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollContentPresenter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollContentPresenter_MarkupExtensions.g.cs index f1f50c5..dd76aeb 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollContentPresenter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollContentPresenter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ScrollContentPresenter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollGestureRecognizer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollGestureRecognizer_MarkupExtensions.g.cs index 7ecc49f..22ab151 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollGestureRecognizer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollGestureRecognizer_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ScrollGestureRecognizer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollViewer_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollViewer_MarkupExtensions.g.cs index b18bc28..64f925b 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollViewer_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ScrollViewer_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ScrollViewer_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Sector_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Sector_MarkupExtensions.g.cs index 1c9141b..b486240 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Sector_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Sector_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Sector_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectableTextBlock_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectableTextBlock_MarkupExtensions.g.cs index daacc41..d0fa669 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectableTextBlock_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectableTextBlock_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class SelectableTextBlock_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectingItemsControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectingItemsControl_MarkupExtensions.g.cs index 3c071a7..98edabb 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectingItemsControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SelectingItemsControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class SelectingItemsControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Shape_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Shape_MarkupExtensions.g.cs index e6fa9f1..ea8522f 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Shape_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Shape_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Shape_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SkewTransform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SkewTransform_MarkupExtensions.g.cs index 9760190..25ddaae 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SkewTransform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SkewTransform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class SkewTransform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Slider_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Slider_MarkupExtensions.g.cs index 35f3316..0953e97 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Slider_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Slider_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Slider_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SolidColorBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SolidColorBrush_MarkupExtensions.g.cs index 5017804..167a3a6 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SolidColorBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SolidColorBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class SolidColorBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Span_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Span_MarkupExtensions.g.cs index adc06fa..b80ddfd 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Span_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Span_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Span_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Spinner_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Spinner_MarkupExtensions.g.cs index 5e53e98..c8a7aa4 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Spinner_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Spinner_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Spinner_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitButton_MarkupExtensions.g.cs index f98d236..e35f2a8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class SplitButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitView_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitView_MarkupExtensions.g.cs index 129fd2e..a448361 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitView_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/SplitView_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class SplitView_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StackPanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StackPanel_MarkupExtensions.g.cs index 78aeb9e..22a7731 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StackPanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StackPanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class StackPanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyleBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyleBase_MarkupExtensions.g.cs index 3afa80a..d5db582 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyleBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyleBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class StyleBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyledElement_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyledElement_MarkupExtensions.g.cs index 345f34a..94ef488 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyledElement_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/StyledElement_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class StyledElement_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Styles_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Styles_MarkupExtensions.g.cs index b7ba9fd..f41cc0d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Styles_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Styles_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Styles_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabControl_MarkupExtensions.g.cs index 168ab79..d5ff8b8 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TabControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabItem_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabItem_MarkupExtensions.g.cs index 96c47d2..cbfa19e 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabItem_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TabItem_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TabItem_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TemplatedControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TemplatedControl_MarkupExtensions.g.cs index fa9ca55..0a95f14 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TemplatedControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TemplatedControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TemplatedControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBlock_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBlock_MarkupExtensions.g.cs index 02b4df3..1958764 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBlock_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBlock_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TextBlock_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBox_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBox_MarkupExtensions.g.cs index 847640c..61e1885 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBox_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextBox_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TextBox_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextDecoration_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextDecoration_MarkupExtensions.g.cs index faa71b0..727ecb0 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextDecoration_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextDecoration_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TextDecoration_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextElement_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextElement_MarkupExtensions.g.cs index e8296d4..071f75f 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextElement_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextElement_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TextElement_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextPresenter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextPresenter_MarkupExtensions.g.cs index c9aed80..223bde1 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextPresenter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TextPresenter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TextPresenter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ThemeVariantScope_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ThemeVariantScope_MarkupExtensions.g.cs index 6d005e2..29eda2d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ThemeVariantScope_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ThemeVariantScope_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ThemeVariantScope_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Thumb_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Thumb_MarkupExtensions.g.cs index a00c0c3..a2e4b47 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Thumb_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Thumb_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Thumb_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TickBar_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TickBar_MarkupExtensions.g.cs index a5a014b..ff2ca64 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TickBar_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TickBar_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TickBar_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TileBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TileBrush_MarkupExtensions.g.cs index e012c99..d6fea19 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TileBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TileBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TileBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePickerPresenter_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePickerPresenter_MarkupExtensions.g.cs index 226b830..94d3eee 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePickerPresenter_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePickerPresenter_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TimePickerPresenter_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePicker_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePicker_MarkupExtensions.g.cs index c8e447b..1d09db9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePicker_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TimePicker_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TimePicker_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleButton_MarkupExtensions.g.cs index b073004..0c2f510 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ToggleButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSplitButton_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSplitButton_MarkupExtensions.g.cs index 9347a2f..057775e 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSplitButton_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSplitButton_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ToggleSplitButton_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSwitch_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSwitch_MarkupExtensions.g.cs index 92a9544..7c8e56e 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSwitch_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToggleSwitch_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ToggleSwitch_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToolTip_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToolTip_MarkupExtensions.g.cs index 3359c2e..74a17ef 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToolTip_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/ToolTip_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class ToolTip_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TopLevel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TopLevel_MarkupExtensions.g.cs index dd9decf..1faf16e 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TopLevel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TopLevel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TopLevel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Track_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Track_MarkupExtensions.g.cs index 520d33b..764d108 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Track_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Track_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Track_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransformGroup_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransformGroup_MarkupExtensions.g.cs index 09ac313..9d0a7b6 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransformGroup_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransformGroup_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TransformGroup_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Transform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Transform_MarkupExtensions.g.cs index 95e36b4..3fefe8f 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Transform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Transform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Transform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitionBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitionBase_MarkupExtensions.g.cs index c6edfc6..a1e8bff 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitionBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitionBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TransitionBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitioningContentControl_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitioningContentControl_MarkupExtensions.g.cs index bb6e0a5..45825bd 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitioningContentControl_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TransitioningContentControl_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TransitioningContentControl_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TranslateTransform_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TranslateTransform_MarkupExtensions.g.cs index a0e5857..49b8257 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TranslateTransform_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TranslateTransform_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TranslateTransform_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TrayIcon_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TrayIcon_MarkupExtensions.g.cs index f61974f..9be1434 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TrayIcon_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TrayIcon_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TrayIcon_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeViewItem_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeViewItem_MarkupExtensions.g.cs index ccdb7c6..51a050c 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeViewItem_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeViewItem_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TreeViewItem_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeView_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeView_MarkupExtensions.g.cs index 013f60b..65c9815 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeView_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/TreeView_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class TreeView_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/UniformGrid_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/UniformGrid_MarkupExtensions.g.cs index cbfa501..75a0e1d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/UniformGrid_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/UniformGrid_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class UniformGrid_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Viewbox_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Viewbox_MarkupExtensions.g.cs index cf5b92d..1a80f2d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Viewbox_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Viewbox_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Viewbox_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VirtualizingStackPanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VirtualizingStackPanel_MarkupExtensions.g.cs index 7d34c1a..75b18db 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VirtualizingStackPanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VirtualizingStackPanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class VirtualizingStackPanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VisualBrush_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VisualBrush_MarkupExtensions.g.cs index e4f8f86..eb059b9 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VisualBrush_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/VisualBrush_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class VisualBrush_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Visual_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Visual_MarkupExtensions.g.cs index 96343ba..08f0c05 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Visual_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Visual_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Visual_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowBase_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowBase_MarkupExtensions.g.cs index b3b4955..41e5a67 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowBase_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowBase_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class WindowBase_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowNotificationManager_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowNotificationManager_MarkupExtensions.g.cs index 23c2a8a..4836633 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowNotificationManager_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WindowNotificationManager_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class WindowNotificationManager_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Window_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Window_MarkupExtensions.g.cs index fc6594d..c1b911d 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Window_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/Window_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class Window_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WrapPanel_MarkupExtensions.g.cs b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WrapPanel_MarkupExtensions.g.cs index d246543..7dfd976 100644 --- a/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WrapPanel_MarkupExtensions.g.cs +++ b/src/Avalonia.Markup.Declarative/ControlExtensions.Generated/WrapPanel_MarkupExtensions.g.cs @@ -7,11 +7,7 @@ using System.Runtime.CompilerServices; namespace Avalonia.Markup.Declarative; -<<<<<<< HEAD [global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "1.0.0.0")] -======= -[global::System.CodeDom.Compiler.GeneratedCode("AvaloniaExtensionGenerator", "11.2.999.0")] ->>>>>>> c1347bc81bdb20ad44b1fda7d31eecec56065f2f [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] public static partial class WrapPanel_MarkupExtensions { diff --git a/src/Avalonia.Markup.Declarative/ControlPropertyExtensions.cs b/src/Avalonia.Markup.Declarative/ControlPropertyExtensions.cs index 11b3206..e22f013 100644 --- a/src/Avalonia.Markup.Declarative/ControlPropertyExtensions.cs +++ b/src/Avalonia.Markup.Declarative/ControlPropertyExtensions.cs @@ -370,11 +370,7 @@ public static TElement VerticalScrollBarVisibility(this TElement contr ScrollViewer.SetVerticalScrollBarVisibility(control, value); return control; } - public static T OnKeyDown(this T control, Action action, RoutingStrategies routes = RoutingStrategies.Tunnel | RoutingStrategies.Bubble) where T : InputElement - { - control.AddHandler(InputElement.KeyDownEvent, (_, args) => action(args), routes); - return control; - } + public static TPanel Children(this TPanel container, params Control[] children) where TPanel : Panel {