From bb75421b3e09197c50a35884e4a6affcdfc80fc8 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 6 Aug 2017 13:32:19 -0700
Subject: [PATCH] PR feedback

---
 build/Rx.props | 3 +--
 packages.cake  | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build/Rx.props b/build/Rx.props
index e63055da3e..e88ab1ec37 100644
--- a/build/Rx.props
+++ b/build/Rx.props
@@ -5,7 +5,6 @@
     <PackageReference Include="System.Reactive.Interfaces" Version="3.1.0" />
     <PackageReference Include="System.Reactive.Linq" Version="3.1.0" />
     <PackageReference Include="System.Reactive.PlatformServices" Version="3.1.0" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net45'" Include="System.Reactive.Windows.Threading" Version="3.1.0" />
-    <PackageReference Condition="'$(TargetFramework)' == 'net461'" Include="System.Reactive.Windows.Threading" Version="3.1.0" />
+    <PackageReference Condition="$(TargetFramework.StartsWith('net4'))" Include="System.Reactive.Windows.Threading" Version="3.1.0" />
   </ItemGroup>
 </Project>
diff --git a/packages.cake b/packages.cake
index 4f8cadb4cd..78052e8a5e 100644
--- a/packages.cake
+++ b/packages.cake
@@ -281,11 +281,10 @@ public class Packages
             new NuGetPackSettings()
             {
                 Id = "Avalonia.ReactiveUI",
-                Dependencies = new []
+                Dependencies = new DependencyBuilder(this)
                 {
                     new NuSpecDependency() { Id = "Avalonia", Version = parameters.Version },
-                    new NuSpecDependency() { Id = "reactiveui", Version = ReactiveUIVersion }
-                },
+                }.Deps(new string[] {null}, "reactiveui"),
                 Files = new []
                 {
                     new NuSpecContent { Source = "Avalonia.ReactiveUI.dll", Target = "lib/netstandard1.3" }