summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Delcroix <stephane@delcroix.org>2017-03-22 17:53:24 +0100
committerRui Marinho <me@ruimarinho.net>2017-03-22 16:53:24 +0000
commitebc978b6961817ea61d6d6d349a5853c46df903f (patch)
tree401e8b8d4f76b2c027c43b11eec09406b148f6b3
parent8cc913794d1c58bb1961a676387016e6df31b81a (diff)
downloadxamarin-forms-ebc978b6961817ea61d6d6d349a5853c46df903f.tar.gz
xamarin-forms-ebc978b6961817ea61d6d6d349a5853c46df903f.tar.bz2
xamarin-forms-ebc978b6961817ea61d6d6d349a5853c46df903f.zip
[XamlC] accept assignment of Object from unboxed value types in SetValue (#832)
-rw-r--r--Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs4
-rw-r--r--Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml9
-rw-r--r--Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs77
-rw-r--r--Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj6
4 files changed, 96 insertions, 0 deletions
diff --git a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
index 8b2a25fb..6f07b375 100644
--- a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
+++ b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
@@ -903,6 +903,10 @@ namespace Xamarin.Forms.Build.Tasks
if (implicitOperator != null)
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);
}
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml
new file mode 100644
index 00000000..540f476d
--- /dev/null
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml
@@ -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> \ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs
new file mode 100644
index 00000000..829dd5e9
--- /dev/null
+++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs
@@ -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));
+ }
+
+ }
+ }
+} \ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
index e2162091..b9c30350 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
+++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@@ -458,6 +458,9 @@
<Compile Include="Issues\Bz53381App.xaml.cs">
<DependentUpon>Bz53381App.xaml</DependentUpon>
</Compile>
+ <Compile Include="Issues\Bz53203.xaml.cs">
+ <DependentUpon>Bz53203.xaml</DependentUpon>
+ </Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" />
@@ -836,6 +839,9 @@
<EmbeddedResource Include="Issues\Bz53381App.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
+ <EmbeddedResource Include="Issues\Bz53203.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />