Merge pull request #921 from AvaloniaUI/csproj-defaultcompileitem

Use the default compile items in core libs.
9 years ago · 9dc74784a1
24 changed files with 67 additions and 863 deletions
--- a/Avalonia.sln
+++ b/Avalonia.sln
@ -176,6 +176,9 @@ Global
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
 		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{d35a9f3d-8bb0-496e-bf72-444038a7debb}*SharedItemsImports = 4
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{dabfd304-d6a4-4752-8123-c2ccf7ac7831}*SharedItemsImports = 4
+		tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{e106cf37-4066-4615-b684-172a6d30b058}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4
 	EndGlobalSection
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -26,28 +25,13 @@
    <NoWarn>CS1591</NoWarn>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="Animation`1.cs" />
-    <Compile Include="Animation.cs" />
-    <Compile Include="Animate.cs" />
-    <Compile Include="Animatable.cs" />
-    <Compile Include="AnimationExtensions.cs" />
-    <Compile Include="IEasing`1.cs" />
-    <Compile Include="LinearEasing.cs" />
-    <Compile Include="LinearDoubleEasing.cs" />
-    <Compile Include="IEasing.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyTransitions.cs" />
-    <Compile Include="PropertyTransition.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -30,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\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>
-  <ItemGroup>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="10.3.0" />
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -30,176 +29,6 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="AppBuilderBase.cs" />
-    <Compile Include="Application.cs" />
-    <Compile Include="Classes.cs" />
-    <Compile Include="ContextMenu.cs" />
-    <Compile Include="Design.cs" />
-    <Compile Include="DockPanel.cs" />
-    <Compile Include="Expander.cs" />
-    <Compile Include="Generators\ItemContainerInfo.cs" />
-    <Compile Include="Generators\MenuItemContainerGenerator.cs" />
-    <Compile Include="Generators\TreeContainerIndex.cs" />
-    <Compile Include="HotkeyManager.cs" />
-    <Compile Include="IApplicationLifecycle.cs" />
-    <Compile Include="IScrollable.cs" />
-    <Compile Include="Platform\IWindowBaseImpl.cs" />
-    <Compile Include="Platform\Surfaces\IFramebufferPlatformSurface.cs" />
-    <Compile Include="PointEventArgs.cs" />
-    <Compile Include="Embedding\EmbeddableControlRoot.cs" />
-    <Compile Include="Platform\IEmbeddableWindowImpl.cs" />
-    <Compile Include="Platform\ExportAvaloniaModuleAttribute.cs" />
-    <Compile Include="Platform\ExportWindowingSubsystemAttribute.cs" />
-    <Compile Include="WindowBase.cs" />
-    <Compile Include="WindowIcon.cs" />
-    <Compile Include="IPseudoClasses.cs" />
-    <Compile Include="DropDownItem.cs" />
-    <Compile Include="ISetInheritanceParent.cs" />
-    <Compile Include="ItemVirtualizationMode.cs" />
-    <Compile Include="IVirtualizingController.cs" />
-    <Compile Include="IVirtualizingPanel.cs" />
-    <Compile Include="LayoutTransformControl.cs" />
-    <Compile Include="Mixins\ContentControlMixin.cs" />
-    <Compile Include="Platform\IWindowIconImpl.cs" />
-    <Compile Include="Platform\IPlatformIconLoader.cs" />
-    <Compile Include="Platform\IWindowingPlatform.cs" />
-    <Compile Include="Platform\PlatformManager.cs" />
-    <Compile Include="Presenters\IContentPresenterHost.cs" />
-    <Compile Include="Presenters\IItemsPresenterHost.cs" />
-    <Compile Include="Presenters\ItemsPresenterBase.cs" />
-    <Compile Include="Presenters\ItemVirtualizerNone.cs" />
-    <Compile Include="Presenters\ItemVirtualizerSimple.cs" />
-    <Compile Include="Presenters\ItemVirtualizer.cs" />
-    <Compile Include="Primitives\HeaderedSelectingControl.cs" />
-    <Compile Include="Primitives\ILogicalScrollable.cs" />
-    <Compile Include="Primitives\TabStripItem.cs" />
-    <Compile Include="Primitives\TemplateAppliedEventArgs.cs" />
-    <Compile Include="SelectionChangedEventArgs.cs" />
-    <Compile Include="SelectionMode.cs" />
-    <Compile Include="Separator.cs" />
-    <Compile Include="Shapes\Line.cs" />
-    <Compile Include="Shapes\Polygon.cs" />
-    <Compile Include="Shapes\Polyline.cs" />
-    <Compile Include="Slider.cs" />
-    <Compile Include="SystemDialog.cs" />
-    <Compile Include="Generators\ITreeItemContainerGenerator.cs" />
-    <Compile Include="Generators\ItemContainerEventArgs.cs" />
-    <Compile Include="IContentControl.cs" />
-    <Compile Include="IControl.cs" />
-    <Compile Include="IPanel.cs" />
-    <Compile Include="ISetLogicalParent.cs" />
-    <Compile Include="MenuItemAccessKeyHandler.cs" />
-    <Compile Include="Mixins\SelectableMixin.cs" />
-    <Compile Include="Platform\ISystemDialogImpl.cs" />
-    <Compile Include="Presenters\IContentPresenter.cs" />
-    <Compile Include="Primitives\AccessText.cs" />
-    <Compile Include="Border.cs" />
-    <Compile Include="MenuItem.cs" />
-    <Compile Include="Menu.cs" />
-    <Compile Include="Button.cs" />
-    <Compile Include="DropDown.cs" />
-    <Compile Include="Carousel.cs" />
-    <Compile Include="Platform\IPopupImpl.cs" />
-    <Compile Include="Platform\ITopLevelImpl.cs" />
-    <Compile Include="PlacementMode.cs" />
-    <Compile Include="Primitives\Popup.cs" />
-    <Compile Include="Canvas.cs" />
-    <Compile Include="Templates\FuncControlTemplate`2.cs" />
-    <Compile Include="Templates\FuncDataTemplate`1.cs" />
-    <Compile Include="Templates\FuncMemberSelector.cs" />
-    <Compile Include="Templates\IControlTemplate.cs" />
-    <Compile Include="Templates\FuncTemplate`2.cs" />
-    <Compile Include="Templates\FuncTemplate`1.cs" />
-    <Compile Include="Templates\IDataTemplate.cs" />
-    <Compile Include="Presenters\IItemsPresenter.cs" />
-    <Compile Include="Presenters\IPresenter.cs" />
-    <Compile Include="Presenters\CarouselPresenter.cs" />
-    <Compile Include="Primitives\AdornerDecorator.cs" />
-    <Compile Include="Primitives\AdornerLayer.cs" />
-    <Compile Include="Primitives\RangeBase.cs" />
-    <Compile Include="ProgressBar.cs" />
-    <Compile Include="RadioButton.cs" />
-    <Compile Include="CheckBox.cs" />
-    <Compile Include="ColumnDefinition.cs" />
-    <Compile Include="ColumnDefinitions.cs" />
-    <Compile Include="ContentControl.cs" />
-    <Compile Include="GridSplitter.cs" />
-    <Compile Include="ISelectable.cs" />
-    <Compile Include="ListBoxItem.cs" />
-    <Compile Include="ListBox.cs" />
-    <Compile Include="Platform\IWindowImpl.cs" />
-    <Compile Include="Presenters\ScrollContentPresenter.cs" />
-    <Compile Include="Presenters\ContentPresenter.cs" />
-    <Compile Include="Control.cs" />
-    <Compile Include="ControlExtensions.cs" />
-    <Compile Include="Controls.cs" />
-    <Compile Include="Templates\FuncControlTemplate.cs" />
-    <Compile Include="Templates\DataTemplateExtensions.cs" />
-    <Compile Include="Templates\FuncDataTemplate.cs" />
-    <Compile Include="Generators\TreeItemContainerGenerator.cs" />
-    <Compile Include="Generators\ItemContainerGenerator`1.cs" />
-    <Compile Include="Generators\ItemContainerGenerator.cs" />
-    <Compile Include="IGlobalDataTemplates.cs" />
-    <Compile Include="Templates\DataTemplates.cs" />
-    <Compile Include="Decorator.cs" />
-    <Compile Include="DefinitionBase.cs" />
-    <Compile Include="Grid.cs" />
-    <Compile Include="GridLength.cs" />
-    <Compile Include="Primitives\HeaderedContentControl.cs" />
-    <Compile Include="Primitives\HeaderedItemsControl.cs" />
-    <Compile Include="IHeadered.cs" />
-    <Compile Include="Image.cs" />
-    <Compile Include="Generators\IItemContainerGenerator.cs" />
-    <Compile Include="ItemsControl.cs" />
-    <Compile Include="Presenters\ItemsPresenter.cs" />
-    <Compile Include="Panel.cs" />
-    <Compile Include="Primitives\ScrollBarVisibility.cs" />
-    <Compile Include="Primitives\Track.cs" />
-    <Compile Include="Primitives\Thumb.cs" />
-    <Compile Include="RequestBringIntoViewEventArgs.cs" />
-    <Compile Include="Shapes\Ellipse.cs" />
-    <Compile Include="Templates\IMemberSelector.cs" />
-    <Compile Include="Templates\ITemplate`2.cs" />
-    <Compile Include="Templates\ITemplate`1.cs" />
-    <Compile Include="Templates\ITreeDataTemplate.cs" />
-    <Compile Include="Templates\FuncTreeDataTemplate.cs" />
-    <Compile Include="ToolTip.cs" />
-    <Compile Include="UserControl.cs" />
-    <Compile Include="Templates\TemplateExtensions.cs" />
-    <Compile Include="Utils\AncestorFinder.cs" />
-    <Compile Include="Utils\IEnumerableUtils.cs" />
-    <Compile Include="Utils\StringUtils.cs" />
-    <Compile Include="TopLevel.cs" />
-    <Compile Include="Primitives\PopupRoot.cs" />
-    <Compile Include="Utils\UndoRedoHelper.cs" />
-    <Compile Include="VirtualizingStackPanel.cs" />
-    <Compile Include="WindowState.cs" />
-    <Compile Include="Window.cs" />
-    <Compile Include="RowDefinition.cs" />
-    <Compile Include="RowDefinitions.cs" />
-    <Compile Include="Primitives\SelectingItemsControl.cs" />
-    <Compile Include="ScrollViewer.cs" />
-    <Compile Include="Shapes\Path.cs" />
-    <Compile Include="Shapes\Rectangle.cs" />
-    <Compile Include="Shapes\Shape.cs" />
-    <Compile Include="Primitives\ScrollBar.cs" />
-    <Compile Include="StackPanel.cs" />
-    <Compile Include="TabControl.cs" />
-    <Compile Include="TabItem.cs" />
-    <Compile Include="Primitives\TabStrip.cs" />
-    <Compile Include="Primitives\TemplatedControl.cs" />
-    <Compile Include="TextBlock.cs" />
-    <Compile Include="TextBox.cs" />
-    <Compile Include="Presenters\TextPresenter.cs" />
-    <Compile Include="Primitives\ToggleButton.cs" />
-    <Compile Include="Templates\FuncTreeDataTemplate`1.cs" />
-    <Compile Include="TreeView.cs" />
-    <Compile Include="TreeViewItem.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WindowEdge.cs" />
-    <Compile Include="WrapPanel.cs" />
-  </ItemGroup>
-  <ItemGroup>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
--- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
+++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -26,7 +25,6 @@
    <NoWarn>CS1591</NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
    <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@ -43,14 +41,7 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="DesignerAssist.cs" />
-    <Compile Include="DesignerApi.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
  <ItemGroup>
    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -27,7 +26,6 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
    <ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@ -45,34 +43,10 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="LogManager.cs" />
-    <Compile Include="Debug.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewLocator.cs" />
-    <Compile Include="ViewModels\DevToolsViewModel.cs" />
-    <Compile Include="ViewModels\TreePageViewModel.cs" />
-    <Compile Include="ViewModels\PropertyDetails.cs" />
-    <Compile Include="ViewModels\ControlDetailsViewModel.cs" />
-    <Compile Include="ViewModels\LogicalTreeNode.cs" />
-    <Compile Include="ViewModels\TreeNode.cs" />
-    <Compile Include="ViewModels\VisualTreeNode.cs" />
-    <Compile Include="Views\SimpleGrid.cs" />
-    <Compile Include="Views\TreePage.xaml.cs">
-      <DependentUpon>TreePageView.xaml</DependentUpon>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
    </Compile>
-    <Compile Include="DevTools.xaml.cs">
-      <DependentUpon>DevTools.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ControlDetailsView.cs" />
-    <Compile Include="Views\GridRepeater.cs" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DevTools.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\TreePageView.xaml">
+    <EmbeddedResource Include="**\*.xaml">
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
--- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
+++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netcoreapp1.0</TargetFramework>
-        <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
@ -25,11 +24,8 @@
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
-      <Link>SharedAssemblyInfo.cs</Link>
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="AppBuilder.cs" />
-    <Compile Include="NetCoreRuntimePlatform.cs" />
-    <Compile Include="RuntimeInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
@ -39,9 +35,6 @@
    <ProjectReference Include="..\Skia\Avalonia.Skia.Desktop.NetStandard\Avalonia.Skia.Desktop.NetStandard.csproj" />
    <ProjectReference Include="..\Windows\Avalonia.Win32.NetStandard\Avalonia.Win32.NetStandard.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
  </ItemGroup>
--- a/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs
@ -0,0 +1,6 @@
+// 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 System.Reflection;
+
+[assembly: AssemblyTitle("Avalonia.DotNetCoreRuntime")]
--- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
+++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
@ -23,7 +23,6 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <Content Include="external\Source\HtmlRenderer\Core\Utils\ImageError.png" />
    <Content Include="external\Source\HtmlRenderer\Core\Utils\ImageLoad.png" />
  </ItemGroup>
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -27,7 +26,6 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
@ -38,55 +36,6 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="Cursors.cs" />
-    <Compile Include="AccessKeyHandler.cs" />
-    <Compile Include="Gestures.cs" />
-    <Compile Include="KeyBinding.cs" />
-    <Compile Include="KeyGesture.cs" />
-    <Compile Include="Platform\IClipboard.cs" />
-    <Compile Include="Platform\IStandardCursorFactory.cs" />
-    <Compile Include="Raw\RawTextInputEventArgs.cs" />
-    <Compile Include="NavigationMethod.cs" />
-    <Compile Include="IInputRoot.cs" />
-    <Compile Include="IMainMenu.cs" />
-    <Compile Include="IAccessKeyHandler.cs" />
-    <Compile Include="FocusManager.cs" />
-    <Compile Include="NavigationDirection.cs" />
-    <Compile Include="ICloseable.cs" />
-    <Compile Include="IFocusManager.cs" />
-    <Compile Include="IFocusScope.cs" />
-    <Compile Include="IInputDevice.cs" />
-    <Compile Include="IInputElement.cs" />
-    <Compile Include="IInputManager.cs" />
-    <Compile Include="IKeyboardDevice.cs" />
-    <Compile Include="IKeyboardNavigationHandler.cs" />
-    <Compile Include="IMouseDevice.cs" />
-    <Compile Include="INavigableContainer.cs" />
-    <Compile Include="InputElement.cs" />
-    <Compile Include="InputExtensions.cs" />
-    <Compile Include="InputManager.cs" />
-    <Compile Include="IPointerDevice.cs" />
-    <Compile Include="Key.cs" />
-    <Compile Include="KeyboardDevice.cs" />
-    <Compile Include="KeyboardNavigation.cs" />
-    <Compile Include="KeyboardNavigationHandler.cs" />
-    <Compile Include="GotFocusEventArgs.cs" />
-    <Compile Include="Navigation\FocusExtensions.cs" />
-    <Compile Include="Navigation\DirectionalNavigation.cs" />
-    <Compile Include="Navigation\TabNavigation.cs" />
-    <Compile Include="PointerWheelEventArgs.cs" />
-    <Compile Include="Raw\RawMouseWheelEventArgs.cs" />
-    <Compile Include="Raw\RawSizeEventArgs.cs" />
-    <Compile Include="KeyboardNavigationMode.cs" />
-    <Compile Include="TextInputEventArgs.cs" />
-    <Compile Include="VectorEventArgs.cs" />
-    <Compile Include="KeyEventArgs.cs" />
-    <Compile Include="MouseDevice.cs" />
-    <Compile Include="PointerEventArgs.cs" />
-    <Compile Include="Raw\RawInputEventArgs.cs" />
-    <Compile Include="Raw\RawKeyEventArgs.cs" />
-    <Compile Include="Raw\RawMouseEventArgs.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -27,7 +26,6 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
@ -37,13 +35,6 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="IInteractive.cs" />
-    <Compile Include="InteractiveExtensions.cs" />
-    <Compile Include="Interactive.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RoutedEvent.cs" />
-    <Compile Include="RoutedEventArgs.cs" />
-    <Compile Include="EventSubscription.cs" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ b/src/Avalonia.Layout/Avalonia.Layout.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -27,7 +26,6 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
@ -36,13 +34,6 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="ILayoutable.cs" />
-    <Compile Include="ILayoutManager.cs" />
-    <Compile Include="ILayoutRoot.cs" />
-    <Compile Include="Layoutable.cs" />
-    <Compile Include="LayoutHelper.cs" />
-    <Compile Include="LayoutManager.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
+++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -24,12 +23,6 @@
    <DocumentationFile>bin\Release\Avalonia.Logging.Serilog.XML</DocumentationFile>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="SerilogLogger.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
  </ItemGroup>
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -30,52 +29,12 @@
    <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\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>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
  <ItemGroup>
    <PackageReference Include="System.Reactive" Version="3.0.0" />
    <PackageReference Include="System.Reactive.Core" Version="3.0.0" />
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -25,7 +24,6 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
@ -40,119 +38,10 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="DefaultTheme.xaml.cs">
-      <DependentUpon>DefaultTheme.xaml</DependentUpon>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Accents\BaseLight.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Button.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Carousel.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CheckBox.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ContentControl.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DropDown.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FocusAdorner.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GridSplitter.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ItemsControl.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ListBox.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ListBoxItem.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Menu.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MenuItem.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ProgressBar.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToolTip.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Expander.xaml" />
-    <EmbeddedResource Include="DropDownItem.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ContextMenu.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PopupRoot.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="RadioButton.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ScrollBar.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ScrollViewer.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabControl.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabStripItem.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabStrip.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TextBox.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ToggleButton.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TreeView.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TreeViewItem.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Window.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DefaultTheme.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Separator.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Slider.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="LayoutTransformControl.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="EmbeddableControlRoot.xaml">
+    <EmbeddedResource Include="**\*.xaml">
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -27,7 +26,6 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
  </ItemGroup>
@ -35,118 +33,6 @@
    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="Animation\PageSlide.cs" />
-    <Compile Include="Animation\CrossFade.cs" />
-    <Compile Include="Animation\IPageTransition.cs" />
-    <Compile Include="INamed.cs" />
-    <Compile Include="Matrix.cs" />
-    <Compile Include="Media\AlignmentY.cs" />
-    <Compile Include="Media\AlignmentX.cs" />
-    <Compile Include="Media\ArcSegment.cs" />
-    <Compile Include="Media\BezierSegment .cs" />
-    <Compile Include="Media\Brush.cs" />
-    <Compile Include="Media\Brushes.cs" />
-    <Compile Include="Media\BrushMappingMode.cs" />
-    <Compile Include="Media\Color.cs" />
-    <Compile Include="Media\Colors.cs" />
-    <Compile Include="Media\IGradientBrush.cs" />
-    <Compile Include="Media\ILinearGradientBrush.cs" />
-    <Compile Include="Media\Imaging\IImageBrush.cs" />
-    <Compile Include="Media\Imaging\WritableBitmap.cs" />
-    <Compile Include="Media\IRadialGradientBrush.cs" />
-    <Compile Include="Media\ITileBrush.cs" />
-    <Compile Include="Media\IVisualBrush.cs" />
-    <Compile Include="Media\TextWrapping.cs" />
-    <Compile Include="Media\TransformGroup.cs" />
-    <Compile Include="Media\DashStyle.cs" />
-    <Compile Include="Media\DrawingContext.cs" />
-    <Compile Include="Media\FillRule.cs" />
-    <Compile Include="Media\GradientBrush.cs" />
-    <Compile Include="Media\GradientSpreadMethod.cs" />
-    <Compile Include="Media\GradientStop.cs" />
-    <Compile Include="Media\IBrush.cs" />
-    <Compile Include="Media\ISolidColorBrush.cs" />
-    <Compile Include="Media\LineGeometry.cs" />
-    <Compile Include="Media\LineSegment.cs" />
-    <Compile Include="Media\Mutable\SolidColorBrush.cs" />
-    <Compile Include="Media\PathGeometryCollections.cs" />
-    <Compile Include="Media\PathFigure.cs" />
-    <Compile Include="Media\PathGeometry.cs" />
-    <Compile Include="Media\PathSegment.cs" />
-    <Compile Include="Media\PenLineJoin.cs" />
-    <Compile Include="Media\PolylineGeometry.cs" />
-    <Compile Include="Media\QuadraticBezierSegment .cs" />
-    <Compile Include="Media\RadialGradientBrush.cs" />
-    <Compile Include="Media\LinearGradientBrush.cs" />
-    <Compile Include="Media\MediaExtensions.cs" />
-    <Compile Include="Media\PenLineCap.cs" />
-    <Compile Include="Media\ScaleTransform.cs" />
-    <Compile Include="Media\TextAlignment.cs" />
-    <Compile Include="Media\FontWeight.cs" />
-    <Compile Include="Media\FontStyle.cs" />
-    <Compile Include="Media\FormattedTextLine.cs" />
-    <Compile Include="Media\FormattedText.cs" />
-    <Compile Include="Media\Geometry.cs" />
-    <Compile Include="Media\IDrawingContextImpl.cs" />
-    <Compile Include="Platform\ExportRenderingSubsystemAttribute.cs" />
-    <Compile Include="Platform\ILockedFramebuffer.cs" />
-    <Compile Include="Platform\IModuleEnvironmentChecker.cs" />
-    <Compile Include="Platform\IWritableBitmapImpl.cs" />
-    <Compile Include="Platform\PixelFormat.cs" />
-    <Compile Include="Rendering\IRenderer.cs" />
-    <Compile Include="Rendering\IRendererFactory.cs" />
-    <Compile Include="Rendering\IRenderLoop.cs" />
-    <Compile Include="Rendering\Renderer.cs" />
-    <Compile Include="Rendering\RendererMixin.cs" />
-    <Compile Include="Rendering\DefaultRenderLoop.cs" />
-    <Compile Include="RenderTargetCorruptedException.cs" />
-    <Compile Include="VisualTree\IVisual.cs" />
-    <Compile Include="Media\Imaging\Bitmap.cs" />
-    <Compile Include="Media\Imaging\IBitmap.cs" />
-    <Compile Include="Media\Imaging\RenderTargetBitmap.cs" />
-    <Compile Include="Media\TranslateTransform.cs" />
-    <Compile Include="Media\PathMarkupParser.cs" />
-    <Compile Include="Media\Pen.cs" />
-    <Compile Include="Media\EllipseGeometry.cs" />
-    <Compile Include="Media\RectangleGeometry.cs" />
-    <Compile Include="Media\MatrixTransform.cs" />
-    <Compile Include="Media\RotateTransform.cs" />
-    <Compile Include="Media\SolidColorBrush.cs" />
-    <Compile Include="Media\StreamGeometry.cs" />
-    <Compile Include="Media\StreamGeometryContext.cs" />
-    <Compile Include="Media\Stretch.cs" />
-    <Compile Include="Media\SweepDirection.cs" />
-    <Compile Include="Media\TextHitTestResult.cs" />
-    <Compile Include="Media\Transform.cs" />
-    <Compile Include="Media\TileBrush.cs" />
-    <Compile Include="Media\ImageBrush.cs" />
-    <Compile Include="Media\VisualBrush.cs" />
-    <Compile Include="Platform\IPlatformSettings.cs" />
-    <Compile Include="RelativePoint.cs" />
-    <Compile Include="Platform\IFormattedTextImpl.cs" />
-    <Compile Include="Platform\IBitmapImpl.cs" />
-    <Compile Include="Platform\IGeometryImpl.cs" />
-    <Compile Include="Platform\IPlatformRenderInterface.cs" />
-    <Compile Include="Platform\IRenderTarget.cs" />
-    <Compile Include="Platform\IRenderTargetBitmapImpl.cs" />
-    <Compile Include="Platform\IStreamGeometryContextImpl.cs" />
-    <Compile Include="Platform\IStreamGeometryImpl.cs" />
-    <Compile Include="Point.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RelativeRect.cs" />
-    <Compile Include="Rect.cs" />
-    <Compile Include="Rendering\IRenderRoot.cs" />
-    <Compile Include="Size.cs" />
-    <Compile Include="Thickness.cs" />
-    <Compile Include="Vector.cs" />
-    <Compile Include="VisualExtensions.cs" />
-    <Compile Include="Visual.cs" />
-    <Compile Include="VisualTreeAttachmentEventArgs.cs" />
-    <Compile Include="VisualTree\IHostedVisualTreeRoot.cs" />
-    <Compile Include="VisualTree\IVisualTreeHost.cs" />
-    <Compile Include="VisualTree\TransformedBounds.cs" />
-    <Compile Include="VisualTree\BoundsTracker.cs" />
-    <Compile Include="VisualTree\VisualExtensions.cs" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard1.1</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@ -30,46 +29,6 @@
    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
      <Link>Properties\SharedAssemblyInfo.cs</Link>
    </Compile>
-    <Compile Include="Data\ISettableNode.cs" />
-    <Compile Include="Data\StreamNode.cs" />
-    <Compile Include="Data\MarkupBindingChainException.cs" />
-    <Compile Include="Data\CommonPropertyNames.cs" />
-    <Compile Include="Data\EmptyExpressionNode.cs" />
-    <Compile Include="Data\ExpressionNodeBuilder.cs" />
-    <Compile Include="Data\ExpressionParseException.cs" />
-    <Compile Include="Data\BindingExpression.cs" />
-    <Compile Include="ControlLocator.cs" />
-    <Compile Include="Data\Plugins\DataAnnotationsValidationPlugin.cs" />
-    <Compile Include="Data\Plugins\ExceptionValidationPlugin.cs" />
-    <Compile Include="Data\Plugins\IndeiValidationPlugin.cs" />
-    <Compile Include="Data\Plugins\IDataValidationPlugin.cs" />
-    <Compile Include="Data\Plugins\AvaloniaPropertyAccessorPlugin.cs" />
-    <Compile Include="Data\Plugins\InpcPropertyAccessorPlugin.cs" />
-    <Compile Include="Data\Plugins\IPropertyAccessor.cs" />
-    <Compile Include="Data\Plugins\IPropertyAccessorPlugin.cs" />
-    <Compile Include="Data\LogicalNotNode.cs" />
-    <Compile Include="Data\IndexerNode.cs" />
-    <Compile Include="Data\Parsers\ArgumentListParser.cs" />
-    <Compile Include="Data\Parsers\IdentifierParser.cs" />
-    <Compile Include="Data\Parsers\ExpressionParser.cs" />
-    <Compile Include="Data\Parsers\Reader.cs" />
-    <Compile Include="Data\Plugins\ObservableStreamPlugin.cs" />
-    <Compile Include="Data\Plugins\TaskStreamPlugin.cs" />
-    <Compile Include="Data\Plugins\IStreamPlugin.cs" />
-    <Compile Include="Data\Plugins\PropertyAccessorBase.cs" />
-    <Compile Include="Data\Plugins\PropertyError.cs" />
-    <Compile Include="Data\Plugins\DataValidatiorBase.cs" />
-    <Compile Include="Data\PropertyAccessorNode.cs" />
-    <Compile Include="Data\ExpressionNode.cs" />
-    <Compile Include="Data\ExpressionObserver.cs" />
-    <Compile Include="FuncMultiValueConverter.cs" />
-    <Compile Include="FuncValueConverter.cs" />
-    <Compile Include="IMultiValueConverter.cs" />
-    <Compile Include="BoolConverters.cs" />
-    <Compile Include="StringConverters.cs" />
-    <Compile Include="DefaultValueConverter.cs" />
-    <Compile Include="IValueConverter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
@ -80,10 +39,6 @@
    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
  </ItemGroup>
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
  <ItemGroup>
    <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
    <PackageReference Include="System.Reactive" Version="3.0.0" />
--- a/src/Shared/nuget.workaround.targets
+++ b/src/Shared/nuget.workaround.targets
@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- https://github.com/NuGet/Home/issues/4532 -->
+<!-- 
+  This file is for a workaround for this NuGet issue https://github.com/NuGet/Home/issues/4532
+  It is built from the master branch of NuGet.BuildTasks with a different class name as not to conflict with the original.
+  It can most likely be removed when the next version of NuGet.BuildTasks is released: https://github.com/NuGet/NuGet.BuildTasks/pull/29
+-->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask TaskName="Microsoft.NuGet.Build.Tasks.ResolveNuGetPackageAssetsPatched" AssemblyFile="Microsoft.NuGet.Build.Tasks.Patched.dll" />

--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@ -1,36 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
-    <ProjectGuid>{2905FF23-53FB-45E6-AA49-6AF47A172056}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
-  <ItemGroup>
-    <Compile Include="AvaloniaObjectTests_DataValidation.cs" />
-    <Compile Include="Collections\CollectionChangedTracker.cs" />
-    <Compile Include="Collections\AvaloniaDictionaryTests.cs" />
-    <Compile Include="Collections\AvaloniaListTests.cs" />
-    <Compile Include="Collections\PropertyChangedTracker.cs" />
-    <Compile Include="AttachedPropertyTests.cs" />
-    <Compile Include="AvaloniaObjectTests_Direct.cs" />
-    <Compile Include="AvaloniaObjectTests_GetSubject.cs" />
-    <Compile Include="AvaloniaObjectTests_GetObservable.cs" />
-    <Compile Include="AvaloniaPropertyRegistryTests.cs" />
-    <Compile Include="AvaloniaObjectTests_Validation.cs" />
-    <Compile Include="AvaloniaObjectTests_Binding.cs" />
-    <Compile Include="AvaloniaObjectTests_Inheritance.cs" />
-    <Compile Include="AvaloniaObjectTests_SetValue.cs" />
-    <Compile Include="AvaloniaObjectTests_GetValue.cs" />
-    <Compile Include="AvaloniaObjectTests_Metadata.cs" />
-    <Compile Include="DirectPropertyTests.cs" />
-    <Compile Include="StyledPropertyTests.cs" />
-    <Compile Include="AvaloniaPropertyTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PriorityValueTests.cs" />
-    <Compile Include="WeakSubscriptionManagerTests.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
  </ItemGroup>
-
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@ -1,70 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-    <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
-        <ProjectGuid>{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}</ProjectGuid>
-    </PropertyGroup>
-    <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
-  <ItemGroup>
-    <Compile Include="AppBuilderTests.cs" />
-    <Compile Include="CanvasTests.cs" />
-    <Compile Include="ClassesTests.cs" />
-    <Compile Include="LayoutTransformControlTests.cs" />
-    <Compile Include="Presenters\ItemsPresenterTests_Virtualization_Simple.cs" />
-    <Compile Include="Presenters\ItemsPresenterTests_Virtualization.cs" />
-    <Compile Include="TextBoxTests_DataValidation.cs" />
-    <Compile Include="WindowBaseTests.cs" />
-    <Compile Include="UserControlTests.cs" />
-    <Compile Include="DockPanelTests.cs" />
-    <Compile Include="EnumerableExtensions.cs" />
-    <Compile Include="GridSplitterTests.cs" />
-    <Compile Include="GridTests.cs" />
-    <Compile Include="HeaderedItemsControlTests .cs" />
-    <Compile Include="ControlTests_NameScope.cs" />
-    <Compile Include="Generators\ItemContainerGeneratorTests.cs" />
-    <Compile Include="GridLengthTests.cs" />
-    <Compile Include="ImageTests.cs" />
-    <Compile Include="Presenters\ContentPresenterTests.cs" />
-    <Compile Include="BorderTests.cs" />
-    <Compile Include="ListBoxTests_Single.cs" />
-    <Compile Include="NameScopeTests.cs" />
-    <Compile Include="Primitives\SelectingItemsControlTests_Multiple.cs" />
-    <Compile Include="Presenters\ScrollContentPresenterTests_ILogicalScrollable.cs" />
-    <Compile Include="TextBoxTests.cs" />
-    <Compile Include="TextBlockTests.cs" />
-    <Compile Include="WindowingPlatformMock.cs" />
-    <Compile Include="TreeViewTests.cs" />
-    <Compile Include="Mixins\SelectableMixinTests.cs" />
-    <Compile Include="StackPanelTests.cs" />
-    <Compile Include="Primitives\TrackTests.cs" />
-    <Compile Include="Primitives\PopupTests.cs" />
-    <Compile Include="DropDownTests.cs" />
-    <Compile Include="Presenters\CarouselPresenterTests.cs" />
-    <Compile Include="Presenters\ItemsPresenterTests.cs" />
-    <Compile Include="Presenters\ScrollContentPresenterTests.cs" />
-    <Compile Include="Primitives\TemplatedControlTests.cs" />
-    <Compile Include="Primitives\ScrollBarTests.cs" />
-    <Compile Include="Primitives\RangeBaseTests.cs" />
-    <Compile Include="Primitives\SelectingItemsControlTests_AutoSelect.cs" />
-    <Compile Include="ScrollViewerTests.cs" />
-    <Compile Include="Primitives\SelectingItemsControlTests.cs" />
-    <Compile Include="ListBoxTests.cs" />
-    <Compile Include="ItemsControlTests.cs" />
-    <Compile Include="ContentControlTests.cs" />
-    <Compile Include="DecoratorTests.cs" />
-    <Compile Include="CarouselTests.cs" />
-    <Compile Include="TopLevelTests.cs" />
-    <Compile Include="Primitives\TabStripTests.cs" />
-    <Compile Include="TabControlTests.cs" />
-    <Compile Include="PanelTests.cs" />
-    <Compile Include="ControlTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Templates\TemplateExtensionsTests.cs" />
-    <Compile Include="TestTemplatedControl.cs" />
-    <Compile Include="Utils\AncestorFinderTests.cs" />
-    <Compile Include="Utils\HotKeyManagerTests.cs" />
-    <Compile Include="VirtualizingStackPanelTests.cs" />
-    <Compile Include="WrapPanelTests.cs" />
-  </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
  <ItemGroup>
    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
@ -84,6 +22,7 @@
    <PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
    <PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
    <PackageReference Include="System.Reactive.PlatformServices" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="3.0.0" />
    <PackageReference Include="xunit" Version="2.2.0" />
    <PackageReference Include="xunit.abstractions" Version="2.0.1" />
    <PackageReference Include="xunit.assert" Version="2.2.0" />
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@ -4,34 +4,23 @@
 // </copyright>
 // -----------------------------------------------------------------------

+using Avalonia.Platform;
+using Avalonia.UnitTests;
+using Moq;
+using Xunit;
+
 namespace Avalonia.Controls.UnitTests
 {
-    using System.Reactive;
-    using System.Reactive.Subjects;
-    using Moq;
-    using Avalonia.Controls.Presenters;
-    using Avalonia.Controls.Templates;
-    using Avalonia.Input;
-    using Avalonia.Input.Raw;
-    using Avalonia.Layout;
-    using Avalonia.Platform;
-    using Avalonia.Rendering;
-    using Avalonia.Styling;
-    using Ploeh.AutoFixture;
-    using Ploeh.AutoFixture.AutoMoq;
-    using Splat;
-    using Xunit;
-
    public class WindowTests
    {
        [Fact]
        public void Setting_Title_Should_Set_Impl_Title()
        {
-            using (Locator.CurrentMutable.WithResolver())
-            {
-                var windowImpl = new Mock<IWindowImpl>();
-                Locator.CurrentMutable.RegisterConstant(windowImpl.Object, typeof(IWindowImpl));
+            var windowImpl = new Mock<IWindowImpl>();
+            var windowingPlatform = new MockWindowingPlatform(() => windowImpl.Object);

+            using (UnitTestApplication.Start(new TestServices(windowingPlatform: windowingPlatform)))
+            {
                var target = new Window();

                target.Title = "Hello World";
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
@ -1,33 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-    <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
-        <ProjectGuid>{DB070A10-BF39-4752-8456-86E9D5928478}</ProjectGuid>
-    </PropertyGroup>
-    <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
-    <ItemGroup>
-        <Compile Include="FullLayoutTests.cs" />
-        <Compile Include="LayoutManagerTests.cs" />
-        <Compile Include="ArrangeTests.cs" />
-        <Compile Include="MeasureTests.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="TestLayoutRoot.cs" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
-        <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-        <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="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-      <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <ProjectGuid>{DB070A10-BF39-4752-8456-86E9D5928478}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\coretests.props" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
+    <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="..\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@ -67,7 +67,6 @@ namespace Avalonia.UnitTests
            IStyler styler = null,
            Func<Styles> theme = null,
            IPlatformThreadingInterface threadingInterface = null,
-            IWindowImpl windowImpl = null,
            IWindowingPlatform windowingPlatform = null)
        {
            AssetLoader = assetLoader;
@ -83,7 +82,6 @@ namespace Avalonia.UnitTests
            Styler = styler;
            Theme = theme;
            ThreadingInterface = threadingInterface;
-            WindowImpl = windowImpl;
            WindowingPlatform = windowingPlatform;
        }

@ -100,7 +98,6 @@ namespace Avalonia.UnitTests
        public IStyler Styler { get; }
        public Func<Styles> Theme { get; }
        public IPlatformThreadingInterface ThreadingInterface { get; }
-        public IWindowImpl WindowImpl { get; }
        public IWindowingPlatform WindowingPlatform { get; }

        public TestServices With(
@ -134,7 +131,6 @@ namespace Avalonia.UnitTests
                styler: styler ?? Styler,
                theme: theme ?? Theme,
                threadingInterface: threadingInterface ?? ThreadingInterface,
-                windowImpl: windowImpl ?? WindowImpl,
                windowingPlatform: windowingPlatform ?? WindowingPlatform);
        }

--- a/tests/coretests.props
+++ b/tests/coretests.props
@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
        <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
    </PropertyGroup>