Skip to content

Commit

Permalink
Ensure sdk props are imported before our props for legacy packageref
Browse files Browse the repository at this point in the history 
Fixes #114
  • Loading branch information
Oren Novotny committed Sep 7, 2018
1 parent a0e0353 commit 2c33705
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
10 changes: 10 additions & 0 deletions Source/MSBuild.Sdk.Extras/Build/EndOfProjectImports.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Core.props"/>
<Import Project="$(MSBuildThisFileDirectory)Core.targets"/>

</Project>
5 changes: 2 additions & 3 deletions Source/MSBuild.Sdk.Extras/Build/MSBuild.Sdk.Extras.props
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Workarounds.props"/>
<Import Project="$(MSBuildThisFileDirectory)Core.props"/>

<PropertyGroup>
<MSBuildSdkExtrasTargets>$(MSBuildThisFileDirectory)Core.targets</MSBuildSdkExtrasTargets>
<MSBuildSdkExtrasTargets>$(MSBuildThisFileDirectory)EndOfProjectImports.targets</MSBuildSdkExtrasTargets>
</PropertyGroup>

</Project>

0 comments on commit 2c33705

Please sign in to comment.