fix build

Avalonia.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -156,6 +156,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Gtk3", "src\Gtk\Avalonia.Gtk3\Avalonia.Gtk3.csproj", "{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable.Xaml-pcl259", "src\Markup\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj", "{179484EC-DB00-451A-AD2D-2E2AB20DE519}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.NetCore", "samples\ControlCatalog.NetCore\ControlCatalog.NetCore.csproj", "{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{74487168-7D91-487E-BF93-055F2251461E}"

build/Markup.props

@@ -5,5 +5,6 @@
     <PackageReference Include="System.Linq" Version="4.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
+	<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 </Project>

src/Avalonia.Base/Avalonia.Base.csproj

@@ -29,88 +29,6 @@
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Data\BindingChainException.cs" />
-    <Compile Include="Data\BindingNotification.cs" />
-    <Compile Include="Data\IndexerBinding.cs" />
-    <Compile Include="Diagnostics\INotifyCollectionChangedDebug.cs" />
-    <Compile Include="Data\AssignBindingAttribute.cs" />
-    <Compile Include="Data\BindingOperations.cs" />
-    <Compile Include="Data\InstancedBinding.cs" />
-    <Compile Include="Data\IBinding.cs" />
-    <Compile Include="Data\IndexerDescriptor.cs" />
-    <Compile Include="Collections\AvaloniaDictionary.cs" />
-    <Compile Include="Data\BindingMode.cs" />
-    <Compile Include="Diagnostics\IAvaloniaObjectDebug.cs" />
-    <Compile Include="Diagnostics\AvaloniaObjectExtensions.cs" />
-    <Compile Include="AttachedProperty.cs" />
-    <Compile Include="IPriorityValueOwner.cs" />
-    <Compile Include="IStyledPropertyAccessor.cs" />
-    <Compile Include="IDirectPropertyAccessor.cs" />
-    <Compile Include="DirectProperty.cs" />
-    <Compile Include="IAvaloniaObject.cs" />
-    <Compile Include="IDirectPropertyMetadata.cs" />
-    <Compile Include="IStyledPropertyMetadata.cs" />
-    <Compile Include="ISupportInitialize.cs" />
-    <Compile Include="Logging\ILogSink.cs" />
-    <Compile Include="Logging\LogArea.cs" />
-    <Compile Include="Logging\LogEventLevel.cs" />
-    <Compile Include="Logging\Logger.cs" />
-    <Compile Include="Metadata\AmbientAttribute.cs" />
-    <Compile Include="Metadata\TemplateContent.cs" />
-    <Compile Include="Metadata\DependsOnAttribute.cs" />
-    <Compile Include="Metadata\ContentAttribute.cs" />
-    <Compile Include="AvaloniaDisposable.cs" />
-    <Compile Include="AvaloniaInternalException.cs" />
-    <Compile Include="AvaloniaLocator.cs" />
-    <Compile Include="Metadata\XmlnsDefinitionAttribute.cs" />
-    <Compile Include="AvaloniaObjectExtensions.cs" />
-    <Compile Include="PropertyMetadata.cs" />
-    <Compile Include="Reactive\ObservableEx.cs" />
-    <Compile Include="Reactive\WeakPropertyChangedObservable.cs" />
-    <Compile Include="StyledProperty.cs" />
-    <Compile Include="StyledPropertyBase.cs" />
-    <Compile Include="AvaloniaPropertyRegistry.cs" />
-    <Compile Include="AvaloniaProperty`1.cs" />
-    <Compile Include="Platform\IAssetLoader.cs" />
-    <Compile Include="Platform\IRuntimePlatform.cs" />
-    <Compile Include="Data\BindingPriority.cs" />
-    <Compile Include="PriorityBindingEntry.cs" />
-    <Compile Include="Collections\IAvaloniaList.cs" />
-    <Compile Include="Collections\AvaloniaList.cs" />
-    <Compile Include="Contract.cs" />
-    <Compile Include="Diagnostics\AvaloniaPropertyValue.cs" />
-    <Compile Include="IDescription.cs" />
-    <Compile Include="Collections\AvaloniaListExtensions.cs" />
-    <Compile Include="Collections\IAvaloniaReadOnlyList.cs" />
-    <Compile Include="AvaloniaObject.cs" />
-    <Compile Include="AvaloniaProperty.cs" />
-    <Compile Include="AvaloniaPropertyChangedEventArgs.cs" />
-    <Compile Include="Platform\IPlatformHandle.cs" />
-    <Compile Include="Platform\IPlatformThreadingInterface.cs" />
-    <Compile Include="Platform\PlatformHandle.cs" />
-    <Compile Include="PriorityLevel.cs" />
-    <Compile Include="PriorityValue.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Reactive\AnonymousSubject`1.cs" />
-    <Compile Include="Reactive\AnonymousSubject`2.cs" />
-    <Compile Include="Reactive\AvaloniaObservable.cs" />
-    <Compile Include="DirectPropertyMetadata`1.cs" />
-    <Compile Include="StyledPropertyMetadata`1.cs" />
-    <Compile Include="Threading\Dispatcher.cs" />
-    <Compile Include="Threading\DispatcherPriority.cs" />
-    <Compile Include="Threading\DispatcherTimer.cs" />
-    <Compile Include="Threading\JobRunner.cs" />
-    <Compile Include="Threading\AvaloniaScheduler.cs" />
-    <Compile Include="Threading\AvaloniaSynchronizationContext.cs" />
-    <Compile Include="Threading\SingleThreadDispatcher.cs" />
-    <Compile Include="Utilities\ExceptionUtilities.cs" />
-    <Compile Include="Utilities\IWeakSubscriber.cs" />
-    <Compile Include="Utilities\MathUtilities.cs" />
-    <Compile Include="Utilities\SingleOrDictionary.cs" />
-    <Compile Include="Utilities\TypeUtilities.cs" />
-    <Compile Include="Utilities\WeakObservable.cs" />
-    <Compile Include="Utilities\WeakSubscriptionManager.cs" />
-    <Compile Include="Utilities\WeakTimer.cs" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />

src/Avalonia.Styling/Avalonia.Styling.csproj

@@ -29,41 +29,6 @@
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Controls\NameScopeEventArgs.cs" />
-    <Compile Include="Controls\NameScopeExtensions.cs" />
-    <Compile Include="LogicalTree\ILogical.cs" />
-    <Compile Include="LogicalTree\LogicalExtensions.cs" />
-    <Compile Include="LogicalTree\LogicalTreeAttachmentEventArgs.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Styling\ActivatedSubject.cs" />
-    <Compile Include="Styling\ActivatedValue.cs" />
-    <Compile Include="Controls\INameScope.cs" />
-    <Compile Include="Styling\ITemplate.cs" />
-    <Compile Include="Controls\NameScope.cs" />
-    <Compile Include="Styling\StyleResources.cs" />
-    <Compile Include="Styling\TemplateSelector.cs" />
-    <Compile Include="Styling\DescendentSelector.cs" />
-    <Compile Include="Styling\ChildSelector.cs" />
-    <Compile Include="Styling\IGlobalStyles.cs" />
-    <Compile Include="Styling\ISetter.cs" />
-    <Compile Include="Styling\IStyle.cs" />
-    <Compile Include="Styling\IStyleable.cs" />
-    <Compile Include="Styling\IStyleRoot.cs" />
-    <Compile Include="Styling\IStyleHost.cs" />
-    <Compile Include="Styling\IStyler.cs" />
-    <Compile Include="Styling\ITemplatedControl.cs" />
-    <Compile Include="Styling\SelectorMatch.cs" />
-    <Compile Include="Styling\Selector.cs" />
-    <Compile Include="Styling\Selectors.cs" />
-    <Compile Include="Styling\Setter.cs" />
-    <Compile Include="Styling\Style.cs" />
-    <Compile Include="Styling\StyleActivator.cs" />
-    <Compile Include="Styling\ActivatedObservable.cs" />
-    <Compile Include="Styling\StyleExtensions.cs" />
-    <Compile Include="Styling\Styler.cs" />
-    <Compile Include="Styling\Styles.cs" />
-    <Compile Include="Styling\PropertyEqualsSelector.cs" />
-    <Compile Include="Styling\TypeNameAndClassSelector.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />

src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj

@@ -304,69 +304,7 @@
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj">
-      <Project>{6417e941-21bc-467b-a771-0de389353ce6}</Project>
-      <Name>Avalonia.Markup</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj">
-      <Project>{179484ec-db00-451a-ad2d-2e2ab20de519}</Project>
-      <Name>Portable.Xaml-pcl259</Name>
-    </ProjectReference>
-    <Reference Include="Sprache, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Sprache.2.1.0\lib\netstandard1.0\Sprache.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <ProjectReference Include="..\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="glass\Glass.Core\Glass.Core.csproj" />

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

@@ -19,11 +19,16 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
+#if !OMNIXAML
             var tdc = (ITypeDescriptorContext)serviceProvider;
 
             return new StyleInclude(tdc.GetBaseUri()) { Source = Source };
+#else
+            throw new NotImplementedException("Just to support some time Omnixaml Compile!");
+#endif
         }
 
         public Uri Source { get; set; }
+
     }
 }

tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj

@@ -2,170 +2,13 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;OMNIXAML_no</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugOmniXaml|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\DebugOmniXaml\</OutputPath>
     <DefineConstants>TRACE;DEBUG;OMNIXAML</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Sprache, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sprache.2.1.0\lib\net40\Sprache.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Reactive.Core.3.0.0\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Reactive.Interfaces.3.0.0\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Reactive.Linq.3.0.0\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
-  <ItemGroup>
-    <Compile Include="Context\AvaloniaNamespaceRegistryTest.cs" />
-    <Compile Include="Data\BindingTests_DataValidation.cs" />
-    <Compile Include="Data\BindingTests_Source.cs" />
-    <Compile Include="Data\BindingTests_ElementName.cs" />
-    <Compile Include="Data\BindingTests_Self.cs" />
-    <Compile Include="Data\MultiBindingTests.cs" />
-    <Compile Include="Data\BindingTests_TemplatedParent.cs" />
-    <Compile Include="Data\BindingTests.cs" />
-    <Compile Include="Converters\AvaloniaPropertyConverterTest.cs" />
-    <Compile Include="Parsers\SelectorGrammarTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SampleAvaloniaObject.cs" />
-    <Compile Include="StyleTests.cs" />
-    <Compile Include="Templates\MemberSelectorTests.cs" />
-    <Compile Include="Templates\DataTemplateTests.cs" />
-    <Compile Include="Xaml\BasicTests.cs" />
-    <Compile Include="Xaml\ControlBindingTests.cs" />
-    <Compile Include="Xaml\BindingTests.cs" />
-    <Compile Include="Xaml\DataTemplateTests.cs" />
-    <Compile Include="Xaml\InitializationOrderTracker.cs" />
-    <Compile Include="Xaml\NonControl.cs" />
-    <Compile Include="Xaml\TreeDataTemplateTests.cs" />
-    <Compile Include="TypeProviderMock.cs" />
-    <Compile Include="TestViewModel.cs" />
-    <Compile Include="Xaml\StyleTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
-      <Project>{3E53A01A-B331-47F3-B828-4A5717E77A24}</Project>
-      <Name>Avalonia.Markup.Xaml</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
-      <Project>{6417e941-21bc-467b-a771-0de389353ce6}</Project>
-      <Name>Avalonia.Markup</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj">
-      <Project>{D211E587-D8BC-45B9-95A4-F297C8FA5200}</Project>
-      <Name>Avalonia.Animation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
-      <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
-      <Name>Avalonia.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
-      <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
-      <Name>Avalonia.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
-      <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
-      <Name>Avalonia.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj">
-      <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
-      <Name>Avalonia.Interactivity</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj">
-      <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
-      <Name>Avalonia.Layout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj">
-      <Project>{6417B24E-49C2-4985-8DB2-3AB9D898EC91}</Project>
-      <Name>Avalonia.ReactiveUI</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj">
-      <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
-      <Name>Avalonia.Visuals</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj">
-      <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
-      <Name>Avalonia.Styling</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
-      <Project>{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}</Project>
-      <Name>Avalonia.Themes.Default</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj">
-      <Project>{179484ec-db00-451a-ad2d-2e2ab20de519}</Project>
-      <Name>Portable.Xaml-pcl259</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj">
-      <Project>{88060192-33d5-4932-b0f9-8bd2763e857d}</Project>
-      <Name>Avalonia.UnitTests</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="..\..\build\UnitTests.NetCore.targets" />
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\XUnit.props" />
@@ -187,6 +30,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
+    <ProjectReference Include="..\..\src\Markup\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Xaml\Style1.xaml">

tests/Avalonia.UnitTests/TestServices.cs

@@ -47,9 +47,6 @@ namespace Avalonia.UnitTests
         public static readonly TestServices MockThreadingInterface = new TestServices(
             threadingInterface: Mock.Of<IPlatformThreadingInterface>(x => x.CurrentThreadIsLoopThread == true));
 
-        public static readonly TestServices MockWindowingPlatform = new TestServices(
-            windowingPlatform: new MockWindowingPlatform());
-
         public static readonly TestServices RealFocus = new TestServices(
             focusManager: new FocusManager(),
             keyboardDevice: () => new KeyboardDevice(),