From 63e0af2ee8d3e9facd09c7816b7dd6836221d8b6 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 29 Sep 2017 17:02:10 -0700
Subject: [PATCH] Import dependencies.props last to ensure TargetFramework is
 set first

---
 Directory.Build.targets  | 1 +
 build/common.props       | 1 -
 build/dependencies.props | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index d8f1db6..5d5f288 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="build\dependencies.props" />
   <Import Project="build\dependencies.targets" />
   <Import Project="build\dependencies.g.targets" Condition="Exists('build\dependencies.g.targets') AND '$(DesignTimeBuild)' != 'true'" />
 </Project>
diff --git a/build/common.props b/build/common.props
index a557617..9929eab 100644
--- a/build/common.props
+++ b/build/common.props
@@ -1,5 +1,4 @@
 <Project>
-  <Import Project="dependencies.props" />
   <Import Project="..\version.props" />
 
   <PropertyGroup>
diff --git a/build/dependencies.props b/build/dependencies.props
index bf62853..9357b01 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -9,4 +9,6 @@
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0</RuntimeFrameworkVersion>
     <ThreadingDataflowVersion>4.8.0</ThreadingDataflowVersion>
   </PropertyGroup>
+
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
 </Project>