diff options
| -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> |