From def7da4bb26386b3f81cc3f54c20f83cbca7370b Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Wed, 20 Jun 2018 20:58:32 +0800 Subject: [PATCH 1/5] Rename Sample projects to avoid confusion with the CI tests. --- samples/{BindingTest => BindingDemo}/App.config | 0 samples/{BindingTest => BindingDemo}/App.xaml | 0 samples/{BindingTest => BindingDemo}/App.xaml.cs | 0 .../BindingTest.csproj => BindingDemo/BindingDemo.csproj} | 0 samples/{BindingTest => BindingDemo}/MainWindow.xaml | 0 samples/{BindingTest => BindingDemo}/MainWindow.xaml.cs | 0 samples/{BindingTest => BindingDemo}/TestItemView.xaml | 0 samples/{BindingTest => BindingDemo}/TestItemView.xaml.cs | 0 .../ViewModels/DataAnnotationsErrorViewModel.cs | 0 .../ViewModels/ExceptionErrorViewModel.cs | 0 .../ViewModels/IndeiErrorViewModel.cs | 0 .../ViewModels/MainWindowViewModel.cs | 0 .../ViewModels/NestedCommandViewModel.cs | 0 samples/{BindingTest => BindingDemo}/ViewModels/TestItem.cs | 0 samples/{RemoteTest => RemoteDemo}/Program.cs | 0 .../RemoteTest.csproj => RemoteDemo/RemoteDemo.csproj} | 0 samples/{RenderTest => RenderDemo}/App.config | 0 samples/{RenderTest => RenderDemo}/App.xaml | 0 samples/{RenderTest => RenderDemo}/App.xaml.cs | 0 samples/{RenderTest => RenderDemo}/MainWindow.xaml | 0 samples/{RenderTest => RenderDemo}/MainWindow.xaml.cs | 0 samples/{RenderTest => RenderDemo}/Pages/AnimationsPage.xaml | 0 samples/{RenderTest => RenderDemo}/Pages/AnimationsPage.xaml.cs | 0 samples/{RenderTest => RenderDemo}/Pages/ClippingPage.xaml | 0 samples/{RenderTest => RenderDemo}/Pages/ClippingPage.xaml.cs | 0 samples/{RenderTest => RenderDemo}/Pages/DrawingPage.xaml | 0 samples/{RenderTest => RenderDemo}/Pages/DrawingPage.xaml.cs | 0 .../RenderTest.csproj => RenderDemo/RenderDemo.csproj} | 0 samples/{RenderTest => RenderDemo}/SideBar.xaml | 0 .../ViewModels/AnimationsPageViewModel.cs | 0 .../{RenderTest => RenderDemo}/ViewModels/MainWindowViewModel.cs | 0 samples/{VirtualizationTest => VirtualizationDemo}/App.config | 0 samples/{VirtualizationTest => VirtualizationDemo}/App.xaml | 0 samples/{VirtualizationTest => VirtualizationDemo}/App.xaml.cs | 0 .../{VirtualizationTest => VirtualizationDemo}/MainWindow.xaml | 0 .../{VirtualizationTest => VirtualizationDemo}/MainWindow.xaml.cs | 0 samples/{VirtualizationTest => VirtualizationDemo}/Program.cs | 0 .../ViewModels/ItemViewModel.cs | 0 .../ViewModels/MainWindowViewModel.cs | 0 .../VirtualizationDemo.csproj} | 0 40 files changed, 0 insertions(+), 0 deletions(-) rename samples/{BindingTest => BindingDemo}/App.config (100%) rename samples/{BindingTest => BindingDemo}/App.xaml (100%) rename samples/{BindingTest => BindingDemo}/App.xaml.cs (100%) rename samples/{BindingTest/BindingTest.csproj => BindingDemo/BindingDemo.csproj} (100%) rename samples/{BindingTest => BindingDemo}/MainWindow.xaml (100%) rename samples/{BindingTest => BindingDemo}/MainWindow.xaml.cs (100%) rename samples/{BindingTest => BindingDemo}/TestItemView.xaml (100%) rename samples/{BindingTest => BindingDemo}/TestItemView.xaml.cs (100%) rename samples/{BindingTest => BindingDemo}/ViewModels/DataAnnotationsErrorViewModel.cs (100%) rename samples/{BindingTest => BindingDemo}/ViewModels/ExceptionErrorViewModel.cs (100%) rename samples/{BindingTest => BindingDemo}/ViewModels/IndeiErrorViewModel.cs (100%) rename samples/{BindingTest => BindingDemo}/ViewModels/MainWindowViewModel.cs (100%) rename samples/{BindingTest => BindingDemo}/ViewModels/NestedCommandViewModel.cs (100%) rename samples/{BindingTest => BindingDemo}/ViewModels/TestItem.cs (100%) rename samples/{RemoteTest => RemoteDemo}/Program.cs (100%) rename samples/{RemoteTest/RemoteTest.csproj => RemoteDemo/RemoteDemo.csproj} (100%) rename samples/{RenderTest => RenderDemo}/App.config (100%) rename samples/{RenderTest => RenderDemo}/App.xaml (100%) rename samples/{RenderTest => RenderDemo}/App.xaml.cs (100%) rename samples/{RenderTest => RenderDemo}/MainWindow.xaml (100%) rename samples/{RenderTest => RenderDemo}/MainWindow.xaml.cs (100%) rename samples/{RenderTest => RenderDemo}/Pages/AnimationsPage.xaml (100%) rename samples/{RenderTest => RenderDemo}/Pages/AnimationsPage.xaml.cs (100%) rename samples/{RenderTest => RenderDemo}/Pages/ClippingPage.xaml (100%) rename samples/{RenderTest => RenderDemo}/Pages/ClippingPage.xaml.cs (100%) rename samples/{RenderTest => RenderDemo}/Pages/DrawingPage.xaml (100%) rename samples/{RenderTest => RenderDemo}/Pages/DrawingPage.xaml.cs (100%) rename samples/{RenderTest/RenderTest.csproj => RenderDemo/RenderDemo.csproj} (100%) rename samples/{RenderTest => RenderDemo}/SideBar.xaml (100%) rename samples/{RenderTest => RenderDemo}/ViewModels/AnimationsPageViewModel.cs (100%) rename samples/{RenderTest => RenderDemo}/ViewModels/MainWindowViewModel.cs (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/App.config (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/App.xaml (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/App.xaml.cs (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/MainWindow.xaml (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/MainWindow.xaml.cs (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/Program.cs (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/ViewModels/ItemViewModel.cs (100%) rename samples/{VirtualizationTest => VirtualizationDemo}/ViewModels/MainWindowViewModel.cs (100%) rename samples/{VirtualizationTest/VirtualizationTest.csproj => VirtualizationDemo/VirtualizationDemo.csproj} (100%) diff --git a/samples/BindingTest/App.config b/samples/BindingDemo/App.config similarity index 100% rename from samples/BindingTest/App.config rename to samples/BindingDemo/App.config diff --git a/samples/BindingTest/App.xaml b/samples/BindingDemo/App.xaml similarity index 100% rename from samples/BindingTest/App.xaml rename to samples/BindingDemo/App.xaml diff --git a/samples/BindingTest/App.xaml.cs b/samples/BindingDemo/App.xaml.cs similarity index 100% rename from samples/BindingTest/App.xaml.cs rename to samples/BindingDemo/App.xaml.cs diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingDemo/BindingDemo.csproj similarity index 100% rename from samples/BindingTest/BindingTest.csproj rename to samples/BindingDemo/BindingDemo.csproj diff --git a/samples/BindingTest/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml similarity index 100% rename from samples/BindingTest/MainWindow.xaml rename to samples/BindingDemo/MainWindow.xaml diff --git a/samples/BindingTest/MainWindow.xaml.cs b/samples/BindingDemo/MainWindow.xaml.cs similarity index 100% rename from samples/BindingTest/MainWindow.xaml.cs rename to samples/BindingDemo/MainWindow.xaml.cs diff --git a/samples/BindingTest/TestItemView.xaml b/samples/BindingDemo/TestItemView.xaml similarity index 100% rename from samples/BindingTest/TestItemView.xaml rename to samples/BindingDemo/TestItemView.xaml diff --git a/samples/BindingTest/TestItemView.xaml.cs b/samples/BindingDemo/TestItemView.xaml.cs similarity index 100% rename from samples/BindingTest/TestItemView.xaml.cs rename to samples/BindingDemo/TestItemView.xaml.cs diff --git a/samples/BindingTest/ViewModels/DataAnnotationsErrorViewModel.cs b/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs similarity index 100% rename from samples/BindingTest/ViewModels/DataAnnotationsErrorViewModel.cs rename to samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs diff --git a/samples/BindingTest/ViewModels/ExceptionErrorViewModel.cs b/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs similarity index 100% rename from samples/BindingTest/ViewModels/ExceptionErrorViewModel.cs rename to samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs diff --git a/samples/BindingTest/ViewModels/IndeiErrorViewModel.cs b/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs similarity index 100% rename from samples/BindingTest/ViewModels/IndeiErrorViewModel.cs rename to samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs diff --git a/samples/BindingTest/ViewModels/MainWindowViewModel.cs b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs similarity index 100% rename from samples/BindingTest/ViewModels/MainWindowViewModel.cs rename to samples/BindingDemo/ViewModels/MainWindowViewModel.cs diff --git a/samples/BindingTest/ViewModels/NestedCommandViewModel.cs b/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs similarity index 100% rename from samples/BindingTest/ViewModels/NestedCommandViewModel.cs rename to samples/BindingDemo/ViewModels/NestedCommandViewModel.cs diff --git a/samples/BindingTest/ViewModels/TestItem.cs b/samples/BindingDemo/ViewModels/TestItem.cs similarity index 100% rename from samples/BindingTest/ViewModels/TestItem.cs rename to samples/BindingDemo/ViewModels/TestItem.cs diff --git a/samples/RemoteTest/Program.cs b/samples/RemoteDemo/Program.cs similarity index 100% rename from samples/RemoteTest/Program.cs rename to samples/RemoteDemo/Program.cs diff --git a/samples/RemoteTest/RemoteTest.csproj b/samples/RemoteDemo/RemoteDemo.csproj similarity index 100% rename from samples/RemoteTest/RemoteTest.csproj rename to samples/RemoteDemo/RemoteDemo.csproj diff --git a/samples/RenderTest/App.config b/samples/RenderDemo/App.config similarity index 100% rename from samples/RenderTest/App.config rename to samples/RenderDemo/App.config diff --git a/samples/RenderTest/App.xaml b/samples/RenderDemo/App.xaml similarity index 100% rename from samples/RenderTest/App.xaml rename to samples/RenderDemo/App.xaml diff --git a/samples/RenderTest/App.xaml.cs b/samples/RenderDemo/App.xaml.cs similarity index 100% rename from samples/RenderTest/App.xaml.cs rename to samples/RenderDemo/App.xaml.cs diff --git a/samples/RenderTest/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml similarity index 100% rename from samples/RenderTest/MainWindow.xaml rename to samples/RenderDemo/MainWindow.xaml diff --git a/samples/RenderTest/MainWindow.xaml.cs b/samples/RenderDemo/MainWindow.xaml.cs similarity index 100% rename from samples/RenderTest/MainWindow.xaml.cs rename to samples/RenderDemo/MainWindow.xaml.cs diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml similarity index 100% rename from samples/RenderTest/Pages/AnimationsPage.xaml rename to samples/RenderDemo/Pages/AnimationsPage.xaml diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml.cs b/samples/RenderDemo/Pages/AnimationsPage.xaml.cs similarity index 100% rename from samples/RenderTest/Pages/AnimationsPage.xaml.cs rename to samples/RenderDemo/Pages/AnimationsPage.xaml.cs diff --git a/samples/RenderTest/Pages/ClippingPage.xaml b/samples/RenderDemo/Pages/ClippingPage.xaml similarity index 100% rename from samples/RenderTest/Pages/ClippingPage.xaml rename to samples/RenderDemo/Pages/ClippingPage.xaml diff --git a/samples/RenderTest/Pages/ClippingPage.xaml.cs b/samples/RenderDemo/Pages/ClippingPage.xaml.cs similarity index 100% rename from samples/RenderTest/Pages/ClippingPage.xaml.cs rename to samples/RenderDemo/Pages/ClippingPage.xaml.cs diff --git a/samples/RenderTest/Pages/DrawingPage.xaml b/samples/RenderDemo/Pages/DrawingPage.xaml similarity index 100% rename from samples/RenderTest/Pages/DrawingPage.xaml rename to samples/RenderDemo/Pages/DrawingPage.xaml diff --git a/samples/RenderTest/Pages/DrawingPage.xaml.cs b/samples/RenderDemo/Pages/DrawingPage.xaml.cs similarity index 100% rename from samples/RenderTest/Pages/DrawingPage.xaml.cs rename to samples/RenderDemo/Pages/DrawingPage.xaml.cs diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderDemo/RenderDemo.csproj similarity index 100% rename from samples/RenderTest/RenderTest.csproj rename to samples/RenderDemo/RenderDemo.csproj diff --git a/samples/RenderTest/SideBar.xaml b/samples/RenderDemo/SideBar.xaml similarity index 100% rename from samples/RenderTest/SideBar.xaml rename to samples/RenderDemo/SideBar.xaml diff --git a/samples/RenderTest/ViewModels/AnimationsPageViewModel.cs b/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs similarity index 100% rename from samples/RenderTest/ViewModels/AnimationsPageViewModel.cs rename to samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs diff --git a/samples/RenderTest/ViewModels/MainWindowViewModel.cs b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs similarity index 100% rename from samples/RenderTest/ViewModels/MainWindowViewModel.cs rename to samples/RenderDemo/ViewModels/MainWindowViewModel.cs diff --git a/samples/VirtualizationTest/App.config b/samples/VirtualizationDemo/App.config similarity index 100% rename from samples/VirtualizationTest/App.config rename to samples/VirtualizationDemo/App.config diff --git a/samples/VirtualizationTest/App.xaml b/samples/VirtualizationDemo/App.xaml similarity index 100% rename from samples/VirtualizationTest/App.xaml rename to samples/VirtualizationDemo/App.xaml diff --git a/samples/VirtualizationTest/App.xaml.cs b/samples/VirtualizationDemo/App.xaml.cs similarity index 100% rename from samples/VirtualizationTest/App.xaml.cs rename to samples/VirtualizationDemo/App.xaml.cs diff --git a/samples/VirtualizationTest/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml similarity index 100% rename from samples/VirtualizationTest/MainWindow.xaml rename to samples/VirtualizationDemo/MainWindow.xaml diff --git a/samples/VirtualizationTest/MainWindow.xaml.cs b/samples/VirtualizationDemo/MainWindow.xaml.cs similarity index 100% rename from samples/VirtualizationTest/MainWindow.xaml.cs rename to samples/VirtualizationDemo/MainWindow.xaml.cs diff --git a/samples/VirtualizationTest/Program.cs b/samples/VirtualizationDemo/Program.cs similarity index 100% rename from samples/VirtualizationTest/Program.cs rename to samples/VirtualizationDemo/Program.cs diff --git a/samples/VirtualizationTest/ViewModels/ItemViewModel.cs b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs similarity index 100% rename from samples/VirtualizationTest/ViewModels/ItemViewModel.cs rename to samples/VirtualizationDemo/ViewModels/ItemViewModel.cs diff --git a/samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs similarity index 100% rename from samples/VirtualizationTest/ViewModels/MainWindowViewModel.cs rename to samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj similarity index 100% rename from samples/VirtualizationTest/VirtualizationTest.csproj rename to samples/VirtualizationDemo/VirtualizationDemo.csproj From 935074431c09d5e4d32d7ad3420172df55958019 Mon Sep 17 00:00:00 2001 From: Benedikt Schroeder Date: Wed, 20 Jun 2018 15:01:17 +0200 Subject: [PATCH 2/5] Normalize whitespaces in path data --- .../Media/PathMarkupParser.cs | 50 +++++++++++++++++-- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs index e8824753b5..46a4de637d 100644 --- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs +++ b/src/Avalonia.Visuals/Media/PathMarkupParser.cs @@ -82,7 +82,9 @@ namespace Avalonia.Media /// The path data. public void Parse(string pathData) { - var tokens = ParseTokens(pathData); + var normalizedPathData = NormalizeWhiteSpaces(pathData); + + var tokens = ParseTokens(normalizedPathData); CreateGeometry(tokens); } @@ -107,6 +109,42 @@ namespace Avalonia.Media _isDisposed = true; } + private static string NormalizeWhiteSpaces(string s) + { + int length = s.Length, + index = 0, + i = 0; + var source = s.ToCharArray(); + var skip = false; + + for (; i < length; i++) + { + var c = source[i]; + + if (char.IsWhiteSpace(c)) + { + if (skip) + { + continue; + } + + source[index++] = c; + skip = true; + continue; + } + + skip = false; + source[index++] = c; + } + + if (char.IsWhiteSpace(source[index - 1])) + { + index--; + } + + return char.IsWhiteSpace(source[0]) ? new string(source, 1, index) : new string(source, 0, index); + } + private static string CreatesSeparatorPattern() { var stringBuilder = new StringBuilder(); @@ -123,7 +161,9 @@ namespace Avalonia.Media private static IEnumerable ParseTokens(string s) { - return Regex.Split(s, s_separatorPattern).Where(t => !string.IsNullOrEmpty(t)).Select(CommandToken.Parse); + var expressions = Regex.Split(s, s_separatorPattern).Where(t => !string.IsNullOrEmpty(t)); + + return expressions.Select(CommandToken.Parse); } private static Point MirrorControlPoint(Point controlPoint, Point center) @@ -135,7 +175,7 @@ namespace Avalonia.Media private void CreateGeometry(IEnumerable commandTokens) { - _currentPoint = new Point(); + _currentPoint = new Point(); foreach (var commandToken in commandTokens) { @@ -468,7 +508,7 @@ namespace Avalonia.Media private List Arguments { get; } public static CommandToken Parse(string s) - { + { using (var reader = new StringReader(s)) { var command = Command.None; @@ -590,7 +630,7 @@ namespace Avalonia.Media var y = ReadDouble(); return new Point(origin.X + x, origin.Y + y); - } + } private static bool ReadCommand(TextReader reader, ref Command command, ref bool relative) { From 977010de9573a11953d30051393c840ba40b835c Mon Sep 17 00:00:00 2001 From: Benedikt Schroeder Date: Wed, 20 Jun 2018 15:17:52 +0200 Subject: [PATCH 3/5] Added unit tests --- .../Media/PathMarkupParserTests.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs index c8bea43fb0..35ec38789e 100644 --- a/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs @@ -7,6 +7,8 @@ using Xunit; namespace Avalonia.Visuals.UnitTests.Media { + using System.IO; + public class PathMarkupParserTests { [Fact] @@ -140,6 +142,7 @@ namespace Avalonia.Visuals.UnitTests.Media } [Theory] + [InlineData(" M0 0")] [InlineData("F1 M24,14 A2,2,0,1,1,20,14 A2,2,0,1,1,24,14 z")] // issue #1107 [InlineData("M0 0L10 10z")] [InlineData("M50 50 L100 100 L150 50")] @@ -173,5 +176,18 @@ namespace Avalonia.Visuals.UnitTests.Media Assert.True(true); } } + + [Theory] + [InlineData("0 0")] + [InlineData("j")] + public void Throws_InvalidDataException_On_None_Defined_Command(string pathData) + { + var pathGeometry = new PathGeometry(); + using (var context = new PathGeometryContext(pathGeometry)) + using (var parser = new PathMarkupParser(context)) + { + Assert.Throws(() => parser.Parse(pathData)); + } + } } } \ No newline at end of file From b35e2456eb461d378e3f0210346426265b1e77e4 Mon Sep 17 00:00:00 2001 From: Benedikt Schroeder Date: Wed, 20 Jun 2018 15:39:34 +0200 Subject: [PATCH 4/5] Code style --- src/Avalonia.Visuals/Media/PathMarkupParser.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs index 46a4de637d..a322d404bf 100644 --- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs +++ b/src/Avalonia.Visuals/Media/PathMarkupParser.cs @@ -83,7 +83,6 @@ namespace Avalonia.Media public void Parse(string pathData) { var normalizedPathData = NormalizeWhiteSpaces(pathData); - var tokens = ParseTokens(normalizedPathData); CreateGeometry(tokens); @@ -129,11 +128,14 @@ namespace Avalonia.Media } source[index++] = c; + skip = true; + continue; } skip = false; + source[index++] = c; } From 7b1c9bde187124a2707d31fe64655353d542b8f3 Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Wed, 20 Jun 2018 21:48:48 +0800 Subject: [PATCH 5/5] Replace namespaces accordingly; Rename projects on main sln file. --- Avalonia.sln | 8 ++++---- samples/BindingDemo/App.xaml.cs | 2 +- samples/BindingDemo/MainWindow.xaml | 4 ++-- samples/BindingDemo/MainWindow.xaml.cs | 4 ++-- samples/BindingDemo/TestItemView.xaml.cs | 2 +- .../ViewModels/DataAnnotationsErrorViewModel.cs | 2 +- samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs | 2 +- samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs | 2 +- samples/BindingDemo/ViewModels/MainWindowViewModel.cs | 2 +- samples/BindingDemo/ViewModels/NestedCommandViewModel.cs | 2 +- samples/BindingDemo/ViewModels/TestItem.cs | 2 +- samples/RemoteDemo/Program.cs | 2 +- samples/RenderDemo/App.xaml | 2 +- samples/RenderDemo/App.xaml.cs | 2 +- samples/RenderDemo/MainWindow.xaml | 2 +- samples/RenderDemo/MainWindow.xaml.cs | 4 ++-- samples/RenderDemo/Pages/AnimationsPage.xaml.cs | 4 ++-- samples/RenderDemo/Pages/ClippingPage.xaml.cs | 2 +- samples/RenderDemo/Pages/DrawingPage.xaml.cs | 2 +- samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs | 2 +- samples/RenderDemo/ViewModels/MainWindowViewModel.cs | 2 +- samples/VirtualizationDemo/App.xaml.cs | 2 +- samples/VirtualizationDemo/MainWindow.xaml.cs | 4 ++-- samples/VirtualizationDemo/Program.cs | 2 +- samples/VirtualizationDemo/ViewModels/ItemViewModel.cs | 2 +- .../VirtualizationDemo/ViewModels/MainWindowViewModel.cs | 2 +- 26 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Avalonia.sln b/Avalonia.sln index 54f6f5e7e7..39dc11f41f 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -71,7 +71,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup", "src\Mark EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.UnitTests", "tests\Avalonia.Markup.UnitTests\Avalonia.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BindingTest", "samples\BindingTest\BindingTest.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BindingDemo", "samples\BindingDemo\BindingDemo.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RenderHelpers", "src\Shared\RenderHelpers\RenderHelpers.shproj", "{3C4C0CB4-0C0F-4450-A37B-148C84FF905F}" EndProject @@ -109,7 +109,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.TestApp", "tests\Avalonia.DesignerSupport.TestApp\Avalonia.DesignerSupport.TestApp.csproj", "{F1381F98-4D24-409A-A6C5-1C5B1E08BB08}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualizationTest", "samples\VirtualizationTest\VirtualizationTest.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualizationDemo", "samples\VirtualizationDemo\VirtualizationDemo.csproj", "{FBCAF3D0-2808-4934-8E96-3F607594517B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interop", "Interop", "{A0CC0258-D18C-4AB3-854F-7101680FC3F9}" EndProject @@ -117,7 +117,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsInteropTest", "sampl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DotNetFrameworkRuntime", "src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj", "{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderTest", "samples\RenderTest\RenderTest.csproj", "{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderDemo", "samples\RenderDemo\RenderDemo.csproj", "{F1FDC5B0-4654-416F-AE69-E3E9BBD87801}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Android", "samples\ControlCatalog.Android\ControlCatalog.Android.csproj", "{29132311-1848-4FD6-AE0C-4FF841151BD3}" EndProject @@ -169,7 +169,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteTest", "samples\RemoteTest\RemoteTest.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteDemo", "samples\RemoteDemo\RemoteDemo.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4ED8B739-6F4E-4CD4-B993-545E6B5CE637}" EndProject diff --git a/samples/BindingDemo/App.xaml.cs b/samples/BindingDemo/App.xaml.cs index ccad1d0ba9..01c52a2a49 100644 --- a/samples/BindingDemo/App.xaml.cs +++ b/samples/BindingDemo/App.xaml.cs @@ -5,7 +5,7 @@ using Avalonia.Logging.Serilog; using Avalonia.Markup.Xaml; using Serilog; -namespace BindingTest +namespace BindingDemo { public class App : Application { diff --git a/samples/BindingDemo/MainWindow.xaml b/samples/BindingDemo/MainWindow.xaml index 6b80225686..a69fb75742 100644 --- a/samples/BindingDemo/MainWindow.xaml +++ b/samples/BindingDemo/MainWindow.xaml @@ -1,7 +1,7 @@ diff --git a/samples/BindingDemo/MainWindow.xaml.cs b/samples/BindingDemo/MainWindow.xaml.cs index c1c3c09406..eaa57e1f5f 100644 --- a/samples/BindingDemo/MainWindow.xaml.cs +++ b/samples/BindingDemo/MainWindow.xaml.cs @@ -1,9 +1,9 @@ -using BindingTest.ViewModels; +using BindingDemo.ViewModels; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace BindingTest +namespace BindingDemo { public class MainWindow : Window { diff --git a/samples/BindingDemo/TestItemView.xaml.cs b/samples/BindingDemo/TestItemView.xaml.cs index 32f367ef68..8c0b592f00 100644 --- a/samples/BindingDemo/TestItemView.xaml.cs +++ b/samples/BindingDemo/TestItemView.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace BindingTest +namespace BindingDemo { public class TestItemView : UserControl { diff --git a/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs b/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs index 634498c165..e274f9180e 100644 --- a/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs +++ b/samples/BindingDemo/ViewModels/DataAnnotationsErrorViewModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; -namespace BindingTest.ViewModels +namespace BindingDemo.ViewModels { public class DataAnnotationsErrorViewModel { diff --git a/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs b/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs index e6071e0678..2ab6c26e68 100644 --- a/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs +++ b/samples/BindingDemo/ViewModels/ExceptionErrorViewModel.cs @@ -4,7 +4,7 @@ using ReactiveUI; using System; -namespace BindingTest.ViewModels +namespace BindingDemo.ViewModels { public class ExceptionErrorViewModel : ReactiveObject { diff --git a/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs b/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs index b4bb528abb..bb3b4d64e9 100644 --- a/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs +++ b/samples/BindingDemo/ViewModels/IndeiErrorViewModel.cs @@ -6,7 +6,7 @@ using System; using System.ComponentModel; using System.Collections; -namespace BindingTest.ViewModels +namespace BindingDemo.ViewModels { public class IndeiErrorViewModel : ReactiveObject, INotifyDataErrorInfo { diff --git a/samples/BindingDemo/ViewModels/MainWindowViewModel.cs b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs index 1116810ccb..858fb5159a 100644 --- a/samples/BindingDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/BindingDemo/ViewModels/MainWindowViewModel.cs @@ -6,7 +6,7 @@ using System.Reactive.Linq; using System.Threading.Tasks; using System.Threading; -namespace BindingTest.ViewModels +namespace BindingDemo.ViewModels { public class MainWindowViewModel : ReactiveObject { diff --git a/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs b/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs index 886ecbed8e..0e9139ab98 100644 --- a/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs +++ b/samples/BindingDemo/ViewModels/NestedCommandViewModel.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace BindingTest.ViewModels +namespace BindingDemo.ViewModels { public class NestedCommandViewModel : ReactiveObject { diff --git a/samples/BindingDemo/ViewModels/TestItem.cs b/samples/BindingDemo/ViewModels/TestItem.cs index 2326a92b7d..5a9f192f58 100644 --- a/samples/BindingDemo/ViewModels/TestItem.cs +++ b/samples/BindingDemo/ViewModels/TestItem.cs @@ -1,6 +1,6 @@ using ReactiveUI; -namespace BindingTest.ViewModels +namespace BindingDemo.ViewModels { public class TestItem : ReactiveObject { diff --git a/samples/RemoteDemo/Program.cs b/samples/RemoteDemo/Program.cs index f518e77143..0565b676fb 100644 --- a/samples/RemoteDemo/Program.cs +++ b/samples/RemoteDemo/Program.cs @@ -9,7 +9,7 @@ using Avalonia.Remote.Protocol; using Avalonia.Threading; using ControlCatalog; -namespace RemoteTest +namespace RemoteDemo { class Program { diff --git a/samples/RenderDemo/App.xaml b/samples/RenderDemo/App.xaml index c119f54915..aee75cb139 100644 --- a/samples/RenderDemo/App.xaml +++ b/samples/RenderDemo/App.xaml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/samples/RenderDemo/App.xaml.cs b/samples/RenderDemo/App.xaml.cs index fd2b940f6a..0f627961e6 100644 --- a/samples/RenderDemo/App.xaml.cs +++ b/samples/RenderDemo/App.xaml.cs @@ -5,7 +5,7 @@ using Avalonia; using Avalonia.Logging.Serilog; using Avalonia.Markup.Xaml; -namespace RenderTest +namespace RenderDemo { public class App : Application { diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml index da49054b77..df2b221423 100644 --- a/samples/RenderDemo/MainWindow.xaml +++ b/samples/RenderDemo/MainWindow.xaml @@ -1,6 +1,6 @@ diff --git a/samples/RenderDemo/MainWindow.xaml.cs b/samples/RenderDemo/MainWindow.xaml.cs index 76a8e81aca..f1f974f7a1 100644 --- a/samples/RenderDemo/MainWindow.xaml.cs +++ b/samples/RenderDemo/MainWindow.xaml.cs @@ -5,10 +5,10 @@ using System; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using RenderTest.ViewModels; +using RenderDemo.ViewModels; using ReactiveUI; -namespace RenderTest +namespace RenderDemo { public class MainWindow : Window { diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml.cs b/samples/RenderDemo/Pages/AnimationsPage.xaml.cs index 2623721393..5b02fd9297 100644 --- a/samples/RenderDemo/Pages/AnimationsPage.xaml.cs +++ b/samples/RenderDemo/Pages/AnimationsPage.xaml.cs @@ -7,9 +7,9 @@ using Avalonia.Data; using Avalonia.Input; using Avalonia.Markup.Xaml; using Avalonia.Media; -using RenderTest.ViewModels; +using RenderDemo.ViewModels; -namespace RenderTest.Pages +namespace RenderDemo.Pages { public class AnimationsPage : UserControl { diff --git a/samples/RenderDemo/Pages/ClippingPage.xaml.cs b/samples/RenderDemo/Pages/ClippingPage.xaml.cs index 2a79076d4c..5357181838 100644 --- a/samples/RenderDemo/Pages/ClippingPage.xaml.cs +++ b/samples/RenderDemo/Pages/ClippingPage.xaml.cs @@ -7,7 +7,7 @@ using Avalonia.Data; using Avalonia.Markup.Xaml; using Avalonia.Media; -namespace RenderTest.Pages +namespace RenderDemo.Pages { public class ClippingPage : UserControl { diff --git a/samples/RenderDemo/Pages/DrawingPage.xaml.cs b/samples/RenderDemo/Pages/DrawingPage.xaml.cs index 3bf9bd545d..3475e1aa07 100644 --- a/samples/RenderDemo/Pages/DrawingPage.xaml.cs +++ b/samples/RenderDemo/Pages/DrawingPage.xaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace RenderTest.Pages +namespace RenderDemo.Pages { public class DrawingPage : UserControl { diff --git a/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs b/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs index 17eee547a1..626a3e7c77 100644 --- a/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs +++ b/samples/RenderDemo/ViewModels/AnimationsPageViewModel.cs @@ -2,7 +2,7 @@ using ReactiveUI; using Avalonia.Animation; -namespace RenderTest.ViewModels +namespace RenderDemo.ViewModels { public class AnimationsPageViewModel : ReactiveObject { diff --git a/samples/RenderDemo/ViewModels/MainWindowViewModel.cs b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs index 02a2abeb89..0cb5e1b87b 100644 --- a/samples/RenderDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/RenderDemo/ViewModels/MainWindowViewModel.cs @@ -1,7 +1,7 @@ using System; using ReactiveUI; -namespace RenderTest.ViewModels +namespace RenderDemo.ViewModels { public class MainWindowViewModel : ReactiveObject { diff --git a/samples/VirtualizationDemo/App.xaml.cs b/samples/VirtualizationDemo/App.xaml.cs index 14ab5b3f84..b220807443 100644 --- a/samples/VirtualizationDemo/App.xaml.cs +++ b/samples/VirtualizationDemo/App.xaml.cs @@ -4,7 +4,7 @@ using Avalonia; using Avalonia.Markup.Xaml; -namespace VirtualizationTest +namespace VirtualizationDemo { public class App : Application { diff --git a/samples/VirtualizationDemo/MainWindow.xaml.cs b/samples/VirtualizationDemo/MainWindow.xaml.cs index 952383dffb..271519b10b 100644 --- a/samples/VirtualizationDemo/MainWindow.xaml.cs +++ b/samples/VirtualizationDemo/MainWindow.xaml.cs @@ -4,9 +4,9 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; -using VirtualizationTest.ViewModels; +using VirtualizationDemo.ViewModels; -namespace VirtualizationTest +namespace VirtualizationDemo { public class MainWindow : Window { diff --git a/samples/VirtualizationDemo/Program.cs b/samples/VirtualizationDemo/Program.cs index 097f0cfdc7..98f1f08d6c 100644 --- a/samples/VirtualizationDemo/Program.cs +++ b/samples/VirtualizationDemo/Program.cs @@ -7,7 +7,7 @@ using Avalonia.Controls; using Avalonia.Logging.Serilog; using Serilog; -namespace VirtualizationTest +namespace VirtualizationDemo { class Program { diff --git a/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs index 75777012c1..e883cdfeb9 100644 --- a/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs +++ b/samples/VirtualizationDemo/ViewModels/ItemViewModel.cs @@ -4,7 +4,7 @@ using System; using ReactiveUI; -namespace VirtualizationTest.ViewModels +namespace VirtualizationDemo.ViewModels { internal class ItemViewModel : ReactiveObject { diff --git a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs index 8eab91e06d..eb08ef9656 100644 --- a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs +++ b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs @@ -9,7 +9,7 @@ using Avalonia.Controls; using Avalonia.Controls.Primitives; using ReactiveUI; -namespace VirtualizationTest.ViewModels +namespace VirtualizationDemo.ViewModels { internal class MainWindowViewModel : ReactiveObject {