From e0949b879660c0401454672c0836bf43046579d6 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 16 Aug 2018 21:29:04 -0500
Subject: [PATCH] Project file fixes.

---
 samples/BindingDemo/BindingDemo.csproj                        | 3 ++-
 samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj  | 3 ++-
 samples/RenderDemo/RenderDemo.csproj                          | 3 ++-
 samples/VirtualizationDemo/VirtualizationDemo.csproj          | 3 ++-
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj                      | 4 +++-
 .../Avalonia.Designer.HostApp.NetFX.csproj                    | 1 +
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index 30d7dbb2ec..f7568b9c51 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -31,4 +31,5 @@
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
-</Project>
\ No newline at end of file
+  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
+</Project>
diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
index 24b168c854..d60d087393 100644
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@@ -18,4 +18,5 @@
 
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\Serilog.props" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\build\NetFX.props" />
+</Project>
diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj
index 30d7dbb2ec..f7568b9c51 100644
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@@ -31,4 +31,5 @@
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
-</Project>
\ No newline at end of file
+  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
+</Project>
diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
index 30d7dbb2ec..f7568b9c51 100644
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@@ -31,4 +31,5 @@
   <Import Project="..\..\build\Serilog.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
-</Project>
\ No newline at end of file
+  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
+</Project>
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index a4842c2756..f67848a1ee 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project>
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" />
   <PropertyGroup>
     <TargetFramework>xamarin.ios10</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -15,5 +16,6 @@
   </ItemGroup>
   <Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
   <Import Project="..\..\..\build\Rx.props" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" />
   <Import Project="..\..\..\build\iOSWorkarounds.props" />
 </Project>
diff --git a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
index 7bcea3a43b..b34c9891ad 100644
--- a/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
+++ b/src/tools/Avalonia.Designer.HostApp.NetFX/Avalonia.Designer.HostApp.NetFX.csproj
@@ -21,4 +21,5 @@
     <ProjectReference Include="..\..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
     <ProjectReference Include="..\..\..\samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj" />
   </ItemGroup>
+  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\..\build\NetFX.props" />
 </Project>