Removed legacy XAML loader

Keroosha · Jun 12, 2019 · 76f9c8f · 76f9c8f
1 parent a8c45cb
commit 76f9c8f
Show file tree

Hide file tree

Showing 46 changed files with 108 additions and 2,415 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github"]
-	path = src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
-	url = https://github.com/AvaloniaUI/Portable.Xaml.git
 [submodule "nukebuild/Numerge"]
 	path = nukebuild/Numerge
 	url = https://github.com/kekekeks/Numerge.git

diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -9,7 +9,6 @@
 using Avalonia.Remote.Protocol.Designer;
 using Avalonia.Remote.Protocol.Viewport;
 using Avalonia.Threading;
-using Portable.Xaml;
 
 namespace Avalonia.DesignerSupport.Remote
 {
@@ -206,7 +205,6 @@ private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transp
                 }
                 catch (Exception e)
                 {
-                    var xamlException = e as XamlException;
                     var xmlException = e as XmlException;
 
                     s_transport.Send(new UpdateXamlResultMessage
@@ -216,8 +214,8 @@ private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transp
                         {
                             ExceptionType = e.GetType().FullName,
                             Message = e.Message.ToString(),
-                            LineNumber = xamlException?.LineNumber ?? xmlException?.LineNumber,
-                            LinePosition = xamlException?.LinePosition ?? xmlException?.LinePosition,
+                            LineNumber = xmlException?.LineNumber,
+                            LinePosition = xmlException?.LinePosition,
                         }
                     });
                 }

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -11,38 +11,21 @@
     <ItemGroup>
         <Compile Include="AvaloniaXamlLoader.cs" />
         <Compile Include="Converters\AvaloniaUriTypeConverter.cs" />
-        <Compile Include="Converters\AvaloniaEventConverter.cs" />
         <Compile Include="Converters\FontFamilyTypeConverter.cs" />
         <Compile Include="Converters\MemberSelectorTypeConverter.cs" />
-        <Compile Include="Converters\NullableTypeConverter.cs" />
-        <Compile Include="Converters\ParseTypeConverter.cs" />
-        <Compile Include="Converters\SetterValueTypeConverter.cs" />
         <Compile Include="Converters\TimeSpanTypeConverter.cs" />
         <Compile Include="Extensions.cs" />
         <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
         <Compile Include="MarkupExtensions\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
         <Compile Include="MarkupExtensions\StyleIncludeExtension.cs" />
         <Compile Include="Parsers\PropertyParser.cs" />
-        <Compile Include="PortableXaml\AvaloniaResourceXamlInfo.cs" />
-        <Compile Include="PortableXaml\AvaloniaXamlContext.cs" />
-        <Compile Include="PortableXaml\AttributeExtensions.cs" />
-        <Compile Include="PortableXaml\AvaloniaMemberAttributeProvider.cs" />
-        <Compile Include="PortableXaml\AvaloniaNameScope.cs" />
-        <Compile Include="AvaloniaTypeConverters.cs" />
-        <Compile Include="PortableXaml\AvaloniaXamlObjectWriter.cs" />
-        <Compile Include="PortableXaml\AvaloniaRuntimeTypeProvider.cs" />
-        <Compile Include="PortableXaml\AvaloniaXamlSchemaContext.cs" />
         <Compile Include="Converters\BitmapTypeConverter.cs" />
         <Compile Include="Converters\IconTypeConverter.cs" />
         <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
         <Compile Include="Converters\PointsListTypeConverter.cs" />
-        <Compile Include="Converters\SelectorTypeConverter.cs" />
         <Compile Include="MarkupExtensions\BindingExtension.cs" />
         <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
-        <Compile Include="PortableXaml\AvaloniaTypeAttributeProvider.cs" />
-        <Compile Include="PortableXaml\AvaloniaXamlType.cs" />
-        <Compile Include="PortableXaml\TypeDescriptorExtensions.cs" />
         <Compile Include="Properties\AssemblyInfo.cs" />
         <Compile Include="Styling\StyleInclude.cs" />
         <Compile Include="Templates\ControlTemplate.cs" />
@@ -52,7 +35,6 @@
         <Compile Include="Templates\MemberSelector.cs" />
         <Compile Include="Templates\Template.cs" />
         <Compile Include="Templates\TemplateContent.cs" />
-        <Compile Include="Templates\TemplateLoader.cs" />
         <Compile Include="Templates\TreeDataTemplate.cs" />
         <Compile Include="XamlIl\AvaloniaXamlIlRuntimeCompiler.cs" />
         <Compile Include="XamlIl\CompilerExtensions\Transformers\AvaloniaBindingExtensionHackTransformer.cs" />
@@ -76,11 +58,11 @@
         <Compile Include="XamlIl\Runtime\IAvaloniaXamlIlXmlNamespaceInfoProviderV1.cs" />
         <Compile Include="XamlIl\Runtime\XamlIlRuntimeHelpers.cs" />
         <Compile Include="XamlLoadException.cs" />
-        <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\**\*.cs" Exclude="PortableXaml\portable.xaml.github\src\Portable.Xaml\Assembly\**\*.cs" />
         <Compile Include="XamlIl\xamlil.github\src\XamlIl\**\*.cs" />
         <Compile Condition="$(UseCecil) == true" Include="XamlIl\xamlil.github\src\XamlIl.Cecil\**\*.cs" />
         <Compile Remove="XamlIl\xamlil.github\**\obj\**\*.cs" />
         <Compile Include="..\Avalonia.Markup\Markup\Parsers\SelectorGrammar.cs" />
+        <Compile Include="XamlTypes.cs" />
     </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />

diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs