From a955f73a3e15303aac3b34e892c3963b1594a7af Mon Sep 17 00:00:00 2001 From: Andrey Kunchev Date: Fri, 19 Oct 2018 01:43:23 +0300 Subject: [PATCH 1/4] failing unittest for nested multibinding --- .../Data/MultiBindingTests.cs | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs index fb23a38cce..78c538d99d 100644 --- a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs +++ b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs @@ -41,6 +41,37 @@ namespace Avalonia.Markup.UnitTests.Data Assert.Equal("1,2,3", result); } + [Fact] + public async Task Nested_MultiBinding_Should_Be_Set_Up() + { + var source = new { A = 1, B = 2, C = 3 }; + var binding = new MultiBinding + { + Converter = new ConcatConverter(), + Bindings = + { + new Binding { Path = "A" }, + new MultiBinding + { + Converter = new ConcatConverter(), + Bindings = + { + new Binding { Path = "B"}, + new Binding { Path = "C"} + } + } + } + }; + + var target = new Mock().As(); + target.Setup(x => x.GetValue(Control.DataContextProperty)).Returns(source); + + var observable = binding.Initiate(target.Object, null).Observable; + var result = await observable.Take(1); + + Assert.Equal("1,2,3", result); + } + [Fact] public void Should_Return_FallbackValue_When_Converter_Returns_UnsetValue() { From 0a5329f6a361b937aa2589fdf1ca93691a2a1cf5 Mon Sep 17 00:00:00 2001 From: Andrey Kunchev Date: Fri, 19 Oct 2018 01:47:22 +0300 Subject: [PATCH 2/4] fix nested multibinding work again --- src/Markup/Avalonia.Markup/Data/MultiBinding.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs index 4c47ef32e0..4921b7c9d7 100644 --- a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs +++ b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs @@ -61,7 +61,7 @@ namespace Avalonia.Data var targetType = targetProperty?.PropertyType ?? typeof(object); var children = Bindings.Select(x => x.Initiate(target, null)); - var input = children.Select(x => x.Subject).CombineLatest().Select(x => ConvertValue(x, targetType)); + var input = children.Select(x => x.Observable).CombineLatest().Select(x => ConvertValue(x, targetType)); var mode = Mode == BindingMode.Default ? targetProperty?.GetMetadata(target.GetType()).DefaultBindingMode : Mode; From 4aaee5360202dad62c8f68c3552a606e99cce809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Tue, 23 Oct 2018 23:15:26 +0200 Subject: [PATCH 3/4] Updated Cake and script tools and addins --- build.cake | 41 ++--------------------------------------- tools/packages.config | 2 +- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/build.cake b/build.cake index 56653109ae..d653e9da58 100644 --- a/build.cake +++ b/build.cake @@ -3,8 +3,8 @@ /////////////////////////////////////////////////////////////////////////////// #addin "nuget:?package=NuGet.Core&version=2.14.0" -#tool "nuget:?package=NuGet.CommandLine&version=4.3.0" -#tool "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2017.1.20170613.162720" +#tool "nuget:?package=NuGet.CommandLine&version=4.7.1" +#tool "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2018.2.3" /////////////////////////////////////////////////////////////////////////////// // TOOLS @@ -311,42 +311,6 @@ Task("Publish-NuGet-Impl") Information("Publish-NuGet Task failed, but continuing with next Task..."); }); -Task("Inspect-Impl") - .WithCriteria((context, data) => data.Parameters.IsRunningOnWindows) - .Does(() => -{ - var badIssues = new []{"PossibleNullReferenceException"}; - var whitelist = new []{"tests", "src\\android", "src\\ios", - "src\\markup\\avalonia.markup.xaml\\portablexaml\\portable.xaml.github"}; - Information("Running code inspections"); - - var exitCode = StartProcess(Context.Tools.Resolve("inspectcode.exe"), - new ProcessSettings - { - Arguments = "--output=artifacts\\inspectcode.xml --profile=Avalonia.sln.DotSettings Avalonia.sln", - RedirectStandardOutput = true - }); - - Information("Analyzing report"); - var doc = XDocument.Parse(System.IO.File.ReadAllText("artifacts\\inspectcode.xml")); - var failBuild = false; - foreach(var xml in doc.Descendants("Issue")) - { - var typeId = xml.Attribute("TypeId").Value.ToString(); - if(badIssues.Contains(typeId)) - { - var file = xml.Attribute("File").Value.ToString().ToLower(); - if(whitelist.Any(wh => file.StartsWith(wh))) - continue; - var line = xml.Attribute("Line").Value.ToString(); - Error(typeId + " - " + file + " on line " + line); - failBuild = true; - } - } - if(failBuild) - throw new Exception("Issues found"); -}); - /////////////////////////////////////////////////////////////////////////////// // TARGETS /////////////////////////////////////////////////////////////////////////////// @@ -364,7 +328,6 @@ Task("Run-Tests") Task("Package") .IsDependentOn("Run-Tests") - .IsDependentOn("Inspect-Impl") .IsDependentOn("Create-NuGet-Packages-Impl"); Task("AppVeyor") diff --git a/tools/packages.config b/tools/packages.config index 3c65df896f..05018882e8 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -1,4 +1,4 @@ - + From 70812de8e234d4ef141a386f5be90efed46b24c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Tue, 23 Oct 2018 23:26:53 +0200 Subject: [PATCH 4/4] Install castxml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d80d24f32c..b0c0c807cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ mono: - 5.2.0 dotnet: 2.1.200 script: + - sudo apt-get update + - sudo apt-get install castxml - ./build.sh --target "Travis" --configuration "Release" notifications: email: false