From 4ca0bb72b29a0b3d8e5d686c84604ac251c927a2 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 1 Mar 2017 08:46:21 +0100 Subject: [PATCH 1/4] Added GetObservable for routed events. Fixes #905. --- .../InteractiveExtensions.cs | 30 +++++++++++++++++-- .../Avalonia.Interactivity.UnitTests.csproj | 21 +++++++++++++ .../InteractiveTests.cs | 18 +++++++++++ .../packages.config | 6 ++++ 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Interactivity/InteractiveExtensions.cs b/src/Avalonia.Interactivity/InteractiveExtensions.cs index 2507fc6866..b03590951b 100644 --- a/src/Avalonia.Interactivity/InteractiveExtensions.cs +++ b/src/Avalonia.Interactivity/InteractiveExtensions.cs @@ -1,8 +1,10 @@ // Copyright (c) The Avalonia Project. All rights reserved. // Licensed under the MIT license. See licence.md file in the project root for full license information. +using System; using System.Collections.Generic; using System.Linq; +using System.Reactive.Linq; namespace Avalonia.Interactivity { @@ -11,12 +13,36 @@ namespace Avalonia.Interactivity /// public static class InteractiveExtensions { + /// + /// Gets an observable for a . + /// + /// The object to listen for events on. + /// The routed event. + /// The routing strategies to listen to. + /// Whether handled events should also be listened for. + /// + /// An observable which fires each time the event is raised. + /// + public static IObservable GetObservable( + this IInteractive o, + RoutedEvent routedEvent, + RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble, + bool handledEventsToo = false) + where TEventArgs : RoutedEventArgs + { + return Observable.Create(x => o.AddHandler( + routedEvent, + (_, e) => x.OnNext(e), + routes, + handledEventsToo)); + } + /// /// Gets the route for bubbling events from the specified interactive. /// /// The interactive. /// The event route. - public static IEnumerable GetBubbleEventRoute(this IInteractive interactive) + internal static IEnumerable GetBubbleEventRoute(this IInteractive interactive) { while (interactive != null) { @@ -30,7 +56,7 @@ namespace Avalonia.Interactivity /// /// The interactive. /// The event route. - public static IEnumerable GetTunnelEventRoute(this IInteractive interactive) + internal static IEnumerable GetTunnelEventRoute(this IInteractive interactive) { return interactive.GetBubbleEventRoute().Reverse(); } diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj index 6dfefe1a63..d8a6ee2506 100644 --- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj +++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj @@ -37,11 +37,32 @@ + + ..\..\packages\System.Reactive.Core.3.0.0\lib\net45\System.Reactive.Core.dll + True + + + ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\net45\System.Reactive.Interfaces.dll + True + + + ..\..\packages\System.Reactive.Linq.3.0.0\lib\net45\System.Reactive.Linq.dll + True + + + ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\net45\System.Reactive.PlatformServices.dll + True + + + ..\..\packages\System.Reactive.Windows.Threading.3.0.0\lib\net45\System.Reactive.Windows.Threading.dll + True + + ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll diff --git a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs b/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs index f107490ced..dd0974fad0 100644 --- a/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs +++ b/tests/Avalonia.Interactivity.UnitTests/InteractiveTests.cs @@ -340,6 +340,24 @@ namespace Avalonia.Interactivity.UnitTests Assert.True(target.GetVisualParent().ClassHandlerInvoked); } + [Fact] + public void GetObservable_Should_Listen_To_Event() + { + var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(TestInteractive)); + var target = new TestInteractive(); + var called = 0; + var subscription = target.GetObservable(ev).Subscribe(_ => ++called); + + var args = new RoutedEventArgs(ev, target); + target.RaiseEvent(args); + + subscription.Dispose(); + + target.RaiseEvent(args); + + Assert.Equal(1, called); + } + private TestInteractive CreateTree( RoutedEvent ev, EventHandler handler, diff --git a/tests/Avalonia.Interactivity.UnitTests/packages.config b/tests/Avalonia.Interactivity.UnitTests/packages.config index dcbf45edf0..953a4a666d 100644 --- a/tests/Avalonia.Interactivity.UnitTests/packages.config +++ b/tests/Avalonia.Interactivity.UnitTests/packages.config @@ -1,5 +1,11 @@  + + + + + + From 71c6c572acfa971d34f5ecc99f9ef34d6af2adcf Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 4 Mar 2017 01:58:52 +0100 Subject: [PATCH 2/4] Moved ncrunch files to their own dir. Also deleted v2 ncrunch files and update .gitignore. --- .gitignore | 5 ++++ .ncrunch/Avalonia.Android.v3.ncrunchproject | 6 ++++ ...a.AndroidTestApplication.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Animation.v3.ncrunchproject | 5 ++++ .../Avalonia.Base.UnitTests.v3.ncrunchproject | 8 ++++++ .ncrunch/Avalonia.Base.v3.ncrunchproject | 5 ++++ .../Avalonia.Benchmarks.v3.ncrunchproject | 5 ++++ ...alonia.Cairo.RenderTests.v3.ncrunchproject | 8 ++++++ .ncrunch/Avalonia.Cairo.v3.ncrunchproject | 5 ++++ ...lonia.Controls.UnitTests.v3.ncrunchproject | 8 ++++++ .ncrunch/Avalonia.Controls.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Designer.v3.ncrunchproject | 5 ++++ ....DesignerSupport.TestApp.v3.ncrunchproject | 6 ++++ ...ia.DesignerSupport.Tests.v3.ncrunchproject | 6 ++++ ...Avalonia.DesignerSupport.v3.ncrunchproject | 5 ++++ .../Avalonia.Diagnostics.v3.ncrunchproject | 5 ++++ ...ia.Direct2D1.RenderTests.v3.ncrunchproject | 6 ++++ ...onia.Direct2D1.UnitTests.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Direct2D1.v3.ncrunchproject | 5 ++++ ...alonia.DotNetCoreRuntime.v3.ncrunchproject | 5 ++++ ...a.DotNetFrameworkRuntime.v3.ncrunchproject | 6 ++++ .ncrunch/Avalonia.Gtk.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Gtk3.v3.ncrunchproject | 5 ++++ .../Avalonia.HtmlRenderer.v3.ncrunchproject | 5 ++++ ...Avalonia.Input.UnitTests.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Input.v3.ncrunchproject | 5 ++++ ....Interactivity.UnitTests.v3.ncrunchproject | 5 ++++ .../Avalonia.Interactivity.v3.ncrunchproject | 5 ++++ ...valonia.Layout.UnitTests.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Layout.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.LeakTests.v3.ncrunchproject | 5 ++++ ...Avalonia.Logging.Serilog.v3.ncrunchproject | 5 ++++ ...valonia.Markup.UnitTests.v3.ncrunchproject | 5 ++++ ...ia.Markup.Xaml.UnitTests.v3.ncrunchproject | 5 ++++ .../Avalonia.Markup.Xaml.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Markup.v3.ncrunchproject | 5 ++++ .../Avalonia.ReactiveUI.v3.ncrunchproject | 5 ++++ .../Avalonia.RenderTests.v3.ncrunchproject | 3 ++ .../Avalonia.Skia.Android.v3.ncrunchproject | 6 ++++ ...Skia.Desktop.NetStandard.v3.ncrunchproject | 5 ++++ .../Avalonia.Skia.Desktop.v3.ncrunchproject | 8 ++++++ ...valonia.Skia.RenderTests.v3.ncrunchproject | 6 ++++ .ncrunch/Avalonia.Skia.iOS.v3.ncrunchproject | 6 ++++ .ncrunch/Avalonia.Skia.v3.ncrunchproject | 3 ++ ...alonia.Styling.UnitTests.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.Styling.v3.ncrunchproject | 5 ++++ .../Avalonia.Themes.Default.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.UnitTests.v3.ncrunchproject | 5 ++++ ...alonia.Visuals.UnitTests.v3.ncrunchproject | 9 ++++++ .ncrunch/Avalonia.Visuals.v3.ncrunchproject | 5 ++++ ...alonia.Win32.NetStandard.v3.ncrunchproject | 5 ++++ .../Avalonia.Win32.Shared.v3.ncrunchproject | 3 ++ .ncrunch/Avalonia.Win32.v3.ncrunchproject | 5 ++++ .ncrunch/Avalonia.iOS.v3.ncrunchproject | 5 ++++ ...lonia.iOSTestApplication.v3.ncrunchproject | 5 ++++ .ncrunch/BindingTest.v3.ncrunchproject | 6 ++++ .../ControlCatalog.Android.v3.ncrunchproject | 5 ++++ .../ControlCatalog.Desktop.v3.ncrunchproject | 5 ++++ .ncrunch/ControlCatalog.iOS.v3.ncrunchproject | 5 ++++ .ncrunch/ControlCatalog.v3.ncrunchproject | 6 ++++ .ncrunch/GtkInteropDemo.v3.ncrunchproject | 5 ++++ .ncrunch/PlatformSupport.v3.ncrunchproject | 3 ++ .ncrunch/RenderHelpers.v3.ncrunchproject | 3 ++ .ncrunch/RenderTest.v3.ncrunchproject | 8 ++++++ .ncrunch/VirtualizationTest.v3.ncrunchproject | 6 ++++ .ncrunch/WindowsInteropTest.v3.ncrunchproject | 5 ++++ Avalonia.v2.ncrunchsolution | Bin 1836 -> 0 bytes Avalonia.v3.ncrunchsolution | 10 +++++++ .../BindingTest/BindingTest.v2.ncrunchproject | 26 ----------------- .../ControlCatalog.Android.v2.ncrunchproject | 26 ----------------- .../ControlCatalog.Desktop.v2.ncrunchproject | 26 ----------------- .../ControlCatalog.iOS.v2.ncrunchproject | 26 ----------------- .../ControlCatalog.v2.ncrunchproject | 26 ----------------- .../VirtualizationTest.v2.ncrunchproject | 26 ----------------- .../GtkInteropDemo.v2.ncrunchproject | 26 ----------------- .../WindowsInteropTest.v2.ncrunchproject | 26 ----------------- .../Avalonia.Android.v2.ncrunchproject | 26 ----------------- ...a.AndroidTestApplication.v2.ncrunchproject | 26 ----------------- .../Avalonia.Animation.v2.ncrunchproject | 26 ----------------- .../Avalonia.Base.v2.ncrunchproject | 26 ----------------- .../Avalonia.Controls.v2.ncrunchproject | 26 ----------------- ...Avalonia.DesignerSupport.v2.ncrunchproject | 26 ----------------- .../Avalonia.Diagnostics.v2.ncrunchproject | 26 ----------------- ...a.DotNetFrameworkRuntime.v2.ncrunchproject | 26 ----------------- .../Avalonia.HtmlRenderer.v2.ncrunchproject | 26 ----------------- .../Avalonia.Input.v2.ncrunchproject | 26 ----------------- .../Avalonia.Interactivity.v2.ncrunchproject | 26 ----------------- .../Avalonia.Layout.v2.ncrunchproject | 26 ----------------- ...Avalonia.Logging.Serilog.v2.ncrunchproject | 26 ----------------- .../Avalonia.ReactiveUI.v2.ncrunchproject | 26 ----------------- .../Avalonia.Styling.v2.ncrunchproject | 26 ----------------- .../Avalonia.Themes.Default.v2.ncrunchproject | 26 ----------------- .../Avalonia.Visuals.v2.ncrunchproject | 26 ----------------- .../Avalonia.Gtk.v2.ncrunchproject | 26 ----------------- .../Avalonia.Markup.Xaml.v2.ncrunchproject | 26 ----------------- .../Avalonia.Markup.v2.ncrunchproject | 26 ----------------- .../Avalonia.Skia.iOS.v2.ncrunchproject | 26 ----------------- .../Avalonia.Designer.v2.ncrunchproject | 26 ----------------- .../Avalonia.Direct2D1.v2.ncrunchproject | 26 ----------------- .../Avalonia.Win32.v2.ncrunchproject | 26 ----------------- .../Avalonia.iOS.v2.ncrunchproject | 26 ----------------- ...lonia.iOSTestApplication.v2.ncrunchproject | 26 ----------------- .../Avalonia.Base.UnitTests.v2.ncrunchproject | 27 ------------------ .../Avalonia.Benchmarks.v2.ncrunchproject | 26 ----------------- ...lonia.Controls.UnitTests.v2.ncrunchproject | 27 ------------------ ....DesignerSupport.TestApp.v2.ncrunchproject | 26 ----------------- ...ia.DesignerSupport.Tests.v2.ncrunchproject | 26 ----------------- ...onia.Direct2D1.UnitTests.v2.ncrunchproject | 26 ----------------- ...Avalonia.Input.UnitTests.v2.ncrunchproject | 26 ----------------- ....Interactivity.UnitTests.v2.ncrunchproject | 26 ----------------- ...valonia.Layout.UnitTests.v2.ncrunchproject | 26 ----------------- .../Avalonia.LeakTests.v2.ncrunchproject | 26 ----------------- ...valonia.Markup.UnitTests.v2.ncrunchproject | 26 ----------------- ...ia.Markup.Xaml.UnitTests.v2.ncrunchproject | 26 ----------------- .../Avalonia.Skia.RenderTests.csproj | 4 +-- ...alonia.Styling.UnitTests.v2.ncrunchproject | 26 ----------------- .../Avalonia.UnitTests.v2.ncrunchproject | 26 ----------------- 117 files changed, 362 insertions(+), 1252 deletions(-) create mode 100644 .ncrunch/Avalonia.Android.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.AndroidTestApplication.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Animation.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Base.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Base.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Benchmarks.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Cairo.RenderTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Cairo.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Controls.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Controls.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Designer.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.DesignerSupport.TestApp.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.DesignerSupport.Tests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.DesignerSupport.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Diagnostics.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Direct2D1.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Direct2D1.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.DotNetCoreRuntime.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.DotNetFrameworkRuntime.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Gtk.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Gtk3.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.HtmlRenderer.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Input.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Input.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Interactivity.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Interactivity.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Layout.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Layout.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.LeakTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Logging.Serilog.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Markup.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Markup.Xaml.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Markup.Xaml.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Markup.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.ReactiveUI.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.RenderTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Skia.Android.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Skia.Desktop.NetStandard.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Skia.Desktop.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Skia.iOS.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Skia.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Styling.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Styling.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Themes.Default.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Visuals.UnitTests.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Visuals.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Win32.NetStandard.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Win32.Shared.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.Win32.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.iOS.v3.ncrunchproject create mode 100644 .ncrunch/Avalonia.iOSTestApplication.v3.ncrunchproject create mode 100644 .ncrunch/BindingTest.v3.ncrunchproject create mode 100644 .ncrunch/ControlCatalog.Android.v3.ncrunchproject create mode 100644 .ncrunch/ControlCatalog.Desktop.v3.ncrunchproject create mode 100644 .ncrunch/ControlCatalog.iOS.v3.ncrunchproject create mode 100644 .ncrunch/ControlCatalog.v3.ncrunchproject create mode 100644 .ncrunch/GtkInteropDemo.v3.ncrunchproject create mode 100644 .ncrunch/PlatformSupport.v3.ncrunchproject create mode 100644 .ncrunch/RenderHelpers.v3.ncrunchproject create mode 100644 .ncrunch/RenderTest.v3.ncrunchproject create mode 100644 .ncrunch/VirtualizationTest.v3.ncrunchproject create mode 100644 .ncrunch/WindowsInteropTest.v3.ncrunchproject delete mode 100644 Avalonia.v2.ncrunchsolution create mode 100644 Avalonia.v3.ncrunchsolution delete mode 100644 samples/BindingTest/BindingTest.v2.ncrunchproject delete mode 100644 samples/ControlCatalog.Android/ControlCatalog.Android.v2.ncrunchproject delete mode 100644 samples/ControlCatalog.Desktop/ControlCatalog.Desktop.v2.ncrunchproject delete mode 100644 samples/ControlCatalog.iOS/ControlCatalog.iOS.v2.ncrunchproject delete mode 100644 samples/ControlCatalog/ControlCatalog.v2.ncrunchproject delete mode 100644 samples/VirtualizationTest/VirtualizationTest.v2.ncrunchproject delete mode 100644 samples/interop/GtkInteropDemo/GtkInteropDemo.v2.ncrunchproject delete mode 100644 samples/interop/WindowsInteropTest/WindowsInteropTest.v2.ncrunchproject delete mode 100644 src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject delete mode 100644 src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.v2.ncrunchproject delete mode 100644 src/Avalonia.Animation/Avalonia.Animation.v2.ncrunchproject delete mode 100644 src/Avalonia.Base/Avalonia.Base.v2.ncrunchproject delete mode 100644 src/Avalonia.Controls/Avalonia.Controls.v2.ncrunchproject delete mode 100644 src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.v2.ncrunchproject delete mode 100644 src/Avalonia.Diagnostics/Avalonia.Diagnostics.v2.ncrunchproject delete mode 100644 src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.v2.ncrunchproject delete mode 100644 src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.v2.ncrunchproject delete mode 100644 src/Avalonia.Input/Avalonia.Input.v2.ncrunchproject delete mode 100644 src/Avalonia.Interactivity/Avalonia.Interactivity.v2.ncrunchproject delete mode 100644 src/Avalonia.Layout/Avalonia.Layout.v2.ncrunchproject delete mode 100644 src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.v2.ncrunchproject delete mode 100644 src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.v2.ncrunchproject delete mode 100644 src/Avalonia.Styling/Avalonia.Styling.v2.ncrunchproject delete mode 100644 src/Avalonia.Themes.Default/Avalonia.Themes.Default.v2.ncrunchproject delete mode 100644 src/Avalonia.Visuals/Avalonia.Visuals.v2.ncrunchproject delete mode 100644 src/Gtk/Avalonia.Gtk/Avalonia.Gtk.v2.ncrunchproject delete mode 100644 src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.v2.ncrunchproject delete mode 100644 src/Markup/Avalonia.Markup/Avalonia.Markup.v2.ncrunchproject delete mode 100644 src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject delete mode 100644 src/Windows/Avalonia.Designer/Avalonia.Designer.v2.ncrunchproject delete mode 100644 src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.v2.ncrunchproject delete mode 100644 src/Windows/Avalonia.Win32/Avalonia.Win32.v2.ncrunchproject delete mode 100644 src/iOS/Avalonia.iOS/Avalonia.iOS.v2.ncrunchproject delete mode 100644 src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.v2.ncrunchproject delete mode 100644 tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Benchmarks/Avalonia.Benchmarks.v2.ncrunchproject delete mode 100644 tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.v2.ncrunchproject delete mode 100644 tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.LeakTests/Avalonia.LeakTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.v2.ncrunchproject delete mode 100644 tests/Avalonia.UnitTests/Avalonia.UnitTests.v2.ncrunchproject diff --git a/.gitignore b/.gitignore index d965a09574..c36f64e5de 100644 --- a/.gitignore +++ b/.gitignore @@ -105,6 +105,11 @@ csx # Windows Store app package directory AppPackages/ +# NCrunch +_NCrunch_*/ +*.ncrunchsolution.user +nCrunchTemp_*/ + # Others sql/ *.Cache diff --git a/.ncrunch/Avalonia.Android.v3.ncrunchproject b/.ncrunch/Avalonia.Android.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/Avalonia.Android.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.AndroidTestApplication.v3.ncrunchproject b/.ncrunch/Avalonia.AndroidTestApplication.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.AndroidTestApplication.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Animation.v3.ncrunchproject b/.ncrunch/Avalonia.Animation.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Animation.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Base.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Base.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..13f78c1d4c --- /dev/null +++ b/.ncrunch/Avalonia.Base.UnitTests.v3.ncrunchproject @@ -0,0 +1,8 @@ + + + + LongTestTimesWithoutParallelExecution + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Base.v3.ncrunchproject b/.ncrunch/Avalonia.Base.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Base.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Benchmarks.v3.ncrunchproject b/.ncrunch/Avalonia.Benchmarks.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Benchmarks.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Cairo.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.Cairo.RenderTests.v3.ncrunchproject new file mode 100644 index 0000000000..101c806e63 --- /dev/null +++ b/.ncrunch/Avalonia.Cairo.RenderTests.v3.ncrunchproject @@ -0,0 +1,8 @@ + + + + AbnormalReferenceResolution + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Cairo.v3.ncrunchproject b/.ncrunch/Avalonia.Cairo.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Cairo.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Controls.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Controls.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..13f78c1d4c --- /dev/null +++ b/.ncrunch/Avalonia.Controls.UnitTests.v3.ncrunchproject @@ -0,0 +1,8 @@ + + + + LongTestTimesWithoutParallelExecution + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Controls.v3.ncrunchproject b/.ncrunch/Avalonia.Controls.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Controls.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Designer.v3.ncrunchproject b/.ncrunch/Avalonia.Designer.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Designer.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.DesignerSupport.TestApp.v3.ncrunchproject b/.ncrunch/Avalonia.DesignerSupport.TestApp.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/Avalonia.DesignerSupport.TestApp.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.DesignerSupport.Tests.v3.ncrunchproject b/.ncrunch/Avalonia.DesignerSupport.Tests.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/Avalonia.DesignerSupport.Tests.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.DesignerSupport.v3.ncrunchproject b/.ncrunch/Avalonia.DesignerSupport.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.DesignerSupport.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Diagnostics.v3.ncrunchproject b/.ncrunch/Avalonia.Diagnostics.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Diagnostics.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject new file mode 100644 index 0000000000..235da29767 --- /dev/null +++ b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + 1000 + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Direct2D1.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Direct2D1.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Direct2D1.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Direct2D1.v3.ncrunchproject b/.ncrunch/Avalonia.Direct2D1.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Direct2D1.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.DotNetCoreRuntime.v3.ncrunchproject b/.ncrunch/Avalonia.DotNetCoreRuntime.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.DotNetCoreRuntime.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.DotNetFrameworkRuntime.v3.ncrunchproject b/.ncrunch/Avalonia.DotNetFrameworkRuntime.v3.ncrunchproject new file mode 100644 index 0000000000..3cd9a982c9 --- /dev/null +++ b/.ncrunch/Avalonia.DotNetFrameworkRuntime.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + False + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Gtk.v3.ncrunchproject b/.ncrunch/Avalonia.Gtk.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Gtk.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject b/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.HtmlRenderer.v3.ncrunchproject b/.ncrunch/Avalonia.HtmlRenderer.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.HtmlRenderer.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Input.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Input.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Input.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Input.v3.ncrunchproject b/.ncrunch/Avalonia.Input.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Input.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Interactivity.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Interactivity.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Interactivity.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Interactivity.v3.ncrunchproject b/.ncrunch/Avalonia.Interactivity.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Interactivity.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Layout.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Layout.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Layout.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Layout.v3.ncrunchproject b/.ncrunch/Avalonia.Layout.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Layout.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.LeakTests.v3.ncrunchproject b/.ncrunch/Avalonia.LeakTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.LeakTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Logging.Serilog.v3.ncrunchproject b/.ncrunch/Avalonia.Logging.Serilog.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Logging.Serilog.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Markup.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Markup.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Markup.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Markup.Xaml.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Markup.Xaml.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Markup.Xaml.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Markup.Xaml.v3.ncrunchproject b/.ncrunch/Avalonia.Markup.Xaml.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Markup.Xaml.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Markup.v3.ncrunchproject b/.ncrunch/Avalonia.Markup.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Markup.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.ReactiveUI.v3.ncrunchproject b/.ncrunch/Avalonia.ReactiveUI.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.ReactiveUI.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.RenderTests.v3.ncrunchproject new file mode 100644 index 0000000000..95a483b433 --- /dev/null +++ b/.ncrunch/Avalonia.RenderTests.v3.ncrunchproject @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Skia.Android.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.Android.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/Avalonia.Skia.Android.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Skia.Desktop.NetStandard.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.Desktop.NetStandard.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.Skia.Desktop.NetStandard.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Skia.Desktop.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.Desktop.v3.ncrunchproject new file mode 100644 index 0000000000..ae3801f32b --- /dev/null +++ b/.ncrunch/Avalonia.Skia.Desktop.v3.ncrunchproject @@ -0,0 +1,8 @@ + + + True + False + True + x86 + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject new file mode 100644 index 0000000000..235da29767 --- /dev/null +++ b/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + 1000 + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Skia.iOS.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.iOS.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/Avalonia.Skia.iOS.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Skia.v3.ncrunchproject b/.ncrunch/Avalonia.Skia.v3.ncrunchproject new file mode 100644 index 0000000000..95a483b433 --- /dev/null +++ b/.ncrunch/Avalonia.Skia.v3.ncrunchproject @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Styling.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Styling.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Styling.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Styling.v3.ncrunchproject b/.ncrunch/Avalonia.Styling.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Styling.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Themes.Default.v3.ncrunchproject b/.ncrunch/Avalonia.Themes.Default.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Themes.Default.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.UnitTests.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Visuals.UnitTests.v3.ncrunchproject b/.ncrunch/Avalonia.Visuals.UnitTests.v3.ncrunchproject new file mode 100644 index 0000000000..ee655751a0 --- /dev/null +++ b/.ncrunch/Avalonia.Visuals.UnitTests.v3.ncrunchproject @@ -0,0 +1,9 @@ + + + + AbnormalReferenceResolution + LongTestTimesWithoutParallelExecution + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Visuals.v3.ncrunchproject b/.ncrunch/Avalonia.Visuals.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Visuals.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Win32.NetStandard.v3.ncrunchproject b/.ncrunch/Avalonia.Win32.NetStandard.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.Win32.NetStandard.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Win32.Shared.v3.ncrunchproject b/.ncrunch/Avalonia.Win32.Shared.v3.ncrunchproject new file mode 100644 index 0000000000..95a483b433 --- /dev/null +++ b/.ncrunch/Avalonia.Win32.Shared.v3.ncrunchproject @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.Win32.v3.ncrunchproject b/.ncrunch/Avalonia.Win32.v3.ncrunchproject new file mode 100644 index 0000000000..6800b4a3fe --- /dev/null +++ b/.ncrunch/Avalonia.Win32.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.iOS.v3.ncrunchproject b/.ncrunch/Avalonia.iOS.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.iOS.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/Avalonia.iOSTestApplication.v3.ncrunchproject b/.ncrunch/Avalonia.iOSTestApplication.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/Avalonia.iOSTestApplication.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/BindingTest.v3.ncrunchproject b/.ncrunch/BindingTest.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/BindingTest.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/ControlCatalog.Android.v3.ncrunchproject b/.ncrunch/ControlCatalog.Android.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/ControlCatalog.Android.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/ControlCatalog.Desktop.v3.ncrunchproject b/.ncrunch/ControlCatalog.Desktop.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/ControlCatalog.Desktop.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/ControlCatalog.iOS.v3.ncrunchproject b/.ncrunch/ControlCatalog.iOS.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/ControlCatalog.iOS.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/ControlCatalog.v3.ncrunchproject b/.ncrunch/ControlCatalog.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/ControlCatalog.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/GtkInteropDemo.v3.ncrunchproject b/.ncrunch/GtkInteropDemo.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/GtkInteropDemo.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/.ncrunch/PlatformSupport.v3.ncrunchproject b/.ncrunch/PlatformSupport.v3.ncrunchproject new file mode 100644 index 0000000000..95a483b433 --- /dev/null +++ b/.ncrunch/PlatformSupport.v3.ncrunchproject @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.ncrunch/RenderHelpers.v3.ncrunchproject b/.ncrunch/RenderHelpers.v3.ncrunchproject new file mode 100644 index 0000000000..95a483b433 --- /dev/null +++ b/.ncrunch/RenderHelpers.v3.ncrunchproject @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.ncrunch/RenderTest.v3.ncrunchproject b/.ncrunch/RenderTest.v3.ncrunchproject new file mode 100644 index 0000000000..e12537d535 --- /dev/null +++ b/.ncrunch/RenderTest.v3.ncrunchproject @@ -0,0 +1,8 @@ + + + + MissingOrIgnoredProjectReference + + True + + \ No newline at end of file diff --git a/.ncrunch/VirtualizationTest.v3.ncrunchproject b/.ncrunch/VirtualizationTest.v3.ncrunchproject new file mode 100644 index 0000000000..a4953e14f9 --- /dev/null +++ b/.ncrunch/VirtualizationTest.v3.ncrunchproject @@ -0,0 +1,6 @@ + + + True + True + + \ No newline at end of file diff --git a/.ncrunch/WindowsInteropTest.v3.ncrunchproject b/.ncrunch/WindowsInteropTest.v3.ncrunchproject new file mode 100644 index 0000000000..319cd523ce --- /dev/null +++ b/.ncrunch/WindowsInteropTest.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/Avalonia.v2.ncrunchsolution b/Avalonia.v2.ncrunchsolution deleted file mode 100644 index fe4feb2cb68b687b4720bc1a47cbec77763ab35f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1836 zcmcJQO;5r=5Qg8giT}Z~2aTRd6QW{Fgb=}x0~f7D)P9&Qi2ix?nJuMYGxMdJ!OhD(OA#)Ql0qskkJ#fx$fsHfp)c{J)VYItjCIUL(Ao6zJZQdJ6yS1 z`Cp(k^uAsEGriCcQM%%{n2)ds89811{Zn|F^c-`E9#H>O2fD=D1bE#uXRAg~|Na$w z6P+05sk&%dglrtq`krO1Gkwqt7or+)ww!T6_rD$fA}AFd+8NQC5H&mdZ?ao%Xsi)d zBN!4Nr&#ZvcNJSbdsoygA1k}BDXh6(xmnA)nC6ILnSp(7_6@6+x9VV(diua;LZnmH zQ|uFFLvq6UmJODLZkB&`E1M{7N`3B`>|~ir?j9#BPFW}QveKs9ZR&x=KHM_(qD~#m zWv*^F)<#_^ZOVN&&+OxQw6~Sp%UTtAQ;$4W8;a_0|D>|E7d6GINyzL3y9mxPZ^zqd wFpov$G0;BG0nMuL`ny+TZFH<=+JD^nids;V-wNou0Jkex*#H0l diff --git a/Avalonia.v3.ncrunchsolution b/Avalonia.v3.ncrunchsolution new file mode 100644 index 0000000000..c2c454eae1 --- /dev/null +++ b/Avalonia.v3.ncrunchsolution @@ -0,0 +1,10 @@ + + + + tests\TestFiles\**.* + + False + .ncrunch + True + + \ No newline at end of file diff --git a/samples/BindingTest/BindingTest.v2.ncrunchproject b/samples/BindingTest/BindingTest.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/samples/BindingTest/BindingTest.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.v2.ncrunchproject b/samples/ControlCatalog.Android/ControlCatalog.Android.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/samples/ControlCatalog.Android/ControlCatalog.Android.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.v2.ncrunchproject b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.v2.ncrunchproject b/samples/ControlCatalog.iOS/ControlCatalog.iOS.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/ControlCatalog/ControlCatalog.v2.ncrunchproject b/samples/ControlCatalog/ControlCatalog.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/samples/ControlCatalog/ControlCatalog.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/VirtualizationTest/VirtualizationTest.v2.ncrunchproject b/samples/VirtualizationTest/VirtualizationTest.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/samples/VirtualizationTest/VirtualizationTest.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/interop/GtkInteropDemo/GtkInteropDemo.v2.ncrunchproject b/samples/interop/GtkInteropDemo/GtkInteropDemo.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/samples/interop/GtkInteropDemo/GtkInteropDemo.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.v2.ncrunchproject b/samples/interop/WindowsInteropTest/WindowsInteropTest.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/samples/interop/WindowsInteropTest/WindowsInteropTest.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject b/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/src/Android/Avalonia.Android/Avalonia.Android.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.v2.ncrunchproject b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Animation/Avalonia.Animation.v2.ncrunchproject b/src/Avalonia.Animation/Avalonia.Animation.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Animation/Avalonia.Animation.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Base/Avalonia.Base.v2.ncrunchproject b/src/Avalonia.Base/Avalonia.Base.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Base/Avalonia.Base.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Controls/Avalonia.Controls.v2.ncrunchproject b/src/Avalonia.Controls/Avalonia.Controls.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Controls/Avalonia.Controls.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.v2.ncrunchproject b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.v2.ncrunchproject b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.v2.ncrunchproject b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.v2.ncrunchproject b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Input/Avalonia.Input.v2.ncrunchproject b/src/Avalonia.Input/Avalonia.Input.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Input/Avalonia.Input.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.v2.ncrunchproject b/src/Avalonia.Interactivity/Avalonia.Interactivity.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Layout/Avalonia.Layout.v2.ncrunchproject b/src/Avalonia.Layout/Avalonia.Layout.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Layout/Avalonia.Layout.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.v2.ncrunchproject b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.v2.ncrunchproject b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Styling/Avalonia.Styling.v2.ncrunchproject b/src/Avalonia.Styling/Avalonia.Styling.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Styling/Avalonia.Styling.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.v2.ncrunchproject b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.v2.ncrunchproject b/src/Avalonia.Visuals/Avalonia.Visuals.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Avalonia.Visuals/Avalonia.Visuals.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.v2.ncrunchproject b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.v2.ncrunchproject b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.v2.ncrunchproject b/src/Markup/Avalonia.Markup/Avalonia.Markup.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Windows/Avalonia.Designer/Avalonia.Designer.v2.ncrunchproject b/src/Windows/Avalonia.Designer/Avalonia.Designer.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Windows/Avalonia.Designer/Avalonia.Designer.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.v2.ncrunchproject b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.v2.ncrunchproject b/src/Windows/Avalonia.Win32/Avalonia.Win32.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.v2.ncrunchproject b/src/iOS/Avalonia.iOS/Avalonia.iOS.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.v2.ncrunchproject b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.v2.ncrunchproject deleted file mode 100644 index e1b4d7cf28..0000000000 --- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - false - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.v2.ncrunchproject b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.v2.ncrunchproject deleted file mode 100644 index b5cd70b13f..0000000000 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,27 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - LongTestTimesWithoutParallelExecution - \ No newline at end of file diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.v2.ncrunchproject b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.v2.ncrunchproject b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.v2.ncrunchproject deleted file mode 100644 index b5cd70b13f..0000000000 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,27 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - LongTestTimesWithoutParallelExecution - \ No newline at end of file diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.v2.ncrunchproject b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.v2.ncrunchproject b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.v2.ncrunchproject deleted file mode 100644 index f744eecae0..0000000000 --- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - true - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.v2.ncrunchproject b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.v2.ncrunchproject b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.v2.ncrunchproject b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.v2.ncrunchproject b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.v2.ncrunchproject b/tests/Avalonia.LeakTests/Avalonia.LeakTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.v2.ncrunchproject b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.v2.ncrunchproject b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj index 9a8fa82d8b..1ba80837f0 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj @@ -19,7 +19,7 @@ true full false - bin\Debug\ + ..\..\artifacts\tests\ TRACE;DEBUG;AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL prompt 4 @@ -27,7 +27,7 @@ pdbonly true - bin\Release\ + ..\..\artifacts\tests\ TRACE;AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL prompt 4 diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.v2.ncrunchproject b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.v2.ncrunchproject b/tests/Avalonia.UnitTests/Avalonia.UnitTests.v2.ncrunchproject deleted file mode 100644 index 30815b1937..0000000000 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.v2.ncrunchproject +++ /dev/null @@ -1,26 +0,0 @@ - - true - 1000 - false - false - false - true - false - false - false - false - false - true - true - false - true - true - true - 60000 - - - - AutoDetect - STA - x86 - \ No newline at end of file From 8099317f88e2aa6e35c599cd3da3ad7f8cfaaa4e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 4 Mar 2017 02:21:44 +0100 Subject: [PATCH 3/4] Ported RenderTest from scenegraph branch. --- samples/RenderTest/App.config | 8 ++ samples/RenderTest/App.xaml | 1 + samples/RenderTest/MainWindow.xaml | 31 ++++++- samples/RenderTest/MainWindow.xaml.cs | 63 ++----------- samples/RenderTest/Pages/AnimationsPage.xaml | 2 + .../RenderTest/Pages/AnimationsPage.xaml.cs | 90 +++++++++++++++++++ samples/RenderTest/Pages/ClippingPage.xaml | 15 ++++ samples/RenderTest/Pages/ClippingPage.xaml.cs | 48 ++++++++++ samples/RenderTest/Program.cs | 1 + samples/RenderTest/RenderTest.csproj | 30 +++++++ .../RenderTest/RenderTest.v2.ncrunchproject | 26 ------ samples/RenderTest/SideBar.xaml | 40 +++++++++ .../ViewModels/MainWindowViewModel.cs | 34 +++++++ samples/RenderTest/packages.config | 1 + 14 files changed, 306 insertions(+), 84 deletions(-) create mode 100644 samples/RenderTest/Pages/AnimationsPage.xaml create mode 100644 samples/RenderTest/Pages/AnimationsPage.xaml.cs create mode 100644 samples/RenderTest/Pages/ClippingPage.xaml create mode 100644 samples/RenderTest/Pages/ClippingPage.xaml.cs delete mode 100644 samples/RenderTest/RenderTest.v2.ncrunchproject create mode 100644 samples/RenderTest/SideBar.xaml create mode 100644 samples/RenderTest/ViewModels/MainWindowViewModel.cs diff --git a/samples/RenderTest/App.config b/samples/RenderTest/App.config index 2231c71e63..10a06d8258 100644 --- a/samples/RenderTest/App.config +++ b/samples/RenderTest/App.config @@ -9,6 +9,14 @@ + + + + + + + + diff --git a/samples/RenderTest/App.xaml b/samples/RenderTest/App.xaml index d9630eef58..c119f54915 100644 --- a/samples/RenderTest/App.xaml +++ b/samples/RenderTest/App.xaml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/samples/RenderTest/MainWindow.xaml b/samples/RenderTest/MainWindow.xaml index ab233fd90b..1d3001f1b1 100644 --- a/samples/RenderTest/MainWindow.xaml +++ b/samples/RenderTest/MainWindow.xaml @@ -1,3 +1,32 @@ + Title="Avalonia Render Test" + xmlns:pages="clr-namespace:RenderTest.Pages;assembly=RenderTest"> + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/RenderTest/MainWindow.xaml.cs b/samples/RenderTest/MainWindow.xaml.cs index feb121186f..c6c0eafd25 100644 --- a/samples/RenderTest/MainWindow.xaml.cs +++ b/samples/RenderTest/MainWindow.xaml.cs @@ -2,15 +2,11 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; -using System.Reactive.Linq; using Avalonia; -using Avalonia.Animation; using Avalonia.Controls; -using Avalonia.Controls.Shapes; -using Avalonia.Data; -using Avalonia.Layout; using Avalonia.Markup.Xaml; -using Avalonia.Media; +using RenderTest.ViewModels; +using ReactiveUI; using Avalonia.Rendering; namespace RenderTest @@ -20,63 +16,16 @@ namespace RenderTest public MainWindow() { this.InitializeComponent(); - this.CreateAnimations(); this.AttachDevTools(); - RendererMixin.DrawFpsCounter = true; + + var vm = new MainWindowViewModel(); + vm.WhenAnyValue(x => x.DrawFps).Subscribe(x => RendererMixin.DrawFpsCounter = x); + this.DataContext = vm; } private void InitializeComponent() { AvaloniaXamlLoader.Load(this); } - - private void CreateAnimations() - { - const int Count = 100; - var panel = new WrapPanel(); - - for (var i = 0; i < Count; ++i) - { - var element = new Panel - { - Children = - { - new Ellipse - { - Width = 100, - Height = 100, - Fill = Brushes.Blue, - }, - new Path - { - Data = StreamGeometry.Parse( - "F1 M 16.6309,18.6563C 17.1309,8.15625 29.8809,14.1563 29.8809,14.1563C 30.8809,11.1563 34.1308,11.4063 34.1308,11.4063C 33.5,12 34.6309,13.1563 34.6309,13.1563C 32.1309,13.1562 31.1309,14.9062 31.1309,14.9062C 41.1309,23.9062 32.6309,27.9063 32.6309,27.9062C 24.6309,24.9063 21.1309,22.1562 16.6309,18.6563 Z M 16.6309,19.9063C 21.6309,24.1563 25.1309,26.1562 31.6309,28.6562C 31.6309,28.6562 26.3809,39.1562 18.3809,36.1563C 18.3809,36.1563 18,38 16.3809,36.9063C 15,36 16.3809,34.9063 16.3809,34.9063C 16.3809,34.9063 10.1309,30.9062 16.6309,19.9063 Z"), - Fill = Brushes.Green, - HorizontalAlignment = HorizontalAlignment.Center, - VerticalAlignment = VerticalAlignment.Center, - RenderTransform = new ScaleTransform(2, 2), - } - }, - Margin = new Thickness(4), - RenderTransform = new ScaleTransform(), - }; - - var start = Animate.Stopwatch.Elapsed; - var index = i; - var degrees = Animate.Timer - .Select(x => (x - start).TotalSeconds) - .Where(x => (x % Count) >= index && (x % Count) < index + 1) - .Select(x => (x % 1) / 1); - - element.RenderTransform.Bind( - ScaleTransform.ScaleXProperty, - degrees, - BindingPriority.Animation); - - panel.Children.Add(element); - } - - Content = panel; - } } } diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml b/samples/RenderTest/Pages/AnimationsPage.xaml new file mode 100644 index 0000000000..6eb7067245 --- /dev/null +++ b/samples/RenderTest/Pages/AnimationsPage.xaml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml.cs b/samples/RenderTest/Pages/AnimationsPage.xaml.cs new file mode 100644 index 0000000000..991896c3b5 --- /dev/null +++ b/samples/RenderTest/Pages/AnimationsPage.xaml.cs @@ -0,0 +1,90 @@ +using System.Reactive.Linq; +using Avalonia; +using Avalonia.Animation; +using Avalonia.Controls; +using Avalonia.Controls.Shapes; +using Avalonia.Data; +using Avalonia.Input; +using Avalonia.Markup.Xaml; +using Avalonia.Media; + +namespace RenderTest.Pages +{ + public class AnimationsPage : UserControl + { + public AnimationsPage() + { + this.InitializeComponent(); + this.CreateAnimations(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + + private void CreateAnimations() + { + const int Count = 100; + var panel = new WrapPanel(); + + for (var i = 0; i < Count; ++i) + { + Ellipse ellipse; + var element = new Panel + { + Children = + { + (ellipse = new Ellipse + { + Name = $"ellipse{i}", + Width = 100, + Height = 100, + Fill = Brushes.Blue, + }), + new Path + { + Data = StreamGeometry.Parse( + "F1 M 16.6309,18.6563C 17.1309,8.15625 29.8809,14.1563 29.8809,14.1563C 30.8809,11.1563 34.1308,11.4063 34.1308,11.4063C 33.5,12 34.6309,13.1563 34.6309,13.1563C 32.1309,13.1562 31.1309,14.9062 31.1309,14.9062C 41.1309,23.9062 32.6309,27.9063 32.6309,27.9062C 24.6309,24.9063 21.1309,22.1562 16.6309,18.6563 Z M 16.6309,19.9063C 21.6309,24.1563 25.1309,26.1562 31.6309,28.6562C 31.6309,28.6562 26.3809,39.1562 18.3809,36.1563C 18.3809,36.1563 18,38 16.3809,36.9063C 15,36 16.3809,34.9063 16.3809,34.9063C 16.3809,34.9063 10.1309,30.9062 16.6309,19.9063 Z"), + Fill = Brushes.Green, + HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center, + VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center, + RenderTransform = new ScaleTransform(2, 2), + } + }, + Margin = new Thickness(4), + RenderTransform = new ScaleTransform(), + }; + + var start = Animate.Stopwatch.Elapsed; + var index = i % (Count / 2); + var degrees = Animate.Timer + .Select(x => (x - start).TotalSeconds) + .Where(x => (x % Count) >= index && (x % Count) < index + 1) + .Select(x => (x % 1) / 1); + + element.RenderTransform.Bind( + ScaleTransform.ScaleXProperty, + degrees, + BindingPriority.Animation); + + ellipse.PointerEnter += Ellipse_PointerEnter; + ellipse.PointerLeave += Ellipse_PointerLeave; + + panel.Children.Add(element); + } + + Content = panel; + } + + private void Ellipse_PointerEnter(object sender, PointerEventArgs e) + { + ((Ellipse)sender).Fill = Brushes.Red; + } + + private void Ellipse_PointerLeave(object sender, PointerEventArgs e) + { + ((Ellipse)sender).Fill = Brushes.Blue; + } + } +} diff --git a/samples/RenderTest/Pages/ClippingPage.xaml b/samples/RenderTest/Pages/ClippingPage.xaml new file mode 100644 index 0000000000..47e9d51e3c --- /dev/null +++ b/samples/RenderTest/Pages/ClippingPage.xaml @@ -0,0 +1,15 @@ + + + + + + + + + Apply Geometry Clip + + \ No newline at end of file diff --git a/samples/RenderTest/Pages/ClippingPage.xaml.cs b/samples/RenderTest/Pages/ClippingPage.xaml.cs new file mode 100644 index 0000000000..b416f12943 --- /dev/null +++ b/samples/RenderTest/Pages/ClippingPage.xaml.cs @@ -0,0 +1,48 @@ +using System; +using System.Reactive.Linq; +using Avalonia; +using Avalonia.Animation; +using Avalonia.Controls; +using Avalonia.Data; +using Avalonia.Markup.Xaml; +using Avalonia.Media; + +namespace RenderTest.Pages +{ + public class ClippingPage : UserControl + { + private Geometry _clip; + + public ClippingPage() + { + InitializeComponent(); + CreateAnimations(); + WireUpCheckbox(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + + private void CreateAnimations() + { + var clipped = this.FindControl("clipChild"); + var degrees = Animate.Timer.Select(x => x.TotalMilliseconds / 5); + clipped.RenderTransform = new RotateTransform(); + clipped.RenderTransform.Bind(RotateTransform.AngleProperty, degrees, BindingPriority.Animation); + clipped.Bind( + Border.BackgroundProperty, + clipped.GetObservable(Control.IsPointerOverProperty) + .Select(x => x ? Brushes.Crimson : AvaloniaProperty.UnsetValue)); + } + + private void WireUpCheckbox() + { + var useMask = this.FindControl("useMask"); + var clipped = this.FindControl("clipped"); + _clip = clipped.Clip; + useMask.Click += (s, e) => clipped.Clip = clipped.Clip == null ? _clip : null; + } + } +} diff --git a/samples/RenderTest/Program.cs b/samples/RenderTest/Program.cs index 7a23e09dd4..4b477a5a72 100644 --- a/samples/RenderTest/Program.cs +++ b/samples/RenderTest/Program.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using Avalonia; using Avalonia.Controls; +using Avalonia.Direct2D1; using Avalonia.Logging.Serilog; using Avalonia.Platform; using Serilog; diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index f117c76342..a14114ddc8 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -45,6 +45,10 @@ ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll True + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + True + @@ -79,11 +83,18 @@ App.xaml + + ClippingPage.xaml + + + AnimationsPage.xaml + MainWindow.xaml + @@ -167,6 +178,10 @@ {6417e941-21bc-467b-a771-0de389353ce6} Avalonia.Markup + + {925dd807-b651-475f-9f7c-cbeb974ce43d} + Avalonia.Skia.Desktop + {3e908f67-5543-4879-a1dc-08eace79b3cd} Avalonia.Direct2D1 @@ -181,6 +196,21 @@ Designer + + + Designer + + + + + Designer + + + + + Designer + +