Fixed generated extension versions

AvaloniaUI · Oct 3, 2024 · b6ce041 · b6ce041
1 parent 5dc3429
commit b6ce041
Show file tree

Hide file tree

Showing 179 changed files with 8 additions and 716 deletions.
diff --git a/...valonia.Markup.Declarative/ControlExtensions.Generated/AdornerLayer_MarkupExtensions.g.cs b/...valonia.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/...Avalonia.Markup.Declarative/ControlExtensions.Generated/Application_MarkupExtensions.g.cs b/...Avalonia.Markup.Declarative/ControlExtensions.Generated/Application_MarkupExtensions.g.cs
@@ -86,22 +86,22 @@ public static T Name<TValue,T>(this T control, TValue value, FuncValueConverter<
  // ResourcesChanged
 
 /*ActionToEventGenerator*/
-    public static T OnResourcesChanged<T>(this T control, Action<Avalonia.Controls.ResourcesChangedEventArgs> action) where T : Avalonia.Application => 
-        control._setEvent((System.EventHandler<Avalonia.Controls.ResourcesChangedEventArgs>) ((arg0, arg1) => action(arg1)), h => control.ResourcesChanged += h);
+public static T OnResourcesChanged<T>(this T control, Action<Avalonia.Controls.ResourcesChangedEventArgs> action) where T : Avalonia.Application  => 
+ control._setEvent((System.EventHandler<Avalonia.Controls.ResourcesChangedEventArgs>) ((arg0, arg1) => action(arg1)), h => control.ResourcesChanged += h);
 
 
  // UrlsOpened
 
 /*ActionToEventGenerator*/
-    public static T OnUrlsOpened<T>(this T control, Action<Avalonia.UrlOpenedEventArgs> action) where T : Avalonia.Application => 
-        control._setEvent((System.EventHandler<Avalonia.UrlOpenedEventArgs>) ((arg0, arg1) => action(arg1)), h => control.UrlsOpened += h);
+public static T OnUrlsOpened<T>(this T control, Action<Avalonia.UrlOpenedEventArgs> action) where T : Avalonia.Application  => 
+ control._setEvent((System.EventHandler<Avalonia.UrlOpenedEventArgs>) ((arg0, arg1) => action(arg1)), h => control.UrlsOpened += h);
 
 
  // ActualThemeVariantChanged
 
 /*ActionToEventGenerator*/
-    public static T OnActualThemeVariantChanged<T>(this T control, Action<System.EventArgs> action) where T : Avalonia.Application => 
-        control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.ActualThemeVariantChanged += h);
+public static T OnActualThemeVariantChanged<T>(this T control, Action<System.EventArgs> action) where T : Avalonia.Application  => 
+ control._setEvent((System.EventHandler) ((arg0, arg1) => action(arg1)), h => control.ActualThemeVariantChanged += h);
 
 
 

diff --git a/...onia.Markup.Declarative/ControlExtensions.Generated/AutoCompleteBox_MarkupExtensions.g.cs b/...onia.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/...lonia.Markup.Declarative/ControlExtensions.Generated/AvaloniaObject_MarkupExtensions.g.cs b/...lonia.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/...alonia.Markup.Declarative/ControlExtensions.Generated/BezierSegment_MarkupExtensions.g.cs b/...alonia.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
@@ -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
@@ -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
@@ -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/...alonia.Markup.Declarative/ControlExtensions.Generated/ButtonSpinner_MarkupExtensions.g.cs b/...alonia.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
@@ -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/...lonia.Markup.Declarative/ControlExtensions.Generated/CalendarButton_MarkupExtensions.g.cs b/...lonia.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/...a.Markup.Declarative/ControlExtensions.Generated/CalendarDatePicker_MarkupExtensions.g.cs b/...a.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/...ia.Markup.Declarative/ControlExtensions.Generated/CalendarDayButton_MarkupExtensions.g.cs b/...ia.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/...valonia.Markup.Declarative/ControlExtensions.Generated/CalendarItem_MarkupExtensions.g.cs b/...valonia.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
@@ -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
@@ -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
@@ -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/...nia.Markup.Declarative/ControlExtensions.Generated/ColumnDefinition_MarkupExtensions.g.cs b/...nia.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/...nia.Markup.Declarative/ControlExtensions.Generated/CombinedGeometry_MarkupExtensions.g.cs b/...nia.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
@@ -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/...a.Markup.Declarative/ControlExtensions.Generated/ConicGradientBrush_MarkupExtensions.g.cs b/...a.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/...lonia.Markup.Declarative/ControlExtensions.Generated/ContentControl_MarkupExtensions.g.cs b/...lonia.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/...nia.Markup.Declarative/ControlExtensions.Generated/ContentPresenter_MarkupExtensions.g.cs b/...nia.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/...Avalonia.Markup.Declarative/ControlExtensions.Generated/ContextMenu_MarkupExtensions.g.cs b/...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
@@ -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/...alonia.Markup.Declarative/ControlExtensions.Generated/CroppedBitmap_MarkupExtensions.g.cs b/...alonia.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
@@ -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/...Markup.Declarative/ControlExtensions.Generated/DataValidationErrors_MarkupExtensions.g.cs b/...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/....Markup.Declarative/ControlExtensions.Generated/DatePickerPresenter_MarkupExtensions.g.cs b/....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
@@ -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/....Markup.Declarative/ControlExtensions.Generated/DateTimePickerPanel_MarkupExtensions.g.cs b/....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
@@ -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
 {