From c24a60c544b50ca2f3150ffbbaab5c1c8e3069e1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 29 Sep 2017 17:01:59 -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 ++
 .../IdentityOIDCWebApplicationSample.csproj                     | 2 --
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index d8f1db62cd..5d5f288682 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 d1c1cd910f..b396529090 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 a5dd6b500b..9edf701582 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -17,4 +17,6 @@
     <XunitRunnerVisualStudioVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioVersion>
     <XunitVersionInSpecProjects>2.2.0</XunitVersionInSpecProjects>
   </PropertyGroup>
+
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
 </Project>
diff --git a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj
index d6d78d022c..190305773a 100644
--- a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj
+++ b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\build\dependencies.props" />
-
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>