[XamlC] accept assignment of Object from unboxed value types in SetValue (#832)

This commit is contained in:
Stephane Delcroix 2017-03-22 17:53:24 +01:00 коммит произвёл Rui Marinho
Родитель 8cc913794d
Коммит ebc978b696
4 изменённых файлов: 96 добавлений и 0 удалений

Просмотреть файл

@ -903,6 +903,10 @@ namespace Xamarin.Forms.Build.Tasks
if (implicitOperator != null) if (implicitOperator != null)
return true; return true;
//as we're in the SetValue Scenario, we can accept value types, they'll be boxed
if (varValue.VariableType.IsValueType && bpTypeRef.FullName == "System.Object")
return true;
return varValue.VariableType.InheritsFromOrImplements(bpTypeRef); return varValue.VariableType.InheritsFromOrImplements(bpTypeRef);
} }

Просмотреть файл

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Xamarin.Forms.Xaml.UnitTests"
x:Class="Xamarin.Forms.Xaml.UnitTests.Bz53203">
<Label x:Name="label0"
Grid.Row="{x:Static local:Bz53203.IntValue}"
local:Bz53203.Parameter="{x:Static local:Bz53203Values.Better}"/>
</ContentPage>

Просмотреть файл

@ -0,0 +1,77 @@
using System;
using System.Collections.Generic;
using NUnit.Framework;
using Xamarin.Forms.Core.UnitTests;
using Xamarin.Forms;
namespace Xamarin.Forms.Xaml.UnitTests
{
public enum Bz53203Values
{
Unknown,
Good,
Better,
Best
}
public partial class Bz53203 : ContentPage
{
public static int IntValue = 42;
public static object ObjValue = new object();
public static readonly BindableProperty ParameterProperty = BindableProperty.CreateAttached("Parameter",
typeof(object), typeof(Bz53203), null);
public static object GetParameter(BindableObject obj) =>
obj.GetValue(ParameterProperty);
public static void SetParameter(BindableObject obj, object value) =>
obj.SetValue(ParameterProperty, value);
public Bz53203()
{
InitializeComponent();
}
public Bz53203(bool useCompiledXaml)
{
//this stub will be replaced at compile time
}
[TestFixture]
class Tests
{
[SetUp]
public void Setup()
{
Device.PlatformServices = new MockPlatformServices();
}
[TearDown]
public void TearDown()
{
Device.PlatformServices = null;
}
[TestCase(true)]
public void MarkupOnAttachedBPDoesNotThrowAtCompileTime(bool useCompiledXaml)
{
MockCompiler.Compile(typeof(Bz53203));
}
[TestCase(true)]
[TestCase(false)]
public void MarkupOnAttachedBP(bool useCompiledXaml)
{
var page = new Bz53203(useCompiledXaml);
var label = page.label0;
Assert.That(Grid.GetRow(label), Is.EqualTo(42));
Assert.That(GetParameter(label), Is.EqualTo(Bz53203Values.Better));
}
}
}
}

Просмотреть файл

@ -458,6 +458,9 @@
<Compile Include="Issues\Bz53381App.xaml.cs"> <Compile Include="Issues\Bz53381App.xaml.cs">
<DependentUpon>Bz53381App.xaml</DependentUpon> <DependentUpon>Bz53381App.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Issues\Bz53203.xaml.cs">
<DependentUpon>Bz53203.xaml</DependentUpon>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" /> <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" />
@ -836,6 +839,9 @@
<EmbeddedResource Include="Issues\Bz53381App.xaml"> <EmbeddedResource Include="Issues\Bz53381App.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Issues\Bz53203.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />