From e142bc10fb40c2faec600346c584ae5bd0f0772e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 17 Jun 2016 16:31:00 +0200 Subject: [PATCH] Don't build mobile stuff in NCrunch. --- .../Avalonia.Android.v2.ncrunchproject | 8 ++--- ...valonia.Skia.iOS.TestApp.v2.ncrunchproject | 8 ++--- .../Avalonia.Skia.iOS.v2.ncrunchproject | 8 ++--- .../Xaml/StyleTests.cs | 30 +++++++++++++++++++ 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject b/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject index 30815b1937..f744eecae0 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject +++ b/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject @@ -7,7 +7,7 @@ true false false - false + true false false true @@ -17,9 +17,9 @@ true true 60000 - - - + + + AutoDetect STA x86 diff --git a/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject b/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject index 30815b1937..f744eecae0 100644 --- a/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject +++ b/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.v2.ncrunchproject @@ -7,7 +7,7 @@ true false false - false + true false false true @@ -17,9 +17,9 @@ true true 60000 - - - + + + AutoDetect STA x86 diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject index 30815b1937..f744eecae0 100644 --- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject +++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject @@ -7,7 +7,7 @@ true false false - false + true false false true @@ -17,9 +17,9 @@ true true 60000 - - - + + + AutoDetect STA x86 diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs index e4f95dfe99..b0451c951f 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs @@ -224,5 +224,35 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml Assert.Equal(0xffff0000, borderBrush.Color.ToUint32()); } } + + [Fact] + public void Setter_Can_Contain_Template() + { + using (UnitTestApplication.Start(TestServices.StyledWindow)) + { + var xaml = @" + + + + + + +"; + + var loader = new AvaloniaXamlLoader(); + var window = (Window)loader.Load(xaml); + var target = window.Find("target"); + + Assert.IsType(target.Content); + Assert.Equal("Hello World!", ((TextBlock)target.Content).Text); + } + } } }