Browse Source

Fixed escaped attribute values (e. g. StringFormat="\{0\}!")

pull/2902/head
Nikita Tsukanov 7 years ago
parent
commit
766a4d69c8
  1. 2
      src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github
  2. 8
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs

2
src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github

@ -1 +1 @@
Subproject commit 2bfb0ccaddcd311bc8948eec475d1a8744a8d645
Subproject commit c7155c5f6c1a5153ee2d8cd78e5d1524dd6744cf

8
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BindingTests.cs

@ -335,8 +335,10 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
}
}
[Fact]
public void MultiBinding_To_TextBlock_Text_With_StringConverter_Works()
[Theory,
InlineData("{}{0} {1}!"),
InlineData(@"\{0\} \{1\}!")]
public void MultiBinding_To_TextBlock_Text_With_StringConverter_Works(string fmt)
{
using (UnitTestApplication.Start(TestServices.StyledWindow))
{
@ -346,7 +348,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
<TextBlock Name='textBlock'>
<TextBlock.Text>
<MultiBinding StringFormat='{}{0} {1}!'>
<MultiBinding StringFormat='" + fmt + @"'>
<Binding Path='Greeting1'/>
<Binding Path='Greeting2'/>
</MultiBinding>

Loading…
Cancel
Save