comment omnixaml specific code with #ifdef

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaAttachableXamlMember.cs

@@ -8,6 +8,7 @@ using System.Reflection;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaAttachableXamlMember : AttachableMember
     {
         public AvaloniaAttachableXamlMember(string name,
@@ -30,4 +31,5 @@ namespace Avalonia.Markup.Xaml.Context
             return new AvaloniaMemberValuePlugin(this);
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaLifeCycleListener.cs

@@ -6,6 +6,7 @@ using OmniXaml;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaLifeCycleListener : IInstanceLifeCycleListener
     {
         public void OnAfterProperties(object instance)
@@ -28,4 +29,5 @@ namespace Avalonia.Markup.Xaml.Context
             isi?.EndInit();
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaMemberValuePlugin.cs

@@ -7,6 +7,7 @@ using OmniXaml.Typing;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaMemberValuePlugin : MemberValuePlugin
     {
         private readonly MutableMember _xamlMember;
@@ -22,4 +23,5 @@ namespace Avalonia.Markup.Xaml.Context
             PropertyAccessor.SetValue(instance, _xamlMember, value, valueContext);
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaNamespaceRegistry.cs

@@ -17,6 +17,7 @@ using Glass.Core;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaNamespaceRegistry : INamespaceRegistry
     {
         private const string ClrNamespace = "clr-namespace:";
@@ -178,4 +179,5 @@ namespace Avalonia.Markup.Xaml.Context
             }
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaTypeRepository.cs

@@ -8,6 +8,7 @@ using Glass.Core;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaTypeRepository : TypeRepository
     {
         private readonly ITypeFactory _typeFactory;
@@ -25,4 +26,5 @@ namespace Avalonia.Markup.Xaml.Context
             return new AvaloniaXamlType(type, this, _typeFactory, FeatureProvider);
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaXamlMember.cs

@@ -8,6 +8,7 @@ using System;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaXamlMember : Member
     {
         public AvaloniaXamlMember(string name,
@@ -28,4 +29,5 @@ namespace Avalonia.Markup.Xaml.Context
             return "Avalonia XAML Member " + base.ToString();
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaXamlType.cs

@@ -9,6 +9,7 @@ using Avalonia.Controls;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     public class AvaloniaXamlType : XamlType
     {
         public AvaloniaXamlType(Type type,
@@ -58,4 +59,5 @@ namespace Avalonia.Markup.Xaml.Context
             return "Avalonia XAML Type " + base.ToString();
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/NameScopeWrapper.cs

@@ -3,6 +3,7 @@
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     internal class NameScopeWrapper : OmniXaml.INameScope
     {
         private readonly Avalonia.Controls.INameScope _inner;
@@ -27,4 +28,5 @@ namespace Avalonia.Markup.Xaml.Context
             _inner.Unregister(name);
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs

@@ -15,6 +15,7 @@ using Avalonia.Styling;
 
 namespace Avalonia.Markup.Xaml.Context
 {
+#if OMNIXAML
     internal static class PropertyAccessor
     {
         public static void SetValue(
@@ -171,4 +172,5 @@ namespace Avalonia.Markup.Xaml.Context
             return true;
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Data/SourceBindingEndpoint.cs

@@ -6,6 +6,7 @@ using System.ComponentModel;
 
 namespace Avalonia.Markup.Xaml.Data
 {
+#if OMNIXAML
     public class SourceBindingEndpoint
     {
         public Type PropertyType { get; }
@@ -24,4 +25,5 @@ namespace Avalonia.Markup.Xaml.Data
             PropertySetter = propertySetter;
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/Data/TargetBindingEndpoint.cs

@@ -3,6 +3,7 @@
 
 namespace Avalonia.Markup.Xaml.Data
 {
+#if OMNIXAML
     public class TargetBindingEndpoint
     {
         public AvaloniaObject Object { get; }
@@ -15,4 +16,5 @@ namespace Avalonia.Markup.Xaml.Data
             Property = property;
         }
     }
+#endif
 }

src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs

@@ -1,16 +1,14 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-
 using Avalonia.Markup.Xaml.Data;
 
-
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
 #if !OMNIXAML
 
-    using System;
     using Portable.Xaml.Markup;
+    using System;
 
     public class RelativeSourceExtension : MarkupExtension
     {
@@ -34,6 +32,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         [ConstructorArgument("mode")]
         public RelativeSourceMode Mode { get; set; }
     }
+
 #else
 
     using OmniXaml;

src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleResourceExtension.cs

@@ -1,12 +1,12 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Data;
 using Avalonia.Markup.Xaml.Data;
 using System;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
-    using Avalonia.Data;
 #if !OMNIXAML
 
     using Portable.Xaml.Markup;

src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TypeExtension.cs

@@ -7,7 +7,6 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
 #if !OMNIXAML
 
-    //TODO: check do we need something more than std Portable.xaml type??
     public class TypeExtension : Portable.Xaml.Markup.TypeExtension
     {
         public TypeExtension()
@@ -16,7 +15,6 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public TypeExtension(string typeName) : base(typeName)
         {
-
         }
 
         public override object ProvideValue(IServiceProvider serviceProvider)

tests/Avalonia.Markup.Xaml.UnitTests/Context/AvaloniaNamespaceRegistryTest.cs

@@ -6,6 +6,7 @@ using Xunit;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Context
 {
+#if OMNIXAML
     public class AvaloniaNamespaceRegistryTest
     {
         [Fact]
@@ -23,4 +24,5 @@ namespace Avalonia.Markup.Xaml.UnitTests.Context
             Assert.Same(ns1, ns2);
         }
     }
+#endif
 }