From e87967a4ad8e943a2214d74370786edd05ee8504 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Wed, 7 Nov 2018 18:14:21 +0100
Subject: [PATCH] Fix csproj

---
 samples/ControlCatalog/ControlCatalog.csproj       | 14 +++-----------
 .../Avalonia.Themes.Default.csproj                 | 13 +++++--------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 13b79d75b5..4af6171a89 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -11,9 +11,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Assets\*" />
   </ItemGroup>
-  <ItemGroup>
-    <None Remove="Pages\TabControlPage.xaml" />
-  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-Bold.ttf" />
     <EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />
@@ -27,15 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Pages\TabControlPage.xaml.cs">
-      <DependentUpon>TabControlPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Pages\TabControlPage.xaml">
+    <None Update="Pages\TabControlPage.xaml">
       <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
+    </None>
   </ItemGroup>
   
   <Import Project="..\..\build\Serilog.props" />
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index d854a136e9..af1899bab1 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -3,9 +3,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="TabItem.xaml" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@@ -16,12 +13,12 @@
     <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="TabItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
   </ItemGroup>  
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\Rx.props" />
-  <ItemGroup>
-    <EmbeddedResource Update="TabItem.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
 </Project>