diff options
author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2017-09-04 03:57:11 -0400 |
---|---|---|
committer | Samantha Houts <samantha.houts@xamarin.com> | 2017-09-14 17:55:34 -0700 |
commit | b8cfed30e530edd1c13ff2f5b68805258c5f3b48 (patch) | |
tree | 1c215c1d4d4b8729650ba6b5439b3c02ec74cce2 /.nuspec | |
parent | 2dd8294349bf5c3a66e2292b454ebf6b833549bc (diff) | |
download | xamarin-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')
-rw-r--r-- | .nuspec/Xamarin.Forms.DefaultItems.props | 2 | ||||
-rw-r--r-- | .nuspec/Xamarin.Forms.DefaultItems.targets | 2 | ||||
-rw-r--r-- | .nuspec/Xamarin.Forms.props | 2 | ||||
-rw-r--r-- | .nuspec/Xamarin.Forms.targets | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/.nuspec/Xamarin.Forms.DefaultItems.props b/.nuspec/Xamarin.Forms.DefaultItems.props index cb948d9c..7df69df5 100644 --- a/.nuspec/Xamarin.Forms.DefaultItems.props +++ b/.nuspec/Xamarin.Forms.DefaultItems.props @@ -1,6 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> + <ItemGroup Condition="'$(EnableDefaultItems)'=='True' And '$(EnableDefaultXamlItems)'=='True' And '$(EnableDefaultEmbeddedResourceItems)'=='True'"> <EmbeddedResource Include="**\*.xaml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" /> </ItemGroup> diff --git a/.nuspec/Xamarin.Forms.DefaultItems.targets b/.nuspec/Xamarin.Forms.DefaultItems.targets index d41993f7..d19252a5 100644 --- a/.nuspec/Xamarin.Forms.DefaultItems.targets +++ b/.nuspec/Xamarin.Forms.DefaultItems.targets @@ -7,7 +7,7 @@ Unfortunately there is no way to work around this without adding a new extension point to the sdk props. --> - <ItemGroup> + <ItemGroup Condition="'$(EnableDefaultItems)'=='True' And '$(EnableDefaultXamlItems)'=='True' And '$(EnableDefaultEmbeddedResourceItems)'=='True'"> <Compile Update="**\*.xaml$(DefaultLanguageSourceExtension)" DependentUpon="%(Filename)" SubType="Code" /> <None Remove="**\*.xaml" Condition="'$(EnableDefaultNoneItems)'=='True'" /> </ItemGroup> diff --git a/.nuspec/Xamarin.Forms.props b/.nuspec/Xamarin.Forms.props index b2dcced2..54c03727 100644 --- a/.nuspec/Xamarin.Forms.props +++ b/.nuspec/Xamarin.Forms.props @@ -10,6 +10,6 @@ The actual item groups are in a separate conditionally-imported file as they use constructs that are not compatible with older MSBuild versions. --> - <Import Project="$(MSBuildThisFileDirectory)Xamarin.Forms.DefaultItems.props" Condition="'$(_DefaultXamlItemsEnabled)'=='True'" /> + <Import Project="$(MSBuildThisFileDirectory)Xamarin.Forms.DefaultItems.props" Condition="'$(MSBuildSDKsPath)'!=''" /> </Project> 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> |