diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 46dbe1566c..4f02a91c0b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -35,266 +35,269 @@
prompt
MinimumRecommendedRules.ruleset
-
-
- Properties\SharedAssemblyInfo.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Properties\SharedAssemblyInfo.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -306,6 +309,7 @@
+
diff --git a/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaTypeFeatureProvider.cs b/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaTypeFeatureProvider.cs
index d03fd2e72c..66b44d70a0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaTypeFeatureProvider.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaTypeFeatureProvider.cs
@@ -15,12 +15,13 @@ using Avalonia.Media.Imaging;
using Avalonia.Metadata;
using Avalonia.Styling;
using OmniXaml;
+#if OMNIXAML
using OmniXaml.Builder;
using OmniXaml.TypeConversion;
using OmniXaml.TypeConversion.BuiltInConverters;
using OmniXaml.Typing;
using OmniMetadata = OmniXaml.Typing.Metadata;
-
+#endif
namespace Avalonia.Markup.Xaml.Context
{
#if OMNIXAML
diff --git a/src/Markup/Avalonia.Markup.Xaml/OmniXamlCompileStubs.cs b/src/Markup/Avalonia.Markup.Xaml/OmniXamlCompileStubs.cs
new file mode 100644
index 0000000000..d8b5f566c7
--- /dev/null
+++ b/src/Markup/Avalonia.Markup.Xaml/OmniXamlCompileStubs.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+#if !OMNIXAML
+namespace OmniXaml
+{
+ interface ITypeProvider
+ {
+ }
+
+ class TypeNotFoundException : Exception
+ {
+ public TypeNotFoundException(string m) : base(m)
+ {
+
+ }
+ }
+}
+namespace OmniXaml.Typing
+{
+ class Stub
+ {
+ }
+}
+namespace OmniXaml.TypeConversion
+{
+ class Stub
+ {
+ }
+}
+namespace OmniXaml.Builder
+{
+ class Stub
+ {
+ }
+}
+namespace OmniXaml.ObjectAssembler.Commands
+{
+ class Stub
+ {
+ }
+}
+namespace OmniXaml.Parsers.ProtoParser
+{
+ class Stub
+ {
+ }
+}
+namespace OmniXaml.Parsers.Parser
+{
+ class Stub
+ {
+ }
+}
+namespace OmniXaml.Attributes
+{
+ class Stub
+ {
+ }
+}
+namespace Glass
+{
+ class Stub
+ {
+ }
+}
+namespace Glass.Core
+{
+ class Stub
+ {
+ }
+}
+#endif
\ No newline at end of file
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
index b987d6e3e7..665b557b34 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Converters/AvaloniaPropertyConverterTest.cs
@@ -9,7 +9,7 @@ using Avalonia.Styling;
using Xunit;
#if !OMNIXAML
-
+using System.ComponentModel;
using Portable.Xaml.ComponentModel;
using Portable.Xaml;
using Portable.Xaml.Markup;