From 55a45266b2e657667de4a58b7b2baf371b9b9dc6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Thu, 9 Nov 2023 00:14:25 +0100
Subject: [PATCH] Fix merge error.

Removed deleted files from csproj that were re-added due to indentation changes.
---
 .../Avalonia.Markup.Xaml.csproj               | 183 +++++++++---------
 1 file changed, 88 insertions(+), 95 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index bbd18320a0..53cf6bc743 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -8,101 +8,94 @@
     <EnableDefaultItems>false</EnableDefaultItems>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="AvaloniaXamlLoader.cs" />
-        <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
-        <Compile Include="Converters\ColorToBrushConverter.cs" />
-        <Compile Include="Converters\FontFamilyTypeConverter.cs" />
-        <Compile Include="Converters\TimeSpanTypeConverter.cs" />
-        <Compile Include="Extensions.cs" />
-        <Compile Include="MarkupExtension.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
-        <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
-        <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
-        <Compile Include="MarkupExtensions\On.cs" />
-        <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
-        <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
-        <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
-        <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
-        <Compile Include="Parsers\PropertyParser.cs" />
-        <Compile Include="Converters\BitmapTypeConverter.cs" />
-        <Compile Include="Converters\IconTypeConverter.cs" />
-        <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
-        <Compile Include="Converters\PointsListTypeConverter.cs" />
-        <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
-        <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="RuntimeXamlLoaderConfiguration.cs" />
-        <Compile Include="RuntimeXamlLoaderDocument.cs" />
-        <Compile Include="Styling\MergeResourceInclude.cs" />
-        <Compile Include="Styling\ResourceInclude.cs" />
-        <Compile Include="Styling\StyleInclude.cs" />
-        <Compile Include="Templates\ControlTemplate.cs" />
-        <Compile Include="Templates\DataTemplate.cs" />
-        <Compile Include="Templates\FocusAdornerTemplate.cs" />
-        <Compile Include="Templates\ItemsPanelTemplate.cs" />
-        <Compile Include="Templates\Template.cs" />
-        <Compile Include="Templates\TemplateContent.cs" />
-        <Compile Include="Templates\TreeDataTemplate.cs" />
-        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
-        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
-        <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
-        <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
-        <Compile Include="XamlLoadException.cs" />
-        <Compile Include="XamlTypes.cs" />
-      <Compile Include="AvaloniaXamlLoader.cs" />
-      <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
-      <Compile Include="Converters\ColorToBrushConverter.cs" />
-      <Compile Include="Converters\FontFamilyTypeConverter.cs" />
-      <Compile Include="Converters\TimeSpanTypeConverter.cs" />
-      <Compile Include="Extensions.cs" />
-      <Compile Include="MarkupExtension.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\ArrayElementPlugin.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\CommandAccessorPlugin.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\FindVisualAncestorNode.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\MethodAccessorPlugin.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\ObservableStreamPlugin.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorPlugin.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\StrongTypeCastNode.cs" />
-      <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
-      <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
-      <Compile Include="MarkupExtensions\On.cs" />
-      <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
-      <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
-      <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
-      <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
-      <Compile Include="Parsers\PropertyParser.cs" />
-      <Compile Include="Converters\BitmapTypeConverter.cs" />
-      <Compile Include="Converters\IconTypeConverter.cs" />
-      <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
-      <Compile Include="Converters\PointsListTypeConverter.cs" />
-      <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
-      <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
-      <Compile Include="Properties\AssemblyInfo.cs" />
-      <Compile Include="RuntimeXamlLoaderConfiguration.cs" />
-      <Compile Include="RuntimeXamlLoaderDocument.cs" />
-      <Compile Include="Styling\MergeResourceInclude.cs" />
-      <Compile Include="Styling\ResourceInclude.cs" />
-      <Compile Include="Styling\StyleInclude.cs" />
-      <Compile Include="Templates\ControlTemplate.cs" />
-      <Compile Include="Templates\DataTemplate.cs" />
-      <Compile Include="Templates\FocusAdornerTemplate.cs" />
-      <Compile Include="Templates\ItemsPanelTemplate.cs" />
-      <Compile Include="Templates\Template.cs" />
-      <Compile Include="Templates\TemplateContent.cs" />
-      <Compile Include="Templates\TreeDataTemplate.cs" />
-      <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
-      <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
-      <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
-      <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
-      <Compile Include="XamlLoadException.cs" />
-      <Compile Include="XamlTypes.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AvaloniaXamlLoader.cs" />
+    <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
+    <Compile Include="Converters\ColorToBrushConverter.cs" />
+    <Compile Include="Converters\FontFamilyTypeConverter.cs" />
+    <Compile Include="Converters\TimeSpanTypeConverter.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="MarkupExtension.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
+    <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
+    <Compile Include="MarkupExtensions\On.cs" />
+    <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
+    <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
+    <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
+    <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
+    <Compile Include="Parsers\PropertyParser.cs" />
+    <Compile Include="Converters\BitmapTypeConverter.cs" />
+    <Compile Include="Converters\IconTypeConverter.cs" />
+    <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
+    <Compile Include="Converters\PointsListTypeConverter.cs" />
+    <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
+    <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RuntimeXamlLoaderConfiguration.cs" />
+    <Compile Include="RuntimeXamlLoaderDocument.cs" />
+    <Compile Include="Styling\MergeResourceInclude.cs" />
+    <Compile Include="Styling\ResourceInclude.cs" />
+    <Compile Include="Styling\StyleInclude.cs" />
+    <Compile Include="Templates\ControlTemplate.cs" />
+    <Compile Include="Templates\DataTemplate.cs" />
+    <Compile Include="Templates\FocusAdornerTemplate.cs" />
+    <Compile Include="Templates\ItemsPanelTemplate.cs" />
+    <Compile Include="Templates\Template.cs" />
+    <Compile Include="Templates\TemplateContent.cs" />
+    <Compile Include="Templates\TreeDataTemplate.cs" />
+    <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
+    <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
+    <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
+    <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
+    <Compile Include="XamlLoadException.cs" />
+    <Compile Include="XamlTypes.cs" />
+    <Compile Include="AvaloniaXamlLoader.cs" />
+    <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
+    <Compile Include="Converters\ColorToBrushConverter.cs" />
+    <Compile Include="Converters\FontFamilyTypeConverter.cs" />
+    <Compile Include="Converters\TimeSpanTypeConverter.cs" />
+    <Compile Include="Extensions.cs" />
+    <Compile Include="MarkupExtension.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindingExtension.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindings\CompiledBindingPath.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindings\PropertyInfoAccessorFactory.cs" />
+    <Compile Include="MarkupExtensions\CompiledBindings\TaskStreamPlugin.cs" />
+    <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
+    <Compile Include="MarkupExtensions\On.cs" />
+    <Compile Include="MarkupExtensions\OnFormFactorExtension.cs" />
+    <Compile Include="MarkupExtensions\OnPlatformExtension.cs" />
+    <Compile Include="MarkupExtensions\ResolveByNameExtension.cs" />
+    <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
+    <Compile Include="Parsers\PropertyParser.cs" />
+    <Compile Include="Converters\BitmapTypeConverter.cs" />
+    <Compile Include="Converters\IconTypeConverter.cs" />
+    <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
+    <Compile Include="Converters\PointsListTypeConverter.cs" />
+    <Compile Include="MarkupExtensions\ReflectionBindingExtension.cs" />
+    <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RuntimeXamlLoaderConfiguration.cs" />
+    <Compile Include="RuntimeXamlLoaderDocument.cs" />
+    <Compile Include="Styling\MergeResourceInclude.cs" />
+    <Compile Include="Styling\ResourceInclude.cs" />
+    <Compile Include="Styling\StyleInclude.cs" />
+    <Compile Include="Templates\ControlTemplate.cs" />
+    <Compile Include="Templates\DataTemplate.cs" />
+    <Compile Include="Templates\FocusAdornerTemplate.cs" />
+    <Compile Include="Templates\ItemsPanelTemplate.cs" />
+    <Compile Include="Templates\Template.cs" />
+    <Compile Include="Templates\TemplateContent.cs" />
+    <Compile Include="Templates\TreeDataTemplate.cs" />
+    <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlControlTemplateProvider.cs" />
+    <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlParentStackProvider.cs" />
+    <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
+    <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
+    <Compile Include="XamlLoadException.cs" />
+    <Compile Include="XamlTypes.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />