Import dependencies.props last to ensure TargetFramework is set first

Nate McMaster · Nate McMaster · commit fb142f0b24cc · 2017-09-29T17:02:30.000-07:00
diff --git 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
@@ -1,5 +1,4 @@
 <Project>
-  <Import Project="dependencies.props" />
   <Import Project="..\version.props" />
 
   <PropertyGroup>
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -19,4 +19,6 @@
     <XunitVersion>2.3.0-beta2-build3683</XunitVersion>
     <XunitRunnerVisualStudioVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioVersion>
   </PropertyGroup>
+
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
 </Project>
diff --git a/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj
@@ -1,5 +1,4 @@
 ﻿<Project Sdk="FSharp.NET.Sdk; Microsoft.NET.Sdk.Web">
-  <Import Project="..\..\..\build\dependencies.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<Project>`
`2`		`- <Import Project="dependencies.props" />`
`3`	`2`	`<Import Project="..\version.props" />`
`4`	`3`
`5`	`4`	`<PropertyGroup>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<Project Sdk="FSharp.NET.Sdk; Microsoft.NET.Sdk.Web">`
`2`		`- <Import Project="..\..\..\build\dependencies.props" />`
`3`	`2`
`4`	`3`	`<PropertyGroup>`
`5`	`4`	`<TargetFramework>netcoreapp2.0</TargetFramework>`