Merge branch '15-5'

diff --cc Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
index 2680579,9d9b51c..ffeb955
--- 1/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
--- 2/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
+++ b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
@@@ -1012,12 -1008,13 +1012,12 @@@ namespace Xamarin.Forms.Build.Task
                                return false;
  
                        var vardef = context.Variables [elementNode];
 -                      var propertyType = property.ResolveGenericPropertyType(declaringTypeReference, module);
                        var implicitOperator = vardef.VariableType.GetImplicitOperatorTo(propertyType, module);
  
-                       if (implicitOperator != null)
-                               return true;
                        if (vardef.VariableType.InheritsFromOrImplements(propertyType))
                                return true;
+                       if (implicitOperator != null)
+                               return true;
                        if (propertyType.FullName == "System.Object")
                                return true;
  

diff --cc Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
index 9ed5ec3,14ea815..89cdd83
--- 1/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
--- 2/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
+++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@@@ -493,30 -508,12 +493,33 @@@
      <Compile Include="Issues\Bz59818.xaml.cs">
        <DependentUpon>Bz59818.xaml</DependentUpon>
      </Compile>
 -    <Compile Include="Issues\Bz60788.xaml.cs">
 -      <DependentUpon>Bz60788.xaml</DependentUpon>
 +    <Compile Include="ResourceDictionaryWithSource.xaml.cs">
 +      <DependentUpon>ResourceDictionaryWithSource.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="ResourceDictionaryWithInvalidSource.xaml.cs">
 +      <DependentUpon>ResourceDictionaryWithInvalidSource.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="Issues\Bz60575.xaml.cs">
 +      <DependentUpon>Bz60575.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="ResourceLoader.xaml.cs">
 +      <DependentUpon>ResourceLoader.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="Issues\Bz60203.xaml.cs">
 +      <DependentUpon>Bz60203.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="Issues\Bz55862.xaml.cs">
 +      <DependentUpon>Bz55862.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="ImplicitResourceDictionaries.xaml.cs">
 +      <DependentUpon>ImplicitResourceDictionaries.xaml</DependentUpon>
 +    </Compile>
 +    <Compile Include="AutoMergedResourceDictionaries.xaml.cs" >
 +      <DependentUpon>AutoMergedResourceDictionaries.xaml</DependentUpon>
      </Compile>
+     <Compile Include="Issues\Gh1346.xaml.cs">
+       <DependentUpon>Gh1346.xaml</DependentUpon>
+     </Compile>
    </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" />
@@@ -937,32 -937,12 +940,35 @@@
      <EmbeddedResource Include="Issues\Bz59818.xaml">
        <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
      </EmbeddedResource>
 -    <EmbeddedResource Include="Issues\Bz60788.xaml">
 +    <EmbeddedResource Include="ResourceDictionaryWithSource.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="AppResources\Colors.xaml" />
 +    <EmbeddedResource Include="AppResources\CompiledColors.xaml" />
 +    <EmbeddedResource Include="ResourceDictionaryWithInvalidSource.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="Issues\Bz60575.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="ResourceLoader.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="Issues\Bz60203.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="Issues\Bz55862.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="ImplicitResourceDictionaries.xaml">
 +      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="AutoMergedResourceDictionaries.xaml">
        <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
      </EmbeddedResource>
+     <EmbeddedResource Include="Issues\Gh1346.xaml">
+       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+     </EmbeddedResource>
    </ItemGroup>
    <ItemGroup>
      <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />