summaryrefslogtreecommitdiff
path: root/.nuspec/Xamarin.Forms.targets
diff options
context:
space:
mode:
authorMikayla Hutchinson <m.j.hutchinson@gmail.com>2017-09-04 03:57:11 -0400
committerSamantha Houts <samantha.houts@xamarin.com>2017-09-14 17:55:34 -0700
commitb8cfed30e530edd1c13ff2f5b68805258c5f3b48 (patch)
tree1c215c1d4d4b8729650ba6b5439b3c02ec74cce2 /.nuspec/Xamarin.Forms.targets
parent2dd8294349bf5c3a66e2292b454ebf6b833549bc (diff)
downloadxamarin-forms-b8cfed30e530edd1c13ff2f5b68805258c5f3b48.tar.gz
xamarin-forms-b8cfed30e530edd1c13ff2f5b68805258c5f3b48.tar.bz2
xamarin-forms-b8cfed30e530edd1c13ff2f5b68805258c5f3b48.zip
Fix default items (#1123)
There were some issues in the MSBuild evaluation order that caused the default items files to never get used.
Diffstat (limited to '.nuspec/Xamarin.Forms.targets')
-rw-r--r--.nuspec/Xamarin.Forms.targets3
1 files changed, 1 insertions, 2 deletions
diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets
index 37959c40..fe8a4d49 100644
--- a/.nuspec/Xamarin.Forms.targets
+++ b/.nuspec/Xamarin.Forms.targets
@@ -6,10 +6,9 @@
<PropertyGroup>
<EnableDefaultXamlItems Condition="'$(EnableDefaultXamlItems)'==''">True</EnableDefaultXamlItems>
<_DefaultXamlItemsEnabled>False</_DefaultXamlItemsEnabled>
- <_DefaultXamlItemsEnabled Condition="'$(EnableDefaultItems)'=='' And '$(EnableDefaultXamlItems)'=='True' And '$(EnableDefaultEmbeddedResourceItems)'=='True'">True</_DefaultXamlItemsEnabled>
</PropertyGroup>
- <Import Project="$(MSBuildThisFileDirectory)Xamarin.Forms.DefaultItems.targets" Condition="'$(_DefaultXamlItemsEnabled)'=='True'" />
+ <Import Project="$(MSBuildThisFileDirectory)Xamarin.Forms.DefaultItems.targets" Condition="'$(MSBuildSDKsPath)'!=''" />
<PropertyGroup>
<CoreCompileDependsOn>