From b0a063838f1acda57e95b8027091ef47bc88823b Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 7 Mar 2017 19:17:44 +0300 Subject: [PATCH 01/38] Migrated to PackageReference --- samples/BindingTest/BindingTest.csproj | 28 ++------ samples/BindingTest/packages.config | 7 -- .../ControlCatalog.Desktop.csproj | 13 ++-- .../ControlCatalog.Desktop/packages.config | 4 -- samples/ControlCatalog/ControlCatalog.csproj | 5 +- samples/ControlCatalog/packages.config | 4 -- samples/RenderTest/RenderTest.csproj | 44 +++--------- samples/RenderTest/packages.config | 11 --- .../VirtualizationTest.csproj | 28 ++------ samples/VirtualizationTest/packages.config | 7 -- .../Avalonia.Android/Avalonia.Android.csproj | 32 +++++---- src/Android/Avalonia.Android/packages.config | 19 ----- .../Avalonia.AndroidTestApplication.csproj | 53 +++++++------- .../packages.config | 25 ------- .../Avalonia.Animation.csproj | 25 +++---- src/Avalonia.Animation/packages.config | 8 --- src/Avalonia.Base/Avalonia.Base.csproj | 30 +++----- src/Avalonia.Base/packages.config | 9 --- .../Avalonia.Controls.csproj | 30 +++----- src/Avalonia.Controls/packages.config | 9 --- .../Avalonia.DesignerSupport.csproj | 25 +++---- src/Avalonia.DesignerSupport/packages.config | 8 --- .../Avalonia.Diagnostics.csproj | 29 +++----- src/Avalonia.Diagnostics/packages.config | 9 --- .../Avalonia.DotNetFrameworkRuntime.csproj | 14 ++-- .../packages.config | 5 -- .../Avalonia.HtmlRenderer.csproj | 16 ++--- src/Avalonia.HtmlRenderer/packages.config | 7 -- src/Avalonia.Input/Avalonia.Input.csproj | 25 +++---- src/Avalonia.Input/packages.config | 8 --- .../Avalonia.Interactivity.csproj | 25 +++---- src/Avalonia.Interactivity/packages.config | 8 --- src/Avalonia.Layout/Avalonia.Layout.csproj | 25 +++---- src/Avalonia.Layout/packages.config | 8 --- .../Avalonia.Logging.Serilog.csproj | 9 ++- src/Avalonia.Logging.Serilog/packages.config | 4 -- .../Avalonia.ReactiveUI.csproj | 29 +++----- src/Avalonia.ReactiveUI/packages.config | 9 --- src/Avalonia.Styling/Avalonia.Styling.csproj | 25 +++---- src/Avalonia.Styling/packages.config | 8 --- .../Avalonia.Themes.Default.csproj | 25 +++---- src/Avalonia.Themes.Default/packages.config | 8 --- src/Avalonia.Visuals/Avalonia.Visuals.csproj | 25 +++---- src/Avalonia.Visuals/packages.config | 8 --- src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj | 14 ++-- src/Gtk/Avalonia.Cairo/packages.config | 5 -- src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj | 14 ++-- src/Gtk/Avalonia.Gtk/packages.config | 5 -- .../Avalonia.Markup.Xaml.csproj | 33 ++++----- .../Avalonia.Markup.Xaml/packages.config | 13 ---- .../Avalonia.Markup/Avalonia.Markup.csproj | 26 +++---- src/Markup/Avalonia.Markup/packages.config | 9 --- .../Avalonia.Skia.Android.csproj | 8 +-- .../Avalonia.Skia.Android/packages.config | 4 -- .../Avalonia.Skia.Desktop.csproj | 8 +-- .../Avalonia.Skia.Desktop/packages.config | 4 -- .../Avalonia.Skia.iOS.csproj | 8 +-- src/Skia/Avalonia.Skia.iOS/packages.config | 4 -- .../Avalonia.Designer.csproj | 9 ++- src/Windows/Avalonia.Designer/packages.config | 4 -- .../Avalonia.Direct2D1.csproj | 20 ++---- .../Avalonia.Direct2D1/packages.config | 7 -- .../Avalonia.Win32/Avalonia.Win32.csproj | 14 ++-- src/Windows/Avalonia.Win32/packages.config | 5 -- src/iOS/Avalonia.iOS/Avalonia.iOS.csproj | 39 +++++----- src/iOS/Avalonia.iOS/packages.config | 22 ------ .../Avalonia.iOSTestApplication.csproj | 39 +++++----- .../packages.config | 22 ------ .../Avalonia.Base.UnitTests.csproj | 56 +++++---------- tests/Avalonia.Base.UnitTests/packages.config | 16 ----- .../Avalonia.Benchmarks.csproj | 24 ++----- tests/Avalonia.Benchmarks/packages.config | 7 -- .../Avalonia.Controls.UnitTests.csproj | 61 +++++----------- .../packages.config | 17 ----- .../Avalonia.DesignerSupport.Tests.csproj | 26 +++---- .../packages.config | 9 --- .../Avalonia.Direct2D1.UnitTests.csproj | 26 +++---- .../packages.config | 10 --- .../Avalonia.Input.UnitTests.csproj | 58 +++++---------- .../Avalonia.Input.UnitTests/packages.config | 17 ----- .../Avalonia.Interactivity.UnitTests.csproj | 52 +++++--------- .../packages.config | 16 ----- .../Avalonia.Layout.UnitTests.csproj | 51 ++++--------- .../Avalonia.Layout.UnitTests/packages.config | 15 ---- .../Avalonia.LeakTests.csproj | 72 +++++-------------- tests/Avalonia.LeakTests/packages.config | 19 ----- .../Avalonia.Markup.UnitTests.csproj | 64 +++++------------ .../Avalonia.Markup.UnitTests/packages.config | 19 ----- .../Avalonia.Markup.Xaml.UnitTests.csproj | 55 +++++--------- .../packages.config | 16 ----- .../Avalonia.Styling.UnitTests.csproj | 56 +++++---------- .../packages.config | 16 ----- .../Avalonia.UnitTests.csproj | 19 ++--- tests/Avalonia.UnitTests/packages.config | 6 -- .../Avalonia.Visuals.UnitTests.csproj | 41 ++++------- .../packages.config | 13 ---- 96 files changed, 493 insertions(+), 1453 deletions(-) delete mode 100644 samples/BindingTest/packages.config delete mode 100644 samples/ControlCatalog.Desktop/packages.config delete mode 100644 samples/ControlCatalog/packages.config delete mode 100644 samples/RenderTest/packages.config delete mode 100644 samples/VirtualizationTest/packages.config delete mode 100644 src/Android/Avalonia.Android/packages.config delete mode 100644 src/Android/Avalonia.AndroidTestApplication/packages.config delete mode 100644 src/Avalonia.Animation/packages.config delete mode 100644 src/Avalonia.Base/packages.config delete mode 100644 src/Avalonia.Controls/packages.config delete mode 100644 src/Avalonia.DesignerSupport/packages.config delete mode 100644 src/Avalonia.Diagnostics/packages.config delete mode 100644 src/Avalonia.DotNetFrameworkRuntime/packages.config delete mode 100644 src/Avalonia.HtmlRenderer/packages.config delete mode 100644 src/Avalonia.Input/packages.config delete mode 100644 src/Avalonia.Interactivity/packages.config delete mode 100644 src/Avalonia.Layout/packages.config delete mode 100644 src/Avalonia.Logging.Serilog/packages.config delete mode 100644 src/Avalonia.ReactiveUI/packages.config delete mode 100644 src/Avalonia.Styling/packages.config delete mode 100644 src/Avalonia.Themes.Default/packages.config delete mode 100644 src/Avalonia.Visuals/packages.config delete mode 100644 src/Gtk/Avalonia.Cairo/packages.config delete mode 100644 src/Gtk/Avalonia.Gtk/packages.config delete mode 100644 src/Markup/Avalonia.Markup.Xaml/packages.config delete mode 100644 src/Markup/Avalonia.Markup/packages.config delete mode 100644 src/Skia/Avalonia.Skia.Android/packages.config delete mode 100644 src/Skia/Avalonia.Skia.Desktop/packages.config delete mode 100644 src/Skia/Avalonia.Skia.iOS/packages.config delete mode 100644 src/Windows/Avalonia.Designer/packages.config delete mode 100644 src/Windows/Avalonia.Direct2D1/packages.config delete mode 100644 src/Windows/Avalonia.Win32/packages.config delete mode 100644 src/iOS/Avalonia.iOS/packages.config delete mode 100644 src/iOS/Avalonia.iOSTestApplication/packages.config delete mode 100644 tests/Avalonia.Base.UnitTests/packages.config delete mode 100644 tests/Avalonia.Benchmarks/packages.config delete mode 100644 tests/Avalonia.Controls.UnitTests/packages.config delete mode 100644 tests/Avalonia.DesignerSupport.Tests/packages.config delete mode 100644 tests/Avalonia.Direct2D1.UnitTests/packages.config delete mode 100644 tests/Avalonia.Input.UnitTests/packages.config delete mode 100644 tests/Avalonia.Interactivity.UnitTests/packages.config delete mode 100644 tests/Avalonia.Layout.UnitTests/packages.config delete mode 100644 tests/Avalonia.LeakTests/packages.config delete mode 100644 tests/Avalonia.Markup.UnitTests/packages.config delete mode 100644 tests/Avalonia.Markup.Xaml.UnitTests/packages.config delete mode 100644 tests/Avalonia.Styling.UnitTests/packages.config delete mode 100644 tests/Avalonia.UnitTests/packages.config delete mode 100644 tests/Avalonia.Visuals.UnitTests/packages.config diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 2dc0cd445b..49cde9efdb 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -1,5 +1,5 @@  - + Debug @@ -37,29 +37,9 @@ - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll - True - - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - - - ..\..\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 - @@ -185,4 +165,10 @@ --> + + + + + + \ No newline at end of file diff --git a/samples/BindingTest/packages.config b/samples/BindingTest/packages.config deleted file mode 100644 index 3c5f85de81..0000000000 --- a/samples/BindingTest/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index ca5743dd5c..31b3360a15 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -1,5 +1,5 @@  - + Debug @@ -37,14 +37,6 @@ - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll - True - - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll - True - @@ -156,4 +148,7 @@ --> + + + \ No newline at end of file diff --git a/samples/ControlCatalog.Desktop/packages.config b/samples/ControlCatalog.Desktop/packages.config deleted file mode 100644 index b3abe6f487..0000000000 --- a/samples/ControlCatalog.Desktop/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index f4a0915dd1..877c686a8b 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -1,5 +1,5 @@  - + 10.0 @@ -233,4 +233,7 @@ --> + + + \ No newline at end of file diff --git a/samples/ControlCatalog/packages.config b/samples/ControlCatalog/packages.config deleted file mode 100644 index 44ff0f0628..0000000000 --- a/samples/ControlCatalog/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index a14114ddc8..c8887f1a5d 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -1,5 +1,5 @@  - + Debug @@ -37,40 +37,8 @@ - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll - True - - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - - - ..\..\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 - @@ -219,4 +187,14 @@ --> + + + + + + + + + + \ No newline at end of file diff --git a/samples/RenderTest/packages.config b/samples/RenderTest/packages.config deleted file mode 100644 index 7ba5166073..0000000000 --- a/samples/RenderTest/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 9e80dfdc8f..0c109d4544 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -1,5 +1,5 @@  - + Debug @@ -37,28 +37,8 @@ - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.dll - True - - - ..\..\packages\Serilog.1.5.14\lib\net45\Serilog.FullNetFx.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - - - ..\..\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 - @@ -182,4 +162,10 @@ --> + + + + + + \ No newline at end of file diff --git a/samples/VirtualizationTest/packages.config b/samples/VirtualizationTest/packages.config deleted file mode 100644 index f2da2367fa..0000000000 --- a/samples/VirtualizationTest/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index 3ee2f5af64..a9ff8e6924 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -41,18 +41,6 @@ - - ..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll - True - - - ..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll - True - @@ -152,4 +140,22 @@ --> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Android/Avalonia.Android/packages.config b/src/Android/Avalonia.Android/packages.config deleted file mode 100644 index 057d0855b8..0000000000 --- a/src/Android/Avalonia.Android/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index d09f162150..3bdf123a02 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -64,35 +64,8 @@ - - ..\..\..\packages\Serilog.1.5.14\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll - True - - - ..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll - True - - - ..\..\..\packages\Sprache.2.1.0\lib\netstandard1.0\Sprache.dll - - - ..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll - True - - - ..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll - True - - - ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll - True - @@ -188,4 +161,28 @@ --> + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Android/Avalonia.AndroidTestApplication/packages.config b/src/Android/Avalonia.AndroidTestApplication/packages.config deleted file mode 100644 index d353146747..0000000000 --- a/src/Android/Avalonia.AndroidTestApplication/packages.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index 46aac81b5a..8fd6eb1896 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -63,22 +63,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -91,4 +75,11 @@ --> + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Animation/packages.config b/src/Avalonia.Animation/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Animation/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 90550a12f2..ce7a2b3aa8 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -126,26 +126,6 @@ - - ..\..\packages\JetBrains.Annotations.10.0.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\JetBrains.Annotations.PCL328.dll - True - - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -158,4 +138,12 @@ --> + + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Base/packages.config b/src/Avalonia.Base/packages.config deleted file mode 100644 index c372c92f3f..0000000000 --- a/src/Avalonia.Base/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index f12f07070e..7ee49bb0da 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -214,26 +214,6 @@ - - ..\..\packages\JetBrains.Annotations.10.0.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\JetBrains.Annotations.PCL328.dll - True - - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -277,4 +257,12 @@ --> + + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Controls/packages.config b/src/Avalonia.Controls/packages.config deleted file mode 100644 index c372c92f3f..0000000000 --- a/src/Avalonia.Controls/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index d9174d6f36..58a328d405 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -98,22 +98,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.DesignerSupport/packages.config b/src/Avalonia.DesignerSupport/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.DesignerSupport/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index a56575dab7..8eee79892b 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -117,25 +117,6 @@ - - ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll - - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -154,4 +135,12 @@ --> + + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Diagnostics/packages.config b/src/Avalonia.Diagnostics/packages.config deleted file mode 100644 index df107dc625..0000000000 --- a/src/Avalonia.Diagnostics/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj index e87ec0b5a7..4a8ce05013 100644 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj +++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj @@ -1,5 +1,5 @@  - + Debug @@ -36,14 +36,6 @@ - - ..\..\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 - @@ -86,4 +78,8 @@ --> + + + + \ No newline at end of file diff --git a/src/Avalonia.DotNetFrameworkRuntime/packages.config b/src/Avalonia.DotNetFrameworkRuntime/packages.config deleted file mode 100644 index 1e93a8c9e7..0000000000 --- a/src/Avalonia.DotNetFrameworkRuntime/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index 8f16bad64a..cda64c2bce 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -1,5 +1,5 @@  - + 10.0 @@ -174,14 +174,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - @@ -198,4 +190,10 @@ --> + + + + + + \ No newline at end of file diff --git a/src/Avalonia.HtmlRenderer/packages.config b/src/Avalonia.HtmlRenderer/packages.config deleted file mode 100644 index b6a9c7823c..0000000000 --- a/src/Avalonia.HtmlRenderer/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index c1ed34c1c7..161897fcad 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -121,22 +121,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Input/packages.config b/src/Avalonia.Input/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Input/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 0d81690de0..32890f590f 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -75,22 +75,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Interactivity/packages.config b/src/Avalonia.Interactivity/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Interactivity/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 41b545b5cb..c7938b2859 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -71,22 +71,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Layout/packages.config b/src/Avalonia.Layout/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Layout/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 0fb85db795..2e703758ef 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -1,5 +1,5 @@  - + 10.0 @@ -41,10 +41,6 @@ - - ..\..\packages\Serilog.1.5.14\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll - True - @@ -63,4 +59,7 @@ --> + + + \ No newline at end of file diff --git a/src/Avalonia.Logging.Serilog/packages.config b/src/Avalonia.Logging.Serilog/packages.config deleted file mode 100644 index dbc72b5331..0000000000 --- a/src/Avalonia.Logging.Serilog/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj index 98cf115eaf..7e65460e40 100644 --- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj +++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj @@ -1,5 +1,5 @@  - + 10.0 @@ -87,25 +87,6 @@ - - ..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll - - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.0\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.0\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -118,4 +99,12 @@ --> + + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/packages.config b/src/Avalonia.ReactiveUI/packages.config deleted file mode 100644 index f10d6d8873..0000000000 --- a/src/Avalonia.ReactiveUI/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index d38406caa7..e6642cbf69 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -80,22 +80,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -124,4 +108,11 @@ --> + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Styling/packages.config b/src/Avalonia.Styling/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Styling/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 26d168cb2a..6d770ed90e 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -192,22 +192,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -222,4 +206,11 @@ --> + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Themes.Default/packages.config b/src/Avalonia.Themes.Default/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Themes.Default/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 514fa6f481..64fbab2307 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -172,22 +172,6 @@ - - ..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.Visuals/packages.config b/src/Avalonia.Visuals/packages.config deleted file mode 100644 index 9f732f1bcb..0000000000 --- a/src/Avalonia.Visuals/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj b/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj index 3ecd91eee2..da3c8c9952 100644 --- a/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj +++ b/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj @@ -1,5 +1,5 @@  - + Debug @@ -38,14 +38,6 @@ - - ..\..\..\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 - @@ -120,4 +112,8 @@ --> + + + + \ No newline at end of file diff --git a/src/Gtk/Avalonia.Cairo/packages.config b/src/Gtk/Avalonia.Cairo/packages.config deleted file mode 100644 index 1e93a8c9e7..0000000000 --- a/src/Gtk/Avalonia.Cairo/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj index d7e4400a99..257736aaf1 100644 --- a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj +++ b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -37,14 +37,6 @@ - - ..\..\..\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 - @@ -108,4 +100,8 @@ + + + + \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk/packages.config b/src/Gtk/Avalonia.Gtk/packages.config deleted file mode 100644 index 1e93a8c9e7..0000000000 --- a/src/Gtk/Avalonia.Gtk/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 4ed20629cf..c7be3a0d90 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -322,25 +322,6 @@ - - ..\..\..\packages\Sprache.2.1.0\lib\netstandard1.0\Sprache.dll - - - ..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -353,4 +334,16 @@ --> + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/packages.config b/src/Markup/Avalonia.Markup.Xaml/packages.config deleted file mode 100644 index 7a9353bb05..0000000000 --- a/src/Markup/Avalonia.Markup.Xaml/packages.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 5826346fc9..155779fa1f 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -1,5 +1,5 @@  - + 11.0 @@ -114,22 +114,6 @@ - - ..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.1\System.Reactive.Core.dll - True - - - ..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.1\System.Reactive.Linq.dll - True - - - ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.0\System.Reactive.PlatformServices.dll - True - @@ -142,4 +126,12 @@ --> + + + + + + + + \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup/packages.config b/src/Markup/Avalonia.Markup/packages.config deleted file mode 100644 index bcef21429a..0000000000 --- a/src/Markup/Avalonia.Markup/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj index c644bd84b3..4c20239e64 100644 --- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj +++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -40,9 +40,6 @@ - - ..\..\..\packages\SkiaSharp.1.56.1-beta\lib\MonoAndroid\SkiaSharp.dll - @@ -98,4 +95,7 @@ --> + + + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Android/packages.config b/src/Skia/Avalonia.Skia.Android/packages.config deleted file mode 100644 index 0b3bfb071f..0000000000 --- a/src/Skia/Avalonia.Skia.Android/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj index 74d592f9bf..fd9d380cd4 100644 --- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj +++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj @@ -1,5 +1,5 @@  - + Debug @@ -57,9 +57,6 @@ MinimumRecommendedRules.ruleset - - ..\..\..\packages\SkiaSharp.1.56.1-beta\lib\net45\SkiaSharp.dll - @@ -127,4 +124,7 @@ --> + + + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Desktop/packages.config b/src/Skia/Avalonia.Skia.Desktop/packages.config deleted file mode 100644 index 2213dede69..0000000000 --- a/src/Skia/Avalonia.Skia.Desktop/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj index 08fcd61471..a6479eb1a7 100644 --- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj +++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -43,9 +43,6 @@ - - ..\..\..\packages\SkiaSharp.1.56.1-beta\lib\XamariniOS\SkiaSharp.dll - @@ -95,4 +92,7 @@ + + + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.iOS/packages.config b/src/Skia/Avalonia.Skia.iOS/packages.config deleted file mode 100644 index a48c7f04d5..0000000000 --- a/src/Skia/Avalonia.Skia.iOS/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj index a84cec6e5a..767ea06c60 100644 --- a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj +++ b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj @@ -1,5 +1,5 @@  - + Debug @@ -46,10 +46,6 @@ - - ..\..\..\packages\JetBrains.Annotations.10.0.0\lib\net20\JetBrains.Annotations.dll - True - @@ -135,4 +131,7 @@ --> + + + \ No newline at end of file diff --git a/src/Windows/Avalonia.Designer/packages.config b/src/Windows/Avalonia.Designer/packages.config deleted file mode 100644 index b0ac21bcd8..0000000000 --- a/src/Windows/Avalonia.Designer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index 8292ab46ed..0773300656 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -1,5 +1,5 @@  - + Debug @@ -37,18 +37,6 @@ true - - ..\..\..\packages\SharpDX.3.1.1\lib\net45\SharpDX.dll - - - ..\..\..\packages\SharpDX.Direct2D1.3.1.1\lib\net45\SharpDX.Direct2D1.dll - - - ..\..\..\packages\SharpDX.Direct3D11.3.1.1\lib\net45\SharpDX.Direct3D11.dll - - - ..\..\..\packages\SharpDX.DXGI.3.1.1\lib\net45\SharpDX.DXGI.dll - @@ -133,4 +121,10 @@ --> + + + + + + \ No newline at end of file diff --git a/src/Windows/Avalonia.Direct2D1/packages.config b/src/Windows/Avalonia.Direct2D1/packages.config deleted file mode 100644 index 780e6014e5..0000000000 --- a/src/Windows/Avalonia.Direct2D1/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index c05d2bf8cd..be86e3c4d3 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -1,5 +1,5 @@  - + Debug @@ -44,14 +44,6 @@ - - ..\..\..\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 - @@ -121,4 +113,8 @@ --> + + + + \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32/packages.config b/src/Windows/Avalonia.Win32/packages.config deleted file mode 100644 index 1e93a8c9e7..0000000000 --- a/src/Windows/Avalonia.Win32/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj index d7cba35d29..7ef7108785 100644 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj +++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj @@ -1,5 +1,5 @@  - + Debug iPhoneSimulator @@ -98,22 +98,6 @@ - - ..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll - True - - - ..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll - True - - - ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll - True - @@ -123,4 +107,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/iOS/Avalonia.iOS/packages.config b/src/iOS/Avalonia.iOS/packages.config deleted file mode 100644 index 57fa6a12d6..0000000000 --- a/src/iOS/Avalonia.iOS/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj index ff7aa94502..089b8afb73 100644 --- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj +++ b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj @@ -1,5 +1,5 @@  - + Debug iPhoneSimulator @@ -109,22 +109,6 @@ - - ..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll - True - - - ..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll - True - - - ..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll - True - - - ..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll - True - @@ -203,4 +187,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/iOS/Avalonia.iOSTestApplication/packages.config b/src/iOS/Avalonia.iOSTestApplication/packages.config deleted file mode 100644 index 57fa6a12d6..0000000000 --- a/src/iOS/Avalonia.iOSTestApplication/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index 07ed7f14ca..c44445a709 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -39,47 +39,8 @@ 4 - - ..\..\packages\Microsoft.Reactive.Testing.3.0.0\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\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\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -162,4 +123,19 @@ --> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Base.UnitTests/packages.config b/tests/Avalonia.Base.UnitTests/packages.config deleted file mode 100644 index f2128ddba6..0000000000 --- a/tests/Avalonia.Base.UnitTests/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index cb8b32c2cc..004c838336 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -1,5 +1,5 @@  - + Debug @@ -35,25 +35,9 @@ 4 - - ..\..\packages\BenchmarkDotNet.0.9.2\lib\net45\BenchmarkDotNet.dll - True - - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\packages\AutoFixture.3.40.0\lib\net40\Ploeh.AutoFixture.dll - True - - - ..\..\packages\AutoFixture.AutoMoq.3.40.0\lib\net40\Ploeh.AutoFixture.AutoMoq.dll - True - @@ -123,4 +107,10 @@ --> + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Benchmarks/packages.config b/tests/Avalonia.Benchmarks/packages.config deleted file mode 100644 index b1d27d4562..0000000000 --- a/tests/Avalonia.Benchmarks/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index c581cccf2f..f7b65d612b 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -39,51 +39,8 @@ 4 - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\packages\AutoFixture.3.40.0\lib\net40\Ploeh.AutoFixture.dll - True - - - ..\..\packages\AutoFixture.AutoMoq.3.40.0\lib\net40\Ploeh.AutoFixture.AutoMoq.dll - True - - - ..\..\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\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -244,4 +201,20 @@ --> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/packages.config b/tests/Avalonia.Controls.UnitTests/packages.config deleted file mode 100644 index 8dd3ac4427..0000000000 --- a/tests/Avalonia.Controls.UnitTests/packages.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj index 97dfda5967..be65465491 100644 --- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj +++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -38,22 +38,6 @@ - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -83,4 +67,12 @@ --> + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.DesignerSupport.Tests/packages.config b/tests/Avalonia.DesignerSupport.Tests/packages.config deleted file mode 100644 index 24039f1451..0000000000 --- a/tests/Avalonia.DesignerSupport.Tests/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj index 3db0bfa876..5eb48b8502 100644 --- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj +++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj @@ -1,5 +1,5 @@  - + @@ -43,21 +43,6 @@ - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -124,4 +109,13 @@ --> + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Direct2D1.UnitTests/packages.config b/tests/Avalonia.Direct2D1.UnitTests/packages.config deleted file mode 100644 index dcbf45edf0..0000000000 --- a/tests/Avalonia.Direct2D1.UnitTests/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj index 5ed05e9e33..a1a917ed25 100644 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj +++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj @@ -1,5 +1,5 @@  - + @@ -35,54 +35,14 @@ 4 - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\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 - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -151,4 +111,20 @@ --> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Input.UnitTests/packages.config b/tests/Avalonia.Input.UnitTests/packages.config deleted file mode 100644 index 459b77b465..0000000000 --- a/tests/Avalonia.Input.UnitTests/packages.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj index d8a6ee2506..710dfc88a7 100644 --- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj +++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj @@ -1,5 +1,5 @@  - + @@ -37,47 +37,12 @@ - - ..\..\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 - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -138,4 +103,19 @@ --> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Interactivity.UnitTests/packages.config b/tests/Avalonia.Interactivity.UnitTests/packages.config deleted file mode 100644 index 953a4a666d..0000000000 --- a/tests/Avalonia.Interactivity.UnitTests/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index d7912d1828..7e0418f306 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -39,42 +39,7 @@ 4 - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\packages\AutoFixture.3.40.0\lib\net40\Ploeh.AutoFixture.dll - True - - - ..\..\packages\AutoFixture.AutoMoq.3.40.0\lib\net40\Ploeh.AutoFixture.AutoMoq.dll - True - - - ..\..\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\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -186,4 +151,18 @@ --> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Layout.UnitTests/packages.config b/tests/Avalonia.Layout.UnitTests/packages.config deleted file mode 100644 index 6dbff1e105..0000000000 --- a/tests/Avalonia.Layout.UnitTests/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index 31e7d5ebea..cef6a02225 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -33,44 +33,8 @@ 4 - - ..\..\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\lib\dotMemory.Unit.dll - True - - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\packages\AutoFixture.3.40.0\lib\net40\Ploeh.AutoFixture.dll - True - - - ..\..\packages\AutoFixture.AutoMoq.3.40.0\lib\net40\Ploeh.AutoFixture.AutoMoq.dll - True - - - ..\..\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 - @@ -78,22 +42,6 @@ - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -178,4 +126,22 @@ --> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.LeakTests/packages.config b/tests/Avalonia.LeakTests/packages.config deleted file mode 100644 index 302ccfb214..0000000000 --- a/tests/Avalonia.LeakTests/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index e2b11dc1f0..ea7c87da2e 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -1,5 +1,5 @@  - + @@ -34,41 +34,13 @@ 4 - - ..\..\packages\Microsoft.Reactive.Testing.3.0.0\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\Profile\Profile7\System.ComponentModel.Annotations.dll - - ..\..\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 - @@ -76,22 +48,6 @@ - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -179,4 +135,22 @@ --> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Markup.UnitTests/packages.config b/tests/Avalonia.Markup.UnitTests/packages.config deleted file mode 100644 index d264c076fd..0000000000 --- a/tests/Avalonia.Markup.UnitTests/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj index 6bb8fb0008..dc044cbe83 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -42,45 +42,7 @@ 4 - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - True - - - ..\..\packages\Sprache.2.1.0\lib\net40\Sprache.dll - - - ..\..\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\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -221,4 +183,19 @@ --> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/packages.config b/tests/Avalonia.Markup.Xaml.UnitTests/packages.config deleted file mode 100644 index cad6395387..0000000000 --- a/tests/Avalonia.Markup.Xaml.UnitTests/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj index cf53b4ef9b..e80ab1cc8b 100644 --- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj +++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -39,47 +39,8 @@ 4 - - ..\..\packages\Microsoft.Reactive.Testing.3.0.0\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\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\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -191,4 +152,19 @@ --> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Styling.UnitTests/packages.config b/tests/Avalonia.Styling.UnitTests/packages.config deleted file mode 100644 index f2128ddba6..0000000000 --- a/tests/Avalonia.Styling.UnitTests/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index f7878ab91a..1133da9286 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -32,20 +32,8 @@ 4 - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\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 - @@ -127,4 +115,9 @@ --> + + + + + \ No newline at end of file diff --git a/tests/Avalonia.UnitTests/packages.config b/tests/Avalonia.UnitTests/packages.config deleted file mode 100644 index 8805596f60..0000000000 --- a/tests/Avalonia.UnitTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj index 97b3e38e32..0d0e9648e6 100644 --- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj +++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -39,34 +39,7 @@ 4 - - ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\..\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\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -173,4 +146,16 @@ --> + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Visuals.UnitTests/packages.config b/tests/Avalonia.Visuals.UnitTests/packages.config deleted file mode 100644 index 8eb9d05cfc..0000000000 --- a/tests/Avalonia.Visuals.UnitTests/packages.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From e780c4201af14fa74c0ba2f63ebe5a1cd95eda3d Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 7 Mar 2017 22:55:43 +0300 Subject: [PATCH 02/38] Switched to .NETStandard (mostly 1.1) --- Avalonia.sln | 4 +- samples/BindingTest/BindingTest.csproj | 7 ++- .../ControlCatalog.Desktop.csproj | 5 +- samples/ControlCatalog/ControlCatalog.csproj | 2 +- samples/RenderTest/RenderTest.csproj | 8 +-- .../VirtualizationTest.csproj | 7 ++- .../Resources/Resource.Designer.cs | 7 ++- .../Avalonia.AndroidTestApplication.csproj | 4 +- .../Resources/Resource.Designer.cs | 1 + .../Avalonia.Animation.csproj | 31 ++--------- src/Avalonia.Base/Avalonia.Base.csproj | 35 ++---------- .../Avalonia.Controls.csproj | 36 ++----------- src/Avalonia.Controls/Utils/UndoRedoHelper.cs | 1 - .../Avalonia.DesignerSupport.csproj | 32 ++--------- .../Avalonia.Diagnostics.csproj | 29 ++-------- .../Avalonia.DotNetCoreRuntime.csproj | 40 ++++---------- src/Avalonia.DotNetCoreRuntime/project.json | 11 ---- .../Avalonia.HtmlRenderer.csproj | 48 +++-------------- src/Avalonia.HtmlRenderer/Compat/Api.cs | 28 ++++++++++ src/Avalonia.Input/Avalonia.Input.csproj | 35 ++---------- src/Avalonia.Input/IInputElement.cs | 2 - .../Avalonia.Interactivity.csproj | 30 ++--------- src/Avalonia.Layout/Avalonia.Layout.csproj | 30 ++--------- .../Avalonia.Logging.Serilog.csproj | 33 ++---------- .../Avalonia.ReactiveUI.csproj | 53 ++++++++----------- src/Avalonia.ReactiveUI/Shims.cs | 34 ++++++++++++ src/Avalonia.Styling/Avalonia.Styling.csproj | 31 ++--------- .../Avalonia.Themes.Default.csproj | 31 ++--------- src/Avalonia.Visuals/Avalonia.Visuals.csproj | 35 ++---------- src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj | 29 ++-------- .../Avalonia.Markup.Xaml.csproj | 28 ++-------- .../Avalonia.Markup/Avalonia.Markup.csproj | 31 ++--------- .../StandardRuntimePlatform.cs | 2 +- .../Avalonia.Skia.Desktop.NetStandard.csproj | 34 +++--------- .../project.json | 11 ---- .../Avalonia.Skia.Desktop.csproj | 16 ------ .../Avalonia.Designer.csproj | 2 +- .../Avalonia.Win32.NetStandard.csproj | 32 ++--------- .../Avalonia.Win32.NetStandard/project.json | 11 ---- 39 files changed, 210 insertions(+), 636 deletions(-) delete mode 100644 src/Avalonia.DotNetCoreRuntime/project.json create mode 100644 src/Avalonia.HtmlRenderer/Compat/Api.cs create mode 100644 src/Avalonia.ReactiveUI/Shims.cs delete mode 100644 src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json delete mode 100644 src/Windows/Avalonia.Win32.NetStandard/project.json diff --git a/Avalonia.sln b/Avalonia.sln index ad14483b40..c2ba081fc0 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}" EndProject diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 49cde9efdb..d8663f5031 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -166,8 +166,11 @@ --> - - + + + 2.1.0 + + diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index 31b3360a15..bd0e56e3e6 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -149,6 +149,9 @@ --> - + + + 2.1.0 + \ No newline at end of file diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 877c686a8b..80e1f591ea 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -234,6 +234,6 @@ --> - + \ No newline at end of file diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index c8887f1a5d..b60eb7ab36 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -66,7 +66,6 @@ - @@ -188,8 +187,11 @@ --> - - + + + 2.1.0 + + diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 0c109d4544..0ed2b9d9bd 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -163,8 +163,11 @@ --> - - + + + 2.1.0 + + diff --git a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs index 80cbbc51ec..e66c2800d3 100644 --- a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs +++ b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs @@ -40,11 +40,14 @@ namespace Avalonia.Android public partial class String { + // aapt resource value: 0x7f020002 + public static int ApplicationName = 2130837506; + // aapt resource value: 0x7f020001 - public static int ApplicationName = 2130837505; + public static int Hello = 2130837505; // aapt resource value: 0x7f020000 - public static int Hello = 2130837504; + public static int library_name = 2130837504; static String() { diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index 3bdf123a02..7ce8879304 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -162,8 +162,8 @@ --> - - + + diff --git a/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs b/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs index 3fa0707176..91327cf941 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs +++ b/src/Android/Avalonia.AndroidTestApplication/Resources/Resource.Designer.cs @@ -28,6 +28,7 @@ namespace Avalonia.AndroidTestApplication { global::Avalonia.Android.Resource.String.ApplicationName = global::Avalonia.AndroidTestApplication.Resource.String.ApplicationName; global::Avalonia.Android.Resource.String.Hello = global::Avalonia.AndroidTestApplication.Resource.String.Hello; + global::Avalonia.Android.Resource.String.library_name = global::Avalonia.AndroidTestApplication.Resource.String.library_name; global::Splat.Resource.String.library_name = global::Avalonia.AndroidTestApplication.Resource.String.library_name; } diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index 8fd6eb1896..0ede370efc 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -1,20 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {D211E587-D8BC-45B9-95A4-F297C8FA5200} - Library - Properties - Avalonia.Animation - Avalonia.Animation - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 + netstandard1.1 + False + false true @@ -64,17 +52,6 @@ - - - - - diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index ce7a2b3aa8..f5c5815124 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} - Library - Properties - Avalonia - Avalonia.Base - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -128,18 +114,7 @@ - - - - - - + diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index 7ee49bb0da..21b29c53f9 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {D2221C82-4A25-4583-9B43-D791E3F6820C} - Library - Properties - Avalonia.Controls - Avalonia.Controls - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -215,9 +201,6 @@ - - - {D211E587-D8BC-45B9-95A4-F297C8FA5200} @@ -248,17 +231,8 @@ Avalonia.Styling - - - - + diff --git a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs index 71ba3793d1..be4c1aa6c4 100644 --- a/src/Avalonia.Controls/Utils/UndoRedoHelper.cs +++ b/src/Avalonia.Controls/Utils/UndoRedoHelper.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using JetBrains.Annotations; using Avalonia.Utilities; namespace Avalonia.Controls.Utils diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 58a328d405..455c149e30 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {799A7BB5-3C2C-48B6-85A7-406A12C420DA} - Library - Properties - Avalonia - Avalonia.DesignerSupport - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -94,20 +80,12 @@ - - - - - - - + diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 8eee79892b..3321afcc88 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {7062AE20-5DCC-4442-9645-8195BDECE63E} - Library - Properties - Avalonia.Diagnostics - Avalonia.Diagnostics - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -119,7 +105,6 @@ - Designer @@ -127,16 +112,12 @@ Designer - - - + diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index 8a60d5d9c7..434420e376 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -1,22 +1,9 @@ - - - - - 14.0 - Debug - AnyCPU - {7863EA94-F0FB-4386-BF8C-E5BFA761560A} - Library - Properties - Avalonia.DotNetCoreRuntime - Avalonia.DotNetCoreRuntime - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - v5.0 - + + + netstandard1.6 + False + false + true full @@ -36,10 +23,6 @@ 4 bin\Release\Avalonia.DotNetCoreRuntime.XML - - - - SharedAssemblyInfo.cs @@ -77,13 +60,8 @@ + + + - - \ No newline at end of file diff --git a/src/Avalonia.DotNetCoreRuntime/project.json b/src/Avalonia.DotNetCoreRuntime/project.json deleted file mode 100644 index d6ae90b33b..0000000000 --- a/src/Avalonia.DotNetCoreRuntime/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "supports": {}, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0", - "System.Threading.ThreadPool": "4.3.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} \ No newline at end of file diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index cda64c2bce..e759210820 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -1,22 +1,8 @@ - - - + - 10.0 - Debug - AnyCPU - {5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D} - Library - Properties - Avalonia.HtmlRenderer - Avalonia.HtmlRenderer - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -35,6 +21,9 @@ prompt 4 + + + @@ -51,6 +40,7 @@ + @@ -171,28 +161,6 @@ - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - diff --git a/src/Avalonia.HtmlRenderer/Compat/Api.cs b/src/Avalonia.HtmlRenderer/Compat/Api.cs new file mode 100644 index 0000000000..798b697277 --- /dev/null +++ b/src/Avalonia.HtmlRenderer/Compat/Api.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace System.Net +{ + internal class AsyncCompletedEventArgs + { + public object UserState { get; set; } + public Exception Error { get; set; } + public bool Cancelled { get; set; } + + public AsyncCompletedEventArgs(Exception error, bool cancelled, object userState) + { + + } + } + + class WebException : Exception + { + public object Response { get; set; } + } + + class HttpWebResponse + { + public HttpStatusCode StatusCode { get; set; } + } +} diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index 161897fcad..3a2c069217 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {62024B2D-53EB-4638-B26B-85EEAA54866E} - Library - Properties - Avalonia.Input - Avalonia.Input - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -117,19 +103,6 @@ - - - - - - - diff --git a/src/Avalonia.Input/IInputElement.cs b/src/Avalonia.Input/IInputElement.cs index 72f03d3ae5..786353f05c 100644 --- a/src/Avalonia.Input/IInputElement.cs +++ b/src/Avalonia.Input/IInputElement.cs @@ -1,7 +1,5 @@ // 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.Diagnostics.Contracts; using System; using System.Collections.Generic; using Avalonia.Interactivity; diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 32890f590f..68755fa2b8 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} - Library - Properties - Avalonia.Interactivity - Avalonia.Interactivity - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -76,14 +62,6 @@ - - diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index c7938b2859..a3423cb60d 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {42472427-4774-4C81-8AFF-9F27B8E31721} - Library - Properties - Avalonia - Avalonia.Layout - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -72,14 +58,6 @@ - - diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 2e703758ef..c5781c9a1a 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -1,20 +1,8 @@ - - - + - 10.0 - Debug - AnyCPU - {B61B66A3-B82D-4875-8001-89D3394FE0C9} - Library - Properties - Avalonia.Logging.Serilog - Avalonia.Logging.Serilog - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 + netstandard1.1 + False + false true @@ -42,24 +30,13 @@ - - - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Avalonia.Base - - - + \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj index 7e65460e40..c5789eddac 100644 --- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj +++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj @@ -1,27 +1,15 @@ - - - + - 10.0 - Debug - AnyCPU - {6417B24E-49C2-4985-8DB2-3AB9D898EC91} - Library - Properties - Avalonia.ReactiveUI - Avalonia.ReactiveUI - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile259 - v4.5 + netstandard1.1 + False + false true full false bin\Debug\ - TRACE;DEBUG;MONO PORTABLE + TRACE;DEBUG;MONO PORTABLE;NETSTANDARD1_1 prompt 4 @@ -29,15 +17,19 @@ pdbonly true bin\Release\ - TRACE;MONO PORTABLE + TRACE;MONO PORTABLE;RELEASE;NETSTANDARD1_1 prompt 4 + + + + @@ -65,9 +57,7 @@ - - Code - + @@ -86,25 +76,26 @@ - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/Shims.cs b/src/Avalonia.ReactiveUI/Shims.cs new file mode 100644 index 0000000000..2729a68d6f --- /dev/null +++ b/src/Avalonia.ReactiveUI/Shims.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace System.Runtime.Serialization +{ + class IgnoreDataMemberAttribute : Attribute + { + } + + class DataMemberAttribute : Attribute + { + } + class OnDeserializedAttribute : Attribute + { + } + + class DataContractAttribute : Attribute + { + } + + class StreamingContext { } +} + +namespace System.Diagnostics.Contracts +{ + static class Contract + { + public static void Requires(bool condition) + { + + } + } +} diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index e6642cbf69..ea35845030 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} - Library - Properties - Avalonia - Avalonia.Styling - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -81,11 +67,6 @@ - - - - - {d211e587-d8bc-45b9-95a4-f297c8fa5200} @@ -100,14 +81,10 @@ Avalonia.Visuals - - diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 6d770ed90e..f599e007d5 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F} - Library - Properties - Avalonia.Themes.Default - Avalonia.Themes.Default - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -184,7 +170,6 @@ Designer - @@ -198,14 +183,6 @@ Designer - - diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 64fbab2307..0834384f90 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -1,22 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {EB582467-6ABB-43A1-B052-E981BA910E3A} - Library - Properties - Avalonia - Avalonia.Visuals - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 - - + netstandard1.1 + False + false true @@ -168,19 +154,6 @@ - - - - - - - diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index 958af437a6..ac20833787 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -1,21 +1,8 @@ - - - + - 14.0 - Debug - AnyCPU - {BB1F7BB5-6AD4-4776-94D9-C09D0A972658} - Library - Properties - Avalonia.Gtk3 - Avalonia.Gtk3 - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - v5.0 + netstandard1.1 + False + false true @@ -92,12 +79,4 @@ Avalonia.SceneGraph - - \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index c7be3a0d90..7786272834 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -1,20 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {3E53A01A-B331-47F3-B828-4A5717E77A24} - Library - Properties - Avalonia.Markup.Xaml - Avalonia.Markup.Xaml - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 + netstandard1.1 + False + false true @@ -279,10 +267,6 @@ - - - - {D211E587-D8BC-45B9-95A4-F297C8FA5200} @@ -326,14 +310,10 @@ - - diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 155779fa1f..9240561ba4 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -1,20 +1,8 @@ - - - + - 11.0 - Debug - AnyCPU - {6417E941-21BC-467B-A771-0DE389353CE6} - Library - Properties - Avalonia.Markup - Avalonia.Markup - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile7 - v4.5 + netstandard1.1 + False + false true @@ -113,21 +101,12 @@ Avalonia.Styling - - - - - - - - + diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs index e2aafd562b..1f42aec16e 100644 --- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs +++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs @@ -13,7 +13,7 @@ namespace Avalonia.Shared.PlatformSupport { #if NETSTANDARD - public void PostThreadPoolItem(Action cb) => ThreadPool.QueueUserWorkItem(_ => cb(), null); + public void PostThreadPoolItem(Action cb) => ThreadPool.QueueUserWorkItem(_ => cb(), null); #else public Assembly[] GetLoadedAssemblies() => AppDomain.CurrentDomain.GetAssemblies(); public void PostThreadPoolItem(Action cb) => ThreadPool.UnsafeQueueUserWorkItem(_ => cb(), null); diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index f421ed04f4..4e8bb06e13 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -1,21 +1,10 @@ - - - + - 14.0 - Debug - AnyCPU - {7D2D3083-71DD-4CC9-8907-39A0D86FB322} - Library - Properties + netstandard1.3 + False + false Avalonia.Skia.Desktop Avalonia.Skia.Desktop - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - v5.0 true @@ -36,15 +25,14 @@ 4 true - - - - Properties\SharedAssemblyInfo.cs + + + {b09b78d8-9b26-48b0-9149-d64a2f120f3f} @@ -77,12 +65,4 @@ - - \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json b/src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json deleted file mode 100644 index 8615e024b7..0000000000 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "supports": {}, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0", - "SkiaSharp": "1.56.1-beta" - }, - "frameworks": { - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj index fd9d380cd4..164bccc933 100644 --- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj +++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj @@ -104,27 +104,11 @@ Avalonia.Styling - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj index 767ea06c60..b59892f4a4 100644 --- a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj +++ b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj @@ -132,6 +132,6 @@ --> - + \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj index 95d1b8a345..0642bc7754 100644 --- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj +++ b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj @@ -1,21 +1,8 @@ - - - + - 14.0 - Debug - AnyCPU - {40759A76-D0F2-464E-8000-6FF0F5C4BD7C} - Library - Properties - Avalonia.Win32 - Avalonia.Win32 - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - v5.0 + netstandard1.1 + False + false true @@ -81,16 +68,5 @@ - - - - - \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32.NetStandard/project.json b/src/Windows/Avalonia.Win32.NetStandard/project.json deleted file mode 100644 index 74e316ac12..0000000000 --- a/src/Windows/Avalonia.Win32.NetStandard/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "supports": {}, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0", - "System.Reactive.Core": "3.0.0" - }, - "frameworks": { - "netstandard1.1": {} - } -} \ No newline at end of file From 363898e658c3663405586b086c7ba144fe3638dc Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 7 Mar 2017 23:20:52 +0300 Subject: [PATCH 03/38] Migrated render tests to PackageReference --- .../Avalonia.Cairo.RenderTests.csproj | 83 ++++++++++--------- .../Avalonia.Direct2D1.RenderTests.csproj | 48 +++++------ .../Avalonia.Skia.RenderTests.csproj | 47 ++++++----- ...packages.Avalonia.Cairo.RenderTests.config | 16 ---- ...ages.Avalonia.Direct2D1.RenderTests.config | 10 --- .../packages.Avalonia.Skia.RenderTests.config | 10 --- 6 files changed, 90 insertions(+), 124 deletions(-) delete mode 100644 tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config delete mode 100644 tests/Avalonia.RenderTests/packages.Avalonia.Direct2D1.RenderTests.config delete mode 100644 tests/Avalonia.RenderTests/packages.Avalonia.Skia.RenderTests.config diff --git a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj index 7392fd76cd..3bf901298b 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -37,49 +37,9 @@ 4 - - ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll - True - - - ..\..\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 - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -168,4 +128,45 @@ --> + + + 7.0.0.0101 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 3.0.0 + + + 2.1.0 + + + 2.0.0 + + + 2.1.0 + + + 2.1.0 + + + 2.1.0 + + + 2.1.0 + + \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj index 68d25a73c8..a4d1324fbb 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -40,31 +40,8 @@ - - ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll - True - - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -152,4 +129,27 @@ --> + + + 7.0.0.0101 + + + 2.1.0 + + + 2.0.0 + + + 2.1.0 + + + 2.1.0 + + + 2.1.0 + + + 2.1.0 + + \ 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 1ba80837f0..16fd908fcf 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj @@ -1,5 +1,5 @@  - + @@ -51,10 +51,6 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Magick.NET-Q16-AnyCPU.7.0.0.0101\lib\net40-client\Magick.NET-Q16-AnyCPU.dll - True - @@ -64,24 +60,6 @@ - - ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll - - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - @@ -145,4 +123,27 @@ --> + + + 7.0.0.0101 + + + 2.1.0 + + + 2.0.0 + + + 2.1.0 + + + 2.1.0 + + + 2.1.0 + + + 2.1.0 + + \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config b/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config deleted file mode 100644 index fa1e626283..0000000000 --- a/tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/packages.Avalonia.Direct2D1.RenderTests.config b/tests/Avalonia.RenderTests/packages.Avalonia.Direct2D1.RenderTests.config deleted file mode 100644 index 07a670d200..0000000000 --- a/tests/Avalonia.RenderTests/packages.Avalonia.Direct2D1.RenderTests.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/packages.Avalonia.Skia.RenderTests.config b/tests/Avalonia.RenderTests/packages.Avalonia.Skia.RenderTests.config deleted file mode 100644 index 07a670d200..0000000000 --- a/tests/Avalonia.RenderTests/packages.Avalonia.Skia.RenderTests.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file From b6b5b9de88ce03fbceb3ab51f57c3ba6560cb006 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 01:48:42 +0300 Subject: [PATCH 04/38] Test now compile and can be run from visual studio --- .../Avalonia.Base.UnitTests.csproj | 26 ++++-------- .../Avalonia.Benchmarks.csproj | 2 +- .../Avalonia.Controls.UnitTests.csproj | 23 ++++------- .../Avalonia.DesignerSupport.TestApp.csproj | 2 +- .../Avalonia.DesignerSupport.Tests.csproj | 14 +++---- .../Avalonia.Direct2D1.UnitTests.csproj | 23 ++++------- .../Avalonia.Input.UnitTests.csproj | 23 ++++------- .../Avalonia.Interactivity.UnitTests.csproj | 23 ++++------- .../Avalonia.Layout.UnitTests.csproj | 23 ++++------- .../Avalonia.LeakTests.csproj | 14 +++---- .../Avalonia.Markup.UnitTests.csproj | 40 ++++--------------- .../Avalonia.Markup.Xaml.UnitTests.csproj | 23 ++++------- .../Avalonia.Cairo.RenderTests.csproj | 33 ++++----------- .../Avalonia.Direct2D1.RenderTests.csproj | 31 ++++---------- .../Avalonia.Skia.RenderTests.csproj | 36 ++++------------- .../Avalonia.Styling.UnitTests.csproj | 23 ++++------- .../Avalonia.UnitTests.csproj | 2 +- .../Avalonia.Visuals.UnitTests.csproj | 23 ++++------- 18 files changed, 118 insertions(+), 266 deletions(-) diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index c44445a709..c44bb23f3c 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -1,6 +1,5 @@  - Debug AnyCPU @@ -9,7 +8,7 @@ Properties Avalonia.Base.UnitTests Avalonia.Base.UnitTests - v4.5 + v4.6.1 512 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -74,9 +73,6 @@ - - - @@ -110,12 +106,6 @@ - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj index 5eb48b8502..f0e3bb9471 100644 --- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj +++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj @@ -1,6 +1,5 @@  - Debug @@ -10,7 +9,7 @@ Properties Avalonia.Direct2D1.UnitTests Avalonia.Direct2D1.UnitTests - v4.5 + v4.6.1 512 @@ -96,12 +95,6 @@ - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj index a1a917ed25..b76d63f563 100644 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj +++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj @@ -1,6 +1,5 @@  - Debug @@ -10,7 +9,7 @@ Properties Avalonia.Input.UnitTests Avalonia.Input.UnitTests - v4.5 + v4.6.1 512 @@ -98,12 +97,6 @@ - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - From 485fe1364eb4833edab133700d1eb0ce541af584 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 08:41:41 +0300 Subject: [PATCH 08/38] Everything is buildable via MSBuild --- Avalonia.sln | 9 --- samples/BindingTest/BindingTest.csproj | 3 +- .../ControlCatalog.Android.csproj | 1 + .../Resources/Resource.Designer.cs | 9 ++- .../ControlCatalog.Desktop.csproj | 3 +- .../ControlCatalog.iOS.csproj | 1 + samples/RenderTest/RenderTest.csproj | 1 + .../VirtualizationTest.csproj | 1 + .../GtkInteropDemo/GtkInteropDemo.csproj | 1 + .../WindowsInteropTest.csproj | 1 + .../Avalonia.Android/Avalonia.Android.csproj | 1 + .../Avalonia.AndroidTestApplication.csproj | 1 + .../Avalonia.DotNetFrameworkRuntime.csproj | 1 + src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj | 1 + src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj | 1 + .../Microsoft.NuGet.Build.Tasks.Patched.dll | Bin 0 -> 35328 bytes src/Shared/nuget.workaround.targets | 63 ++++++++++++++++++ .../Avalonia.Skia.Android.csproj | 1 + .../Avalonia.Skia.Desktop.csproj | 8 ++- .../Avalonia.Skia.iOS.csproj | 1 + .../Avalonia.Designer.csproj | 8 ++- .../Avalonia.Direct2D1.csproj | 1 + .../Avalonia.Win32/Avalonia.Win32.csproj | 1 + src/iOS/Avalonia.iOS/Avalonia.iOS.csproj | 1 + .../Avalonia.iOSTestApplication.csproj | 1 + .../Avalonia.Base.UnitTests.csproj | 23 +------ .../Avalonia.Benchmarks.csproj | 1 + .../Avalonia.Controls.UnitTests.csproj | 41 +----------- .../Avalonia.DesignerSupport.TestApp.csproj | 1 + .../Avalonia.DesignerSupport.Tests.csproj | 1 + .../Avalonia.Direct2D1.UnitTests.csproj | 6 +- .../Avalonia.Input.UnitTests.csproj | 1 + .../Avalonia.Interactivity.UnitTests.csproj | 1 + .../Avalonia.Layout.UnitTests.csproj | 22 +----- .../Avalonia.LeakTests.csproj | 1 + .../Avalonia.Markup.UnitTests.csproj | 1 + .../Avalonia.Markup.Xaml.UnitTests.csproj | 21 +----- .../Avalonia.Cairo.RenderTests.csproj | 17 +---- .../Avalonia.Direct2D1.RenderTests.csproj | 20 +----- .../Avalonia.Skia.RenderTests.csproj | 9 +-- .../Avalonia.Styling.UnitTests.csproj | 9 +-- .../Avalonia.UnitTests.csproj | 2 +- .../Avalonia.Visuals.UnitTests.csproj | 19 +----- 43 files changed, 129 insertions(+), 187 deletions(-) create mode 100644 src/Shared/Microsoft.NuGet.Build.Tasks.Patched.dll create mode 100644 src/Shared/nuget.workaround.targets diff --git a/Avalonia.sln b/Avalonia.sln index c2ba081fc0..e0b6972065 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -15,9 +15,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1", "src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Designer", "src\Windows\Avalonia.Designer\Avalonia.Designer.csproj", "{EC42600F-049B-43FF-AED1-8314D61B2749}" - ProjectSection(ProjectDependencies) = postProject - {2B888490-D14A-4BCA-AB4B-48676FA93C9B} = {2B888490-D14A-4BCA-AB4B-48676FA93C9B} - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}" EndProject @@ -85,9 +82,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.UnitTests", "tests\Avalonia.Markup.UnitTests\Avalonia.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BindingTest", "samples\BindingTest\BindingTest.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}" - ProjectSection(ProjectDependencies) = postProject - {B61B66A3-B82D-4875-8001-89D3394FE0C9} = {B61B66A3-B82D-4875-8001-89D3394FE0C9} - EndProjectSection EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RenderHelpers", "src\Shared\RenderHelpers\RenderHelpers.shproj", "{3C4C0CB4-0C0F-4450-A37B-148C84FF905F}" EndProject @@ -126,9 +120,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{D0A739B9-3C68-4BA6-A328-41606954B6BD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Desktop", "samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj", "{2B888490-D14A-4BCA-AB4B-48676FA93C9B}" - ProjectSection(ProjectDependencies) = postProject - {BB1F7BB5-6AD4-4776-94D9-C09D0A972658} = {BB1F7BB5-6AD4-4776-94D9-C09D0A972658} - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{57E0455D-D565-44BB-B069-EE1AA20F8337}" EndProject diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index d8663f5031..fe5bd3aa1d 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -13,6 +13,7 @@ 512 true + PackageReference AnyCPU @@ -72,7 +73,6 @@ Designer - @@ -174,4 +174,5 @@ + \ No newline at end of file diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj index 9092238aa7..c9b12305dc 100644 --- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj +++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj @@ -170,4 +170,5 @@ --> + \ No newline at end of file diff --git a/samples/ControlCatalog.Android/Resources/Resource.Designer.cs b/samples/ControlCatalog.Android/Resources/Resource.Designer.cs index 96f0e76fd8..cee3331ba8 100644 --- a/samples/ControlCatalog.Android/Resources/Resource.Designer.cs +++ b/samples/ControlCatalog.Android/Resources/Resource.Designer.cs @@ -28,6 +28,8 @@ namespace ControlCatalog.Android { global::Avalonia.Android.Resource.String.ApplicationName = global::ControlCatalog.Android.Resource.String.ApplicationName; global::Avalonia.Android.Resource.String.Hello = global::ControlCatalog.Android.Resource.String.Hello; + global::Avalonia.Android.Resource.String.library_name = global::ControlCatalog.Android.Resource.String.library_name; + global::Splat.Resource.String.library_name = global::ControlCatalog.Android.Resource.String.library_name; } public partial class Attribute @@ -94,11 +96,14 @@ namespace ControlCatalog.Android public partial class String { + // aapt resource value: 0x7f040002 + public const int ApplicationName = 2130968578; + // aapt resource value: 0x7f040001 - public const int ApplicationName = 2130968577; + public const int Hello = 2130968577; // aapt resource value: 0x7f040000 - public const int Hello = 2130968576; + public const int library_name = 2130968576; static String() { diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index bd0e56e3e6..73f50a18d6 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -13,6 +13,7 @@ 512 true + PackageReference AnyCPU @@ -49,7 +50,6 @@ - @@ -154,4 +154,5 @@ 2.1.0 + \ No newline at end of file diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj index d0c73b2553..01d287ea83 100644 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj +++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj @@ -181,4 +181,5 @@ + \ No newline at end of file diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index b60eb7ab36..fdebadb444 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -199,4 +199,5 @@ + \ No newline at end of file diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 0ed2b9d9bd..99f99cfe85 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -171,4 +171,5 @@ + \ No newline at end of file diff --git a/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj b/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj index 738a1e776c..9ae6063876 100644 --- a/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj +++ b/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj @@ -157,4 +157,5 @@ --> + \ No newline at end of file diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj index 671ebd0020..9ebe588fd1 100644 --- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj +++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj @@ -187,4 +187,5 @@ --> + \ No newline at end of file diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index a9ff8e6924..cef2a2cdd6 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -158,4 +158,5 @@ + \ No newline at end of file diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index 7ce8879304..0b6dee0d7d 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -185,4 +185,5 @@ + \ No newline at end of file diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj index 4a8ce05013..350b4c4fbc 100644 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj +++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj @@ -82,4 +82,5 @@ + \ No newline at end of file diff --git a/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj b/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj index da3c8c9952..f0b4d4eb7d 100644 --- a/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj +++ b/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj @@ -116,4 +116,5 @@ + \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj index 257736aaf1..1681936e38 100644 --- a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj +++ b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj @@ -104,4 +104,5 @@ + \ No newline at end of file diff --git a/src/Shared/Microsoft.NuGet.Build.Tasks.Patched.dll b/src/Shared/Microsoft.NuGet.Build.Tasks.Patched.dll new file mode 100644 index 0000000000000000000000000000000000000000..33ab0a4af72449d52371baa77daaaf60586fba1a GIT binary patch literal 35328 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 + + + + + + + + + + + + + + + + + + + + + + <_ReferencesFromNuGetPackages Remove="%(ReferencePath.FileName)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'" /> + + + + <_ResolvedProjectReferencePaths Include="@(_ReferencesFromNuGetPackages)" Condition="'%(_ReferencesFromNuGetPackages.NuGetSourceType)' == 'Project'" /> + + + + + + + + + true + + + + + + + + + $(MSBuildToolsPath)\..\Roslyn + + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj index 4c20239e64..252896dcc1 100644 --- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj +++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj @@ -98,4 +98,5 @@ + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj index 164bccc933..ad2c35f922 100644 --- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj +++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj @@ -12,9 +12,7 @@ v4.5 512 - - - True + false true @@ -111,4 +109,8 @@ + + + + \ No newline at end of file diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj index fc8d8f3053..17f01f377d 100644 --- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj +++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj @@ -92,4 +92,5 @@ + \ No newline at end of file diff --git a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj index b59892f4a4..105c2f2547 100644 --- a/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj +++ b/src/Windows/Avalonia.Designer/Avalonia.Designer.csproj @@ -12,8 +12,7 @@ v4.5 512 true - - + PackageReference @@ -132,6 +131,9 @@ --> - + + 10.3.0 + + \ No newline at end of file diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index 0773300656..e19404ddbe 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -127,4 +127,5 @@ + \ No newline at end of file diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index be86e3c4d3..6f270b148c 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -117,4 +117,5 @@ + \ No newline at end of file diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj index 7ef7108785..a095668129 100644 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj +++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj @@ -128,4 +128,5 @@ + \ No newline at end of file diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj index 089b8afb73..ba2e3ada87 100644 --- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj +++ b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj @@ -208,4 +208,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index c44bb23f3c..5d17349179 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -10,13 +10,7 @@ Avalonia.Base.UnitTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -26,8 +20,6 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.Base.UnitTests.XML - CS1591 pdbonly @@ -37,18 +29,6 @@ prompt 4 - - - - - - - - - - - - @@ -128,4 +108,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index c102b39744..8df2deabee 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -113,4 +113,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 71ddbefebe..e59916e31f 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -5,18 +5,9 @@ AnyCPU {5CCB5571-7C30-4E7D-967D-0E2158EBD91F} Library - Properties - Avalonia.Controls.UnitTests - Avalonia.Controls.UnitTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -26,8 +17,6 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.Controls.UnitTests.XML - CS1591 pdbonly @@ -41,14 +30,6 @@ - - - - - - - - @@ -167,25 +148,6 @@ - - - - - False - - - False - - - False - - - False - - - - - + \ No newline at end of file diff --git a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj index 5cb7ba0e75..16de37d968 100644 --- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj +++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj @@ -75,4 +75,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj index f0e3bb9471..4d14649b8b 100644 --- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj +++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj @@ -11,8 +11,7 @@ Avalonia.Direct2D1.UnitTests v4.6.1 512 - - + true @@ -22,8 +21,6 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.Direct2D1.UnitTests.XML - CS1591 pdbonly @@ -111,4 +108,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj index b76d63f563..fc4deba5dc 100644 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj +++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj @@ -120,4 +120,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj index 0e47302b77..c7c13e3c5e 100644 --- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj +++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj @@ -111,4 +111,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index 2ba4e827e8..07e6c2ecaf 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -10,13 +10,7 @@ Avalonia.Layout.UnitTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -26,8 +20,6 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.Layout.UnitTests.XML - CS1591 pdbonly @@ -37,17 +29,6 @@ prompt 4 - - - - - - - - - - - @@ -158,4 +139,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index 8aa5b2ede1..251e9e9297 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -144,4 +144,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index 12991766e2..534bd919e1 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -129,4 +129,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj index 63ac4db742..b6d4407192 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -10,18 +11,7 @@ Avalonia.Markup.Xaml.UnitTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - SAK - SAK - SAK - SAK - - true @@ -43,14 +33,6 @@ - - - - - - - - @@ -191,4 +173,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj index 1908367d93..fed9e121e5 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj @@ -10,13 +10,7 @@ Avalonia.Cairo.RenderTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -40,14 +34,6 @@ - - - - - - - - {FB05AC90-89BA-4F2F-A924-F37875FB547C} @@ -150,4 +136,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj index c86db3c42b..32a27e1f23 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj @@ -10,13 +10,7 @@ Avalonia.Direct2D1.RenderTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -26,7 +20,6 @@ DEBUG;TRACE prompt 4 - ..\..\artifacts\tests\Avalonia.Direct2D1.RenderTests.XML CS1591 @@ -36,21 +29,11 @@ TRACE prompt 4 - - - - - - - - - - {D211E587-D8BC-45B9-95A4-F297C8FA5200} @@ -135,4 +118,5 @@ + \ 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 a42e434f0b..5b0aa4bd11 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj @@ -11,8 +11,7 @@ Avalonia.Skia.RenderTests v4.6.1 512 - - + true @@ -37,17 +36,12 @@ TRACE;DEBUG;AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL full x86 - prompt - MinimumRecommendedRules.ruleset ..\..\artifacts\tests\ TRACE;AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL; true - pdbonly x86 - prompt - MinimumRecommendedRules.ruleset @@ -124,4 +118,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj index 6873c50347..7b85c3fe4d 100644 --- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj +++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj @@ -10,13 +10,7 @@ Avalonia.Styling.UnitTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -160,4 +154,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index b9d6e4681d..1c07e547ec 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -5,7 +5,6 @@ Debug AnyCPU {88060192-33D5-4932-B0F9-8BD2763E857D} - {88060192-33D5-4932-B0F9-8BD2763E857D} Library Properties Avalonia.UnitTests @@ -120,4 +119,5 @@ + \ No newline at end of file diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj index a43c84ab9a..c731be7418 100644 --- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj +++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj @@ -10,13 +10,7 @@ Avalonia.Visuals.UnitTests v4.6.1 512 - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + true @@ -26,8 +20,6 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.Visuals.UnitTests.xml - CS1591 pdbonly @@ -40,14 +32,6 @@ - - - - - - - - @@ -151,4 +135,5 @@ + \ No newline at end of file From 8b8a9b99d9eaad234d159ecc7464a48c1490c3e0 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 16:41:06 +0300 Subject: [PATCH 09/38] Fixed vs build --- src/Shared/nuget.workaround.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/nuget.workaround.targets b/src/Shared/nuget.workaround.targets index 32d86c21ff..4490fd8375 100644 --- a/src/Shared/nuget.workaround.targets +++ b/src/Shared/nuget.workaround.targets @@ -58,6 +58,6 @@ - $(MSBuildToolsPath)\..\Roslyn + $(MSBuildToolsPath)\..\Roslyn \ No newline at end of file From fef8d3448a2ed64241b2d1972246f55063349cbb Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 16:41:35 +0300 Subject: [PATCH 10/38] Added .NET Core version of control catalog --- Avalonia.sln | 43 +++++++++++++++++++ .../ControlCatalog.NetCore.csproj | 13 ++++++ samples/ControlCatalog.NetCore/Program.cs | 15 +++++++ 3 files changed, 71 insertions(+) create mode 100644 samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj create mode 100644 samples/ControlCatalog.NetCore/Program.cs diff --git a/Avalonia.sln b/Avalonia.sln index e0b6972065..8e06247b1a 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -155,6 +155,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Skia.Desktop.NetSt EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Gtk3", "src\Gtk\Avalonia.Gtk3\Avalonia.Gtk3.csproj", "{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.NetCore", "samples\ControlCatalog.NetCore\ControlCatalog.NetCore.csproj", "{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{2f59f3d0-748d-4652-b01e-e0d954756308}*SharedItemsImports = 13 @@ -2433,6 +2435,46 @@ Global {BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|Mono.Build.0 = Release|Any CPU {BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|x86.ActiveCfg = Release|Any CPU {BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|x86.Build.0 = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Mono.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Mono.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhone.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Mono.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|Mono.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|x86.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.AppStore|x86.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhone.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Mono.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Mono.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|x86.Build.0 = Debug|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.Build.0 = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.ActiveCfg = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.Build.0 = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Mono.ActiveCfg = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Mono.Build.0 = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|x86.ActiveCfg = Release|Any CPU + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2488,5 +2530,6 @@ Global {40759A76-D0F2-464E-8000-6FF0F5C4BD7C} = {B39A8919-9F95-48FE-AD7B-76E08B509888} {7D2D3083-71DD-4CC9-8907-39A0D86FB322} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E} {BB1F7BB5-6AD4-4776-94D9-C09D0A972658} = {B9894058-278A-46B5-B6ED-AD613FCC03B3} + {39D7B147-1A5B-47C2-9D01-21FB7C47C4B3} = {9B9E3891-2366-4253-A952-D08BCEB71098} EndGlobalSection EndGlobal diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj new file mode 100644 index 0000000000..d43c3a060e --- /dev/null +++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj @@ -0,0 +1,13 @@ + + + + Exe + netcoreapp1.1 + + + + + + + + \ No newline at end of file diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs new file mode 100644 index 0000000000..57a508f923 --- /dev/null +++ b/samples/ControlCatalog.NetCore/Program.cs @@ -0,0 +1,15 @@ +using System; +using Avalonia; + +namespace ControlCatalog.NetCore +{ + class Program + { + static void Main(string[] args) + { + AppBuilder.Configure() + .UsePlatformDetect() + .Start(); + } + } +} \ No newline at end of file From d7c48e17f462d2619471c10e30c513e0ca4464b9 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 17:01:24 +0300 Subject: [PATCH 11/38] Exclude resources from submodules --- src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj | 10 ++++++---- .../Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 8 +++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index e800a64a17..b51bc65607 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -21,9 +21,6 @@ prompt 4 - - - @@ -164,4 +161,9 @@ - \ No newline at end of file + + + + + + diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index eba7395340..3f7343a1ec 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -326,4 +326,10 @@ - \ No newline at end of file + + + + + + + From 88ef461d5335871156a7c2b4f0de3e8f4e7a2242 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 17:14:56 +0300 Subject: [PATCH 12/38] Reference native linux binaries --- .../Avalonia.Skia.Desktop.NetStandard.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index ddad89fd10..49d9403875 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -32,6 +32,7 @@ + From 4bb5ebf070a5bfbb0aec6179ed225d5395b24ad5 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 19:28:55 +0300 Subject: [PATCH 13/38] Fixed build script for windows --- appveyor.yml | 2 +- build.cake | 73 ++++++++----------- packages.cake | 52 ++++++++----- .../Avalonia.DotNetCoreRuntime.csproj | 2 +- .../Avalonia.Win32.NetStandard.csproj | 2 + 5 files changed, 66 insertions(+), 65 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index db7d129dd1..d11b4074f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -os: Visual Studio 2015 +os: Visual Studio 2017 platform: - Any CPU configuration: diff --git a/build.cake b/build.cake index ee68c74bb3..8191774dc5 100644 --- a/build.cake +++ b/build.cake @@ -96,46 +96,10 @@ Task("Clean") CleanDirectory(parameters.TestsRoot); }); -Task("Prepare-XBuild-Solution") - .Does(() => -{ - var blacklistedProjects = new[] - { - "Avalonia.Win32.NetStandard", - "Avalonia.DotNetCoreRuntime", - "Avalonia.Skia.Desktop.NetStandard", - "Avalonia.Gtk3" - }; - var blacklistedGuids = System.IO.File.ReadAllLines(parameters.MSBuildSolution) - .Where(l=>l.StartsWith("Project") && blacklistedProjects.Any(p=>l.Contains(p))) - .Select(l => l.Split(',').Select(part => part.Trim()).FirstOrDefault(part => part.StartsWith("\"{"))) - .Where(g=>g!=null) - .Select(l=>l.Trim(new[]{'"', '}', '{'}).ToLower()).ToArray(); - - Console.WriteLine("Blacklisted guids are: " + string.Join(",", blacklistedGuids)); - var removeUntilEndProject = false; - - System.IO.File.WriteAllLines(parameters.XBuildSolution, System.IO.File.ReadAllLines(parameters.MSBuildSolution) - .Where(l => - { - if(removeUntilEndProject) - { - if(l.StartsWith("EndProject")) - removeUntilEndProject = false; - return false; - } - - var blacklist = blacklistedGuids.Any(g => l.ToLower().Contains(g)); - if(blacklist && l.StartsWith("Project")) - removeUntilEndProject = true; - - return !blacklist; - })); -}); Task("Restore-NuGet-Packages") .IsDependentOn("Clean") - .IsDependentOn("Prepare-XBuild-Solution") + .WithCriteria(parameters.IsRunningOnWindows) .Does(() => { var maxRetryCount = 5; @@ -168,6 +132,14 @@ Task("Restore-NuGet-Packages") }); }); +void DotNetCoreBuild() +{ +} + +Task("DotNetCoreBuild") + .IsDependentOn("Clean") + .Does(() => DotNetCoreBuild()); + Task("Build") .IsDependentOn("Restore-NuGet-Packages") .Does(() => @@ -179,25 +151,34 @@ Task("Build") settings.WithProperty("Platform", "\"" + parameters.Platform + "\""); settings.SetVerbosity(Verbosity.Minimal); settings.WithProperty("Windows", "True"); - settings.UseToolVersion(MSBuildToolVersion.VS2015); + settings.UseToolVersion(MSBuildToolVersion.VS2017); settings.SetNodeReuse(false); }); } else { - XBuild(parameters.XBuildSolution, settings => { - settings.SetConfiguration(parameters.Configuration); - settings.WithProperty("Platform", "\"" + parameters.Platform + "\""); - settings.SetVerbosity(Verbosity.Minimal); - }); + DotNetCoreBuild(); } }); +void RunDotNetCoreTest() +{ +} + +Task("Run-Net-Core-Unit-Tests") + .IsDependentOn("Clean") + .Does(() => RunDotNetCoreTest()); + Task("Run-Unit-Tests") .IsDependentOn("Build") .WithCriteria(() => !parameters.SkipTests) .Does(() => { + if(parameters.IsRunningOnWindows) + { + RunDotNetCoreTest(); + } + var unitTests = GetDirectories("./tests/Avalonia.*.UnitTests") .Select(dir => System.IO.Path.GetFileName(dir.FullPath)) .Where(name => parameters.IsRunningOnWindows ? true : !(name.IndexOf("Direct2D", StringComparison.OrdinalIgnoreCase) >= 0)) @@ -236,7 +217,11 @@ Task("Run-Unit-Tests") { CopyDirectory(test.GetDirectory(), parameters.TestsRoot); } - + + CopyFile(System.IO.Path.Combine(packages.NugetPackagesDir, "SkiaSharp", packages.SkiaSharpVersion, + "runtimes", "win7-x86", "native", "libSkiaSharp.dll"), + System.IO.Path.Combine(parameters.TestsRoot.ToString(), "libSkiaSharp.dll")); + var testsInDirectoryToRun = new List(); if(parameters.IsRunningOnWindows) { diff --git a/packages.cake b/packages.cake index 67483c4579..7f9c5bdb65 100644 --- a/packages.cake +++ b/packages.cake @@ -1,9 +1,12 @@ +using System.Xml.Linq; + public class Packages { public List NuspecNuGetSettings { get; private set; } public FilePath[] NugetPackages { get; private set; } public FilePath[] BinFiles { get; private set; } - + public string NugetPackagesDir {get; private set;} + public string SkiaSharpVersion {get; private set; } public Packages(ICakeContext context, Parameters parameters) { // NUGET NUSPECS @@ -23,21 +26,27 @@ public class Packages // Value is Tuple where Item1: Package Version, Item2: The packages.config file path. var packageVersions = new Dictionary>>(); - System.IO.Directory.EnumerateFiles(((DirectoryPath)context.Directory("./src")).FullPath, "packages.config", SearchOption.AllDirectories).ToList().ForEach(fileName => + System.IO.Directory.EnumerateFiles(((DirectoryPath)context.Directory("./src")).FullPath, + "*.csproj", SearchOption.AllDirectories).ToList().ForEach(fileName => { if (!ignoredSubModulesPaths.Any(i => normalizePath(fileName).Contains(normalizePath(i)))) { - var file = new PackageReferenceFile(fileName); - foreach (PackageReference packageReference in file.GetPackageReferences()) + var xdoc = XDocument.Load(fileName); + foreach (var reference in xdoc.Descendants().Where(x => x.Name.LocalName == "PackageReference")) { + var name = reference.Attribute("Include").Value; + var versionAttribute = reference.Attribute("Version"); + var version = versionAttribute != null + ? versionAttribute.Value + : reference.Elements().First(x=>x.Name.LocalName == "Version").Value; IList> versions; - packageVersions.TryGetValue(packageReference.Id, out versions); + packageVersions.TryGetValue(name, out versions); if (versions == null) { versions = new List>(); - packageVersions[packageReference.Id] = versions; + packageVersions[name] = versions; } - versions.Add(Tuple.Create(packageReference.Version.ToString(), fileName)); + versions.Add(Tuple.Create(version, fileName)); } } }); @@ -65,7 +74,7 @@ public class Packages var SplatVersion = packageVersions["Splat"].FirstOrDefault().Item1; var SpracheVersion = packageVersions["Sprache"].FirstOrDefault().Item1; var SystemReactiveVersion = packageVersions["System.Reactive"].FirstOrDefault().Item1; - var SkiaSharpVersion = packageVersions["SkiaSharp"].FirstOrDefault().Item1; + SkiaSharpVersion = packageVersions["SkiaSharp"].FirstOrDefault().Item1; var SharpDXVersion = packageVersions["SharpDX"].FirstOrDefault().Item1; var SharpDXDirect2D1Version = packageVersions["SharpDX.Direct2D1"].FirstOrDefault().Item1; var SharpDXDirect3D11Version = packageVersions["SharpDX.Direct3D11"].FirstOrDefault().Item1; @@ -81,6 +90,11 @@ public class Packages context.Information("Package: SharpDX.Direct3D11, version: {0}", SharpDXDirect3D11Version); context.Information("Package: SharpDX.DXGI, version: {0}", SharpDXDXGIVersion); + var nugetPackagesDir = System.Environment.GetEnvironmentVariable("NUGET_HOME") + ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget"); + + NugetPackagesDir = System.IO.Path.Combine(nugetPackagesDir, "packages"); + var SetNuGetNuspecCommonProperties = new Action ((nuspec) => { nuspec.Version = parameters.Version; nuspec.Authors = new [] { "Avalonia Team" }; @@ -129,12 +143,12 @@ public class Packages }; var coreLibrariesFiles = coreLibraries.Select((lib) => { - return (FilePath)context.File(lib[0] + lib[1] + "/bin/" + parameters.DirSuffix + "/" + lib[1] + lib[2]); + return (FilePath)context.File(lib[0] + lib[1] + "/bin/" + parameters.DirSuffix + "/netstandard1.1/" + lib[1] + lib[2]); }).ToList(); var coreLibrariesNuSpecContent = coreLibrariesFiles.Select((file) => { return new NuSpecContent { - Source = file.FullPath, Target = "lib/portable-windows8+net45" + Source = file.FullPath, Target = "lib/netstandard1.1" }; }); @@ -161,7 +175,7 @@ public class Packages var netCoreRuntimePlatformExtensions = new [] {".xml", ".dll"}; var netCoreRuntimePlatform = netCoreRuntimePlatformExtensions.Select(libSuffix => { return new NuSpecContent { - Source = ((FilePath)context.File("./src/Avalonia.DotNetCoreRuntime/bin/" + parameters.DirSuffix + "/Avalonia.DotNetCoreRuntime" + libSuffix)).FullPath, + Source = ((FilePath)context.File("./src/Avalonia.DotNetCoreRuntime/bin/" + parameters.DirSuffix + "/netcoreapp1.0/Avalonia.DotNetCoreRuntime" + libSuffix)).FullPath, Target = "lib/netcoreapp1.0" }; }); @@ -180,12 +194,12 @@ public class Packages new NuSpecDependency() { Id = "Splat", Version = SplatVersion }, new NuSpecDependency() { Id = "Sprache", Version = SpracheVersion }, new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion }, - new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp1.0", Version = "4.3.0" }, //.NET Core + new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp1.0", Version = "4.3.0" }, new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp1.0", Version = "1.6.0" }, new NuSpecDependency() { Id = "Microsoft.NETCore.Portable.Compatibility", TargetFramework = "netcoreapp1.0", Version = "1.0.1" }, - new NuSpecDependency() { Id = "Splat", TargetFramework = "netcoreapp1.0", Version = "2.0.0" }, - new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp1.0", Version = "2.3.0" }, + new NuSpecDependency() { Id = "Splat", TargetFramework = "netcoreapp1.0", Version = SplatVersion }, + new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp1.0", Version = SerilogVersion }, new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp1.0", Version = SpracheVersion }, new NuSpecDependency() { Id = "System.Reactive", TargetFramework = "netcoreapp1.0", Version = SystemReactiveVersion } }, @@ -208,9 +222,9 @@ public class Packages }, Files = new [] { - new NuSpecContent { Source = "Avalonia.HtmlRenderer.dll", Target = "lib/portable-windows8+net45" } + new NuSpecContent { Source = "Avalonia.HtmlRenderer.dll", Target = "lib/netstandard1.1" } }, - BasePath = context.Directory("./src/Avalonia.HtmlRenderer/bin/" + parameters.DirSuffix), + BasePath = context.Directory("./src/Avalonia.HtmlRenderer/bin/" + parameters.DirSuffix + "/netstandard1.1"), OutputDirectory = parameters.NugetRoot } }; @@ -324,7 +338,7 @@ public class Packages Files = new [] { new NuSpecContent { Source = "Avalonia.Win32/bin/" + parameters.DirSuffix + "/Avalonia.Win32.dll", Target = "lib/net45" }, - new NuSpecContent { Source = "Avalonia.Win32.NetStandard/bin/" + parameters.DirSuffix + "/Avalonia.Win32.dll", Target = "lib/netstandard1.1" } + new NuSpecContent { Source = "Avalonia.Win32.NetStandard/bin/" + parameters.DirSuffix + "/netstandard1.1/Avalonia.Win32.dll", Target = "lib/netstandard1.1" } }, BasePath = context.Directory("./src/Windows"), OutputDirectory = parameters.NugetRoot @@ -381,7 +395,7 @@ public class Packages { new NuSpecContent { Source = "Avalonia.Gtk3.dll", Target = "lib/netstandard1.1" } }, - BasePath = context.Directory("./src/Gtk/Avalonia.Gtk3/bin/" + parameters.DirSuffix), + BasePath = context.Directory("./src/Gtk/Avalonia.Gtk3/bin/" + parameters.DirSuffix + "/netstandard1.1"), OutputDirectory = parameters.NugetRoot }, /////////////////////////////////////////////////////////////////////////////// @@ -420,7 +434,7 @@ public class Packages Files = new [] { new NuSpecContent { Source = "Avalonia.Skia.Desktop/bin/" + parameters.DirSuffixSkia + "/Avalonia.Skia.Desktop.dll", Target = "lib/net45" }, - new NuSpecContent { Source = "Avalonia.Skia.Desktop.NetStandard/bin/" + parameters.DirSuffix + "/Avalonia.Skia.Desktop.dll", Target = "lib/netcoreapp1.0" } + new NuSpecContent { Source = "Avalonia.Skia.Desktop.NetStandard/bin/" + parameters.DirSuffix + "/netstandard1.3/Avalonia.Skia.Desktop.dll", Target = "lib/netcoreapp1.0" } }, BasePath = context.Directory("./src/Skia/"), OutputDirectory = parameters.NugetRoot diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index ab5080c78d..1004201ec4 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -1,6 +1,6 @@  - netstandard1.6 + netcoreapp1.0 False false diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj index a1d490b1c4..5059131371 100644 --- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj +++ b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj @@ -3,6 +3,8 @@ netstandard1.1 False false + Avalonia.Win32 + Avalonia.Win32 true From 6827132a59ea0fa09f8b4ebd7c55063bd48f51bc Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 19:34:37 +0300 Subject: [PATCH 14/38] use rc appveyor image --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d11b4074f8..bf817e7b22 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -os: Visual Studio 2017 +os: Visual Studio 2017 RC platform: - Any CPU configuration: From f6cad5f10cde8b73a212f2a0c4f972b21c4574ae Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:03:49 +0300 Subject: [PATCH 15/38] use msbuild for package restore --- build.cake | 21 ++++++++----------- .../Avalonia.Skia.Desktop.NetStandard.csproj | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build.cake b/build.cake index 8191774dc5..3556a573a3 100644 --- a/build.cake +++ b/build.cake @@ -117,18 +117,15 @@ Task("Restore-NuGet-Packages") toolTimeout+=0.5; }}) .Execute(()=> { - if(parameters.IsRunningOnWindows) - { - NuGetRestore(parameters.MSBuildSolution, new NuGetRestoreSettings { - ToolTimeout = TimeSpan.FromMinutes(toolTimeout) - }); - } - else - { - NuGetRestore(parameters.XBuildSolution, new NuGetRestoreSettings { - ToolTimeout = TimeSpan.FromMinutes(toolTimeout) - }); - } + MSBuild(parameters.MSBuildSolution, settings => { + settings.SetConfiguration(parameters.Configuration); + settings.WithProperty("Platform", "\"" + parameters.Platform + "\""); + settings.SetVerbosity(Verbosity.Minimal); + settings.WithProperty("Windows", "True"); + settings.UseToolVersion(MSBuildToolVersion.VS2017); + settings.WithTarget("restore"); + settings.SetNodeReuse(false); + }); }); }); diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index 49d9403875..f1df5d36ea 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -32,7 +32,7 @@ - + From a6fb94afde3577ad17a46f0516dbdeecbf380b10 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:14:48 +0300 Subject: [PATCH 16/38] use nuget 4.3 --- build.cake | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/build.cake b/build.cake index 3556a573a3..e75950326d 100644 --- a/build.cake +++ b/build.cake @@ -4,6 +4,7 @@ #addin "nuget:?package=Polly&version=4.2.0" #addin "nuget:?package=NuGet.Core&version=2.12.0" +#tool "nuget:https://dotnet.myget.org/F/nuget-build/?package=NuGet.CommandLine&version=4.3.0-beta1-2361&prerelease" /////////////////////////////////////////////////////////////////////////////// // TOOLS @@ -117,15 +118,10 @@ Task("Restore-NuGet-Packages") toolTimeout+=0.5; }}) .Execute(()=> { - MSBuild(parameters.MSBuildSolution, settings => { - settings.SetConfiguration(parameters.Configuration); - settings.WithProperty("Platform", "\"" + parameters.Platform + "\""); - settings.SetVerbosity(Verbosity.Minimal); - settings.WithProperty("Windows", "True"); - settings.UseToolVersion(MSBuildToolVersion.VS2017); - settings.WithTarget("restore"); - settings.SetNodeReuse(false); - }); + NuGetRestore(parameters.MSBuildSolution, new NuGetRestoreSettings { + ToolPath = "./tools/NuGet.CommandLine/tools/NuGet.exe", + ToolTimeout = TimeSpan.FromMinutes(toolTimeout) + }); }); }); From fa12a9ee282951581704140db7dd8db87e38343c Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:29:12 +0300 Subject: [PATCH 17/38] Get dotmemoryunit from %USERPFORILE%/.nuget/packages --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bf817e7b22..b18330bc12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ before_build: build_script: - ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration" after_build: -- .\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools\dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" +- %USERPROFILE%\.nuget\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools\dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - pip install codecov From a9f867c1276e8a1225aa3f4dcdffd9f7e59e3ed1 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:33:50 +0300 Subject: [PATCH 18/38] set path --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b18330bc12..c609d69fb1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,8 +19,8 @@ before_build: build_script: - ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration" after_build: -- %USERPROFILE%\.nuget\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools\dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" - +- cmd set PATH=%USERPROFILE%\.nuget\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools;%PATH% +- dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - pip install codecov - codecov -f "./artifacts/coverage.xml" From c427ed5bdc857b818fc628ff6ad0b8c5bd517f63 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:50:41 +0300 Subject: [PATCH 19/38] whoops --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c609d69fb1..aeb5d4eef2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ before_build: build_script: - ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration" after_build: -- cmd set PATH=%USERPROFILE%\.nuget\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools;%PATH% +- cmd: set PATH=%USERPROFILE%\.nuget\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools;%PATH% - dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - pip install codecov From beda69a2e6a4739dc70f30ac6a2185b6f19c8f3c Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:55:45 +0300 Subject: [PATCH 20/38] Special hack to keep VS happy --- build.cake | 1 + src/Android/Avalonia.Android/Avalonia.Android.csproj | 3 +++ src/Shared/nuget.workaround.targets | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index e75950326d..4ca75e1bb1 100644 --- a/build.cake +++ b/build.cake @@ -142,6 +142,7 @@ Task("Build") MSBuild(parameters.MSBuildSolution, settings => { settings.SetConfiguration(parameters.Configuration); settings.WithProperty("Platform", "\"" + parameters.Platform + "\""); + settings.WithProperty("UseRoslynPathHack", "true"); settings.SetVerbosity(Verbosity.Minimal); settings.WithProperty("Windows", "True"); settings.UseToolVersion(MSBuildToolVersion.VS2017); diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index cef2a2cdd6..b763aad8f3 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -159,4 +159,7 @@ + + $(MSBuildToolsPath)\Roslyn + \ No newline at end of file diff --git a/src/Shared/nuget.workaround.targets b/src/Shared/nuget.workaround.targets index 4490fd8375..bf6b71ddba 100644 --- a/src/Shared/nuget.workaround.targets +++ b/src/Shared/nuget.workaround.targets @@ -57,7 +57,7 @@ - - $(MSBuildToolsPath)\..\Roslyn + + $(MSBuildToolsPath)\..\Roslyn \ No newline at end of file From a06a6d10bd646eaa349db9c1311fbcd662cb0df1 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 21:04:40 +0300 Subject: [PATCH 21/38] Install dotMemoryUnit from cake script --- appveyor.yml | 3 +-- build.cake | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index aeb5d4eef2..0701d5f65c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,8 +19,7 @@ before_build: build_script: - ps: .\build.ps1 -Target "AppVeyor" -Platform "$env:platform" -Configuration "$env:configuration" after_build: -- cmd: set PATH=%USERPROFILE%\.nuget\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools;%PATH% -- dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" +- tools\JetBrains.dotMemoryUnit\tools\dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - pip install codecov - codecov -f "./artifacts/coverage.xml" diff --git a/build.cake b/build.cake index 4ca75e1bb1..5e004afc1a 100644 --- a/build.cake +++ b/build.cake @@ -5,7 +5,7 @@ #addin "nuget:?package=Polly&version=4.2.0" #addin "nuget:?package=NuGet.Core&version=2.12.0" #tool "nuget:https://dotnet.myget.org/F/nuget-build/?package=NuGet.CommandLine&version=4.3.0-beta1-2361&prerelease" - +#tool "nuget:?package=JetBrains.dotMemoryUnit&version=2.1.20150828.125449" /////////////////////////////////////////////////////////////////////////////// // TOOLS /////////////////////////////////////////////////////////////////////////////// From dc8a32d1b14628df9ba5a77007594fa829d33a44 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 23:26:07 +0300 Subject: [PATCH 22/38] Run Avalonia.Base.UnitTests using `dotnet test` --- .travis.yml | 2 + Avalonia.sln | 11 +--- build.cake | 34 +++++++++--- .../Avalonia.Base.UnitTests.csproj | 55 ++----------------- .../Avalonia.Benchmarks.csproj | 2 +- .../Avalonia.Controls.UnitTests.csproj | 2 +- .../Avalonia.Input.UnitTests.csproj | 2 +- .../Avalonia.Layout.UnitTests.csproj | 2 +- .../Avalonia.LeakTests.csproj | 2 +- .../Avalonia.Markup.UnitTests.csproj | 2 +- .../Avalonia.Markup.Xaml.UnitTests.csproj | 2 +- .../Avalonia.Styling.UnitTests.csproj | 2 +- .../Avalonia.UnitTests.csproj | 39 +++++++------ .../InvariantCultureFixture.cs | 7 +-- .../Avalonia.Visuals.UnitTests.csproj | 2 +- tests/coretests.props | 25 +++++++++ 16 files changed, 95 insertions(+), 96 deletions(-) create mode 100644 tests/coretests.props diff --git a/.travis.yml b/.travis.yml index af7d5dbebf..5740a5ecfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,10 @@ language: csharp os: - linux - osx +dist: trusty mono: - latest +dotnet: 1.0.1 script: - ./build.sh --target "Travis" --platform "Mono" --configuration "Release" notifications: diff --git a/Avalonia.sln b/Avalonia.sln index 8e06247b1a..d563d4548b 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -31,6 +31,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Animation", "src\Avalonia.Animation\Avalonia.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}" + ProjectSection(SolutionItems) = preProject + tests\coretests.props = tests\coretests.props + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Styling.UnitTests", "tests\Avalonia.Styling.UnitTests\Avalonia.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}" EndProject @@ -163,9 +166,6 @@ Global src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13 src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4 src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{40759a76-d0f2-464e-8000-6ff0f5c4bd7c}*SharedItemsImports = 4 - src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4 - src\Shared\RenderHelpers\RenderHelpers.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4 - src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4 tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{48840edd-24bf-495d-911e-2eb12ae75d3b}*SharedItemsImports = 13 src\Shared\PlatformSupport\PlatformSupport.projitems*{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}*SharedItemsImports = 4 src\Shared\PlatformSupport\PlatformSupport.projitems*{7863ea94-f0fb-4386-bf8c-e5bfa761560a}*SharedItemsImports = 4 @@ -176,11 +176,6 @@ Global src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13 - src\Shared\RenderHelpers\RenderHelpers.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4 - src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4 - tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{d35a9f3d-8bb0-496e-bf72-444038a7debb}*SharedItemsImports = 4 - tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{dabfd304-d6a4-4752-8123-c2ccf7ac7831}*SharedItemsImports = 4 - tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{e106cf37-4066-4615-b684-172a6d30b058}*SharedItemsImports = 4 src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13 src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4 EndGlobalSection diff --git a/build.cake b/build.cake index 5e004afc1a..2bb4671e62 100644 --- a/build.cake +++ b/build.cake @@ -127,6 +127,8 @@ Task("Restore-NuGet-Packages") void DotNetCoreBuild() { + DotNetCoreRestore("samples\\ControlCatalog.NetCore"); + DotNetBuild("samples\\ControlCatalog.NetCore"); } Task("DotNetCoreBuild") @@ -155,8 +157,23 @@ Task("Build") } }); +void RunCoreTest(string dir) +{ + DotNetCoreRestore(dir); + var frameworks = new List{"netcoreapp1.1"}; + if(parameters.IsRunningOnWindows) + frameworks.Add("net461"); + foreach(var fw in frameworks) + { + Information("Running for " + fw); + DotNetCoreTest(System.IO.Path.Combine(dir, System.IO.Path.GetFileName(dir)+".csproj"), + new DotNetCoreTestSettings{Framework = fw}); + } +} + void RunDotNetCoreTest() { + RunCoreTest("./tests/Avalonia.Base.UnitTests"); } Task("Run-Net-Core-Unit-Tests") @@ -164,14 +181,13 @@ Task("Run-Net-Core-Unit-Tests") .Does(() => RunDotNetCoreTest()); Task("Run-Unit-Tests") + .IsDependentOn("Run-Net-Core-Unit-Tests") .IsDependentOn("Build") .WithCriteria(() => !parameters.SkipTests) .Does(() => { - if(parameters.IsRunningOnWindows) - { - RunDotNetCoreTest(); - } + if(!parameters.IsRunningOnWindows) + return; var unitTests = GetDirectories("./tests/Avalonia.*.UnitTests") .Select(dir => System.IO.Path.GetFileName(dir.FullPath)) @@ -342,9 +358,13 @@ Task("Publish-NuGet") Task("Package") .IsDependentOn("Create-NuGet-Packages"); -Task("Default") - .IsDependentOn("Package"); - +Task("Default").Does(() => +{ + if(parameters.IsRunningOnWindows) + RunTarget("Package"); + else + RunTarget("Run-Net-Core-Unit-Tests"); +}); Task("AppVeyor") .IsDependentOn("Zip-Files") .IsDependentOn("Publish-MyGet") diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index 5d17349179..31aed15ae8 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -1,17 +1,9 @@ - - + - Debug - AnyCPU + net461;netcoreapp1.1 {2905FF23-53FB-45E6-AA49-6AF47A172056} - Library - Properties - Avalonia.Base.UnitTests - Avalonia.Base.UnitTests - v4.6.1 - 512 - + true full @@ -20,6 +12,7 @@ DEBUG;TRACE prompt 4 + MinimumRecommendedRules.ruleset pdbonly @@ -28,6 +21,7 @@ TRACE prompt 4 + MinimumRecommendedRules.ruleset @@ -53,9 +47,6 @@ - - - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} @@ -66,26 +57,6 @@ Avalonia.UnitTests - - - - - False - - - False - - - False - - - False - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index 8df2deabee..ed7af3b0ca 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -111,7 +111,7 @@ - + \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index e59916e31f..734d7a3d35 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -159,7 +159,7 @@ - + diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj index fc4deba5dc..31ceadb6ca 100644 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj +++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj @@ -105,7 +105,7 @@ --> - + diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index 07e6c2ecaf..01732a85d7 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -128,7 +128,7 @@ - + diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index 251e9e9297..2c550bb97c 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -130,7 +130,7 @@ - + diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index 534bd919e1..8778f6752d 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -113,7 +113,7 @@ --> - + diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj index b6d4407192..31f5495a18 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -159,7 +159,7 @@ --> - + diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj index 7b85c3fe4d..c00036f6dc 100644 --- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj +++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj @@ -141,7 +141,7 @@ --> - + diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index 1c07e547ec..e84fa4c89c 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -1,17 +1,8 @@ - - - + - Debug - AnyCPU - {88060192-33D5-4932-B0F9-8BD2763E857D} - Library - Properties - Avalonia.UnitTests - Avalonia.UnitTests - v4.6.1 - 512 - + net461;netcoreapp1.1 + False + false true @@ -53,9 +44,13 @@ - + {4a1abb09-9047-4bd5-a4ad-a055e52c5ee0} Avalonia.DotNetFrameworkRuntime + + + {fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Avalonia.DotNetCoreRuntime {3e53a01a-b331-47f3-b828-4a5717e77a24} @@ -104,9 +99,7 @@ - - - + + + + + + + + - + + + + \ No newline at end of file diff --git a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs index f82afa5397..f27df8f599 100644 --- a/tests/Avalonia.UnitTests/InvariantCultureFixture.cs +++ b/tests/Avalonia.UnitTests/InvariantCultureFixture.cs @@ -20,14 +20,13 @@ namespace Avalonia.UnitTests public InvariantCultureFixture() { - _restore = Thread.CurrentThread.CurrentUICulture; - Thread.CurrentThread.CurrentUICulture = - Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + _restore = CultureInfo.CurrentUICulture; + CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture = CultureInfo.InvariantCulture; } public void Dispose() { - Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture = _restore; + CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture = _restore; } } } diff --git a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj index c731be7418..c9d8a02575 100644 --- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj +++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj @@ -124,7 +124,7 @@ --> - + diff --git a/tests/coretests.props b/tests/coretests.props new file mode 100644 index 0000000000..4253d70cdd --- /dev/null +++ b/tests/coretests.props @@ -0,0 +1,25 @@ + + + + + False + false + true + + + + + + + + + + + + + + + + + + \ No newline at end of file From f3394b881f759cd61f84f855e5f5b1539df6ac15 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 23:55:19 +0300 Subject: [PATCH 23/38] Fixed linux build --- build.cake | 12 +++++------- packages.cake | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build.cake b/build.cake index 2bb4671e62..b5450017d0 100644 --- a/build.cake +++ b/build.cake @@ -157,7 +157,7 @@ Task("Build") } }); -void RunCoreTest(string dir) +void RunCoreTest(string dir, Parameters parameters) { DotNetCoreRestore(dir); var frameworks = new List{"netcoreapp1.1"}; @@ -171,14 +171,12 @@ void RunCoreTest(string dir) } } -void RunDotNetCoreTest() -{ - RunCoreTest("./tests/Avalonia.Base.UnitTests"); -} Task("Run-Net-Core-Unit-Tests") .IsDependentOn("Clean") - .Does(() => RunDotNetCoreTest()); + .Does(() => { + RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters); + }); Task("Run-Unit-Tests") .IsDependentOn("Run-Net-Core-Unit-Tests") @@ -371,7 +369,7 @@ Task("AppVeyor") .IsDependentOn("Publish-NuGet"); Task("Travis") - .IsDependentOn("Run-Unit-Tests"); + .IsDependentOn("Run-Net-Core-Unit-Tests"); /////////////////////////////////////////////////////////////////////////////// // EXECUTE diff --git a/packages.cake b/packages.cake index 7f9c5bdb65..ac65c26727 100644 --- a/packages.cake +++ b/packages.cake @@ -91,7 +91,7 @@ public class Packages context.Information("Package: SharpDX.DXGI, version: {0}", SharpDXDXGIVersion); var nugetPackagesDir = System.Environment.GetEnvironmentVariable("NUGET_HOME") - ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget"); + ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE") ?? System.Environment.GetEnvironmentVariable("HOME"), ".nuget"); NugetPackagesDir = System.IO.Path.Combine(nugetPackagesDir, "packages"); From 635561af56fead8ac12dcc844a5e3c04611f65ca Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 23:56:07 +0300 Subject: [PATCH 24/38] Install dotnet 1.0.1 on appveyor --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 0701d5f65c..418b48a439 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,10 @@ environment: secure: OtVfyN3ErqQrDTnWH2HDfJDlCiu/i4/X4wFmK3ZXXP7HmCiXYPSbTjMPwwdOxRaK MYGET_API_URL: https://www.myget.org/F/avalonia-ci/api/v2/package install: + - if not exist dotnet-1.0.1.exe appveyor DownloadFile https://go.microsoft.com/fwlink/?linkid=843448 -FileName "dotnet-1.0.1.exe" - if not exist gtk-sharp-2.12.26.msi appveyor DownloadFile http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.26.msi - msiexec /i gtk-sharp-2.12.26.msi /qn /norestart + - cmd: call c:\dotnet.exe /quiet - cmd: set PATH=%programfiles(x86)%\GtkSharp\2.12\bin\;%PATH% before_build: - git submodule update --init @@ -30,3 +32,4 @@ artifacts: - path: artifacts\zip\*.zip cache: - gtk-sharp-2.12.26.msi + - dotnet-1.0.1.exe From e26141a64d9568cd05cdb28772a4d97c2e8ca8dd Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 9 Mar 2017 00:01:02 +0300 Subject: [PATCH 25/38] typo --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 418b48a439..4bf04efa12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ install: - if not exist dotnet-1.0.1.exe appveyor DownloadFile https://go.microsoft.com/fwlink/?linkid=843448 -FileName "dotnet-1.0.1.exe" - if not exist gtk-sharp-2.12.26.msi appveyor DownloadFile http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.26.msi - msiexec /i gtk-sharp-2.12.26.msi /qn /norestart - - cmd: call c:\dotnet.exe /quiet + - cmd: call dotnet.exe /quiet - cmd: set PATH=%programfiles(x86)%\GtkSharp\2.12\bin\;%PATH% before_build: - git submodule update --init From 357bacc3ab2ccb0011eff504e7e8229904a25b77 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 9 Mar 2017 00:30:43 +0300 Subject: [PATCH 26/38] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4bf04efa12..76f991d38e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ install: - if not exist dotnet-1.0.1.exe appveyor DownloadFile https://go.microsoft.com/fwlink/?linkid=843448 -FileName "dotnet-1.0.1.exe" - if not exist gtk-sharp-2.12.26.msi appveyor DownloadFile http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.26.msi - msiexec /i gtk-sharp-2.12.26.msi /qn /norestart - - cmd: call dotnet.exe /quiet + - cmd: call dotnet-1.0.1.exe /quiet - cmd: set PATH=%programfiles(x86)%\GtkSharp\2.12\bin\;%PATH% before_build: - git submodule update --init From bcbfbbb906943a8f3c05f7d4342e2093f866d115 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 9 Mar 2017 00:17:16 +0300 Subject: [PATCH 27/38] skip net core tests on windows --- build.cake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index b5450017d0..32da451a49 100644 --- a/build.cake +++ b/build.cake @@ -160,9 +160,11 @@ Task("Build") void RunCoreTest(string dir, Parameters parameters) { DotNetCoreRestore(dir); - var frameworks = new List{"netcoreapp1.1"}; + var frameworks = new List();; if(parameters.IsRunningOnWindows) frameworks.Add("net461"); + else + frameworks.Add("netcoreapp1.1"); foreach(var fw in frameworks) { Information("Running for " + fw); From 42c68debf97fbd3b7c019e7382695642f291d845 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 9 Mar 2017 01:19:18 +0300 Subject: [PATCH 28/38] Disable default items --- src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj | 6 +----- .../Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index b51bc65607..7c10c0f65e 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -2,6 +2,7 @@ netstandard1.1 False + False false @@ -161,9 +162,4 @@ - - - - - diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 3f7343a1ec..478dd67a3c 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -2,6 +2,7 @@ netstandard1.1 False + false false @@ -326,10 +327,4 @@ - - - - - - From 886a65beaa0580ab915d84b5fde49b368450b9b8 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 9 Mar 2017 01:54:48 +0300 Subject: [PATCH 29/38] Use dotnet test for layout and controls tests --- build.cake | 7 +- .../Avalonia.Base.UnitTests.csproj | 27 +-- .../Avalonia.Benchmarks.csproj | 2 - .../Avalonia.Controls.UnitTests.csproj | 62 +---- .../TopLevelTests.cs | 2 - .../WindowBaseTests.cs | 2 - .../Avalonia.Layout.UnitTests.csproj | 213 ++++++------------ .../FullLayoutTests.cs | 50 +++- .../Avalonia.LeakTests.csproj | 2 - tests/coretests.props | 26 ++- 10 files changed, 147 insertions(+), 246 deletions(-) diff --git a/build.cake b/build.cake index 32da451a49..49fccd454b 100644 --- a/build.cake +++ b/build.cake @@ -159,12 +159,11 @@ Task("Build") void RunCoreTest(string dir, Parameters parameters) { + Information("Running tests from " + dir); DotNetCoreRestore(dir); - var frameworks = new List();; + var frameworks = new List(){"netcoreapp1.1"}; if(parameters.IsRunningOnWindows) frameworks.Add("net461"); - else - frameworks.Add("netcoreapp1.1"); foreach(var fw in frameworks) { Information("Running for " + fw); @@ -178,6 +177,8 @@ Task("Run-Net-Core-Unit-Tests") .IsDependentOn("Clean") .Does(() => { RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters); + RunCoreTest("./tests/Avalonia.Controls.UnitTests", parameters); + RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters); }); Task("Run-Unit-Tests") diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index 31aed15ae8..b4d35dd439 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -4,25 +4,6 @@ {2905FF23-53FB-45E6-AA49-6AF47A172056} - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - MinimumRecommendedRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - MinimumRecommendedRules.ruleset - @@ -57,11 +38,5 @@ Avalonia.UnitTests - + \ No newline at end of file diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index ed7af3b0ca..98188e91ad 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -108,8 +108,6 @@ --> - - diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 734d7a3d35..641f5ca499 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -1,35 +1,9 @@ - - - - Debug - AnyCPU - {5CCB5571-7C30-4E7D-967D-0E2158EBD91F} - Library - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - + + + net461;netcoreapp1.1 + {5CCB5571-7C30-4E7D-967D-0E2158EBD91F} + + @@ -92,10 +66,6 @@ - - {4a1abb09-9047-4bd5-a4ad-a055e52c5ee0} - Avalonia.DotNetFrameworkRuntime - {3e53a01a-b331-47f3-b828-4a5717e77a24} Avalonia.Markup.Xaml @@ -142,23 +112,6 @@ - - - - - - - - - - - @@ -172,5 +125,8 @@ + + + \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs index e19729706d..8ca4ca0fbc 100644 --- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs @@ -14,8 +14,6 @@ using Avalonia.Platform; using Avalonia.Rendering; using Avalonia.Styling; using Avalonia.UnitTests; -using Ploeh.AutoFixture; -using Ploeh.AutoFixture.AutoMoq; using Xunit; namespace Avalonia.Controls.UnitTests diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs index d4b850d66e..43dbcdc610 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs @@ -14,8 +14,6 @@ using Avalonia.Platform; using Avalonia.Rendering; using Avalonia.Styling; using Avalonia.UnitTests; -using Ploeh.AutoFixture; -using Ploeh.AutoFixture.AutoMoq; using Xunit; namespace Avalonia.Controls.UnitTests diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index 01732a85d7..ff4de46b1b 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -1,143 +1,72 @@ - - - - Debug - AnyCPU - {DB070A10-BF39-4752-8456-86E9D5928478} - Library - Properties - Avalonia.Layout.UnitTests - Avalonia.Layout.UnitTests - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - {D211E587-D8BC-45B9-95A4-F297C8FA5200} - Avalonia.Animation - - - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} - Avalonia.Base - - - {D2221C82-4A25-4583-9B43-D791E3F6820C} - Avalonia.Controls - - - {7062AE20-5DCC-4442-9645-8195BDECE63E} - Avalonia.Diagnostics - - - {4a1abb09-9047-4bd5-a4ad-a055e52c5ee0} - Avalonia.DotNetFrameworkRuntime - - - {62024B2D-53EB-4638-B26B-85EEAA54866E} - Avalonia.Input - - - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} - Avalonia.Interactivity - - - {42472427-4774-4C81-8AFF-9F27B8E31721} - Avalonia.Layout - - - {6417b24e-49c2-4985-8db2-3ab9d898ec91} - Avalonia.ReactiveUI - - - {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.Visuals - - - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} - Avalonia.Styling - - - {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F} - Avalonia.Themes.Default - - - {5ccb5571-7c30-4e7d-967d-0e2158ebd91f} - Avalonia.Controls.UnitTests - - - - - - - - - - - - - - False - - - False - - - False - - - False - - - - - - - - - - - - - - - - - - - - - - + + + net461;netcoreapp1.1 + {DB070A10-BF39-4752-8456-86E9D5928478} + + + + + + + + + + + + + {D211E587-D8BC-45B9-95A4-F297C8FA5200} + Avalonia.Animation + + + {B09B78D8-9B26-48B0-9149-D64A2F120F3F} + Avalonia.Base + + + {D2221C82-4A25-4583-9B43-D791E3F6820C} + Avalonia.Controls + + + {7062AE20-5DCC-4442-9645-8195BDECE63E} + Avalonia.Diagnostics + + + {62024B2D-53EB-4638-B26B-85EEAA54866E} + Avalonia.Input + + + {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} + Avalonia.Interactivity + + + {42472427-4774-4C81-8AFF-9F27B8E31721} + Avalonia.Layout + + + {6417b24e-49c2-4985-8db2-3ab9d898ec91} + Avalonia.ReactiveUI + + + {EB582467-6ABB-43A1-B052-E981BA910E3A} + Avalonia.Visuals + + + {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} + Avalonia.Styling + + + {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F} + Avalonia.Themes.Default + + + {88060192-33d5-4932-b0f9-8bd2763e857d} + Avalonia.UnitTests + + + {5CCB5571-7C30-4E7D-967D-0E2158EBD91F} + Avalonia.UnitTests + + + + + \ No newline at end of file diff --git a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs index 9922b624e5..74a1fbc735 100644 --- a/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs +++ b/tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs @@ -9,8 +9,6 @@ using Avalonia.Controls; using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; -using Avalonia.Controls.UnitTests; -using Avalonia.Controls.UnitTests.Primitives; using Avalonia.Diagnostics; using Avalonia.Input; using Avalonia.Platform; @@ -19,9 +17,10 @@ using Avalonia.Shared.PlatformSupport; using Avalonia.Styling; using Avalonia.Themes.Default; using Avalonia.VisualTree; -using Ploeh.AutoFixture; -using Ploeh.AutoFixture.AutoMoq; using Xunit; +using Avalonia.Media; +using System; +using System.Collections.Generic; namespace Avalonia.Layout.UnitTests { @@ -130,13 +129,44 @@ namespace Avalonia.Layout.UnitTests return v.Bounds.Position; } - private void RegisterServices() + class FormattedTextMock : IFormattedTextImpl { - var fixture = new Fixture().Customize(new AutoMoqCustomization()); + public FormattedTextMock(string text) + { + Text = text; + } + + public Size Constraint { get; set; } + + public string Text { get; } + + public void Dispose() + { + } + + public IEnumerable GetLines() => new FormattedTextLine[0]; + + public TextHitTestResult HitTestPoint(Point point) => new TextHitTestResult(); - var formattedText = fixture.Create(); + public Rect HitTestTextPosition(int index) => new Rect(); + + public IEnumerable HitTestTextRange(int index, int length) => new Rect[0]; + + public Size Measure() => Constraint; + + public void SetForegroundBrush(IBrush brush, int startIndex, int length) + { + } + } + + private void RegisterServices() + { var globalStyles = new Mock(); - var renderInterface = fixture.Create(); + var renderInterface = new Mock(); + renderInterface.Setup(x => x.CreateFormattedText(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), + It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(new FormattedTextMock("TEST")); + var windowImpl = new Mock(); Size clientSize = default(Size); @@ -152,9 +182,9 @@ namespace Avalonia.Layout.UnitTests .Bind().ToConstant(globalStyles.Object) .Bind().ToConstant(new LayoutManager()) .Bind().ToConstant(new AppBuilder().RuntimePlatform) - .Bind().ToConstant(renderInterface) + .Bind().ToConstant(renderInterface.Object) .Bind().ToConstant(new Styler()) - .Bind().ToConstant(new WindowingPlatformMock(() => windowImpl.Object)); + .Bind().ToConstant(new Avalonia.Controls.UnitTests.WindowingPlatformMock(() => windowImpl.Object)); var theme = new DefaultTheme(); globalStyles.Setup(x => x.Styles).Returns(theme); diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index 2c550bb97c..dfc759efd9 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -127,8 +127,6 @@ --> - - diff --git a/tests/coretests.props b/tests/coretests.props index 4253d70cdd..57b235dd60 100644 --- a/tests/coretests.props +++ b/tests/coretests.props @@ -1,10 +1,28 @@ - - False - false - true + False + false + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + MinimumRecommendedRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + MinimumRecommendedRules.ruleset From f129262238fa4d6d9b5e954c258e43bc814284c1 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 9 Mar 2017 02:58:53 +0300 Subject: [PATCH 30/38] Skip netcoreapp1.1 for layout and controls for now --- build.cake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.cake b/build.cake index 49fccd454b..d803e89c9a 100644 --- a/build.cake +++ b/build.cake @@ -157,7 +157,7 @@ Task("Build") } }); -void RunCoreTest(string dir, Parameters parameters) +void RunCoreTest(string dir, Parameters parameters, bool net461Only) { Information("Running tests from " + dir); DotNetCoreRestore(dir); @@ -166,6 +166,8 @@ void RunCoreTest(string dir, Parameters parameters) frameworks.Add("net461"); foreach(var fw in frameworks) { + if(fw != "net461" && net461Only) + continue; Information("Running for " + fw); DotNetCoreTest(System.IO.Path.Combine(dir, System.IO.Path.GetFileName(dir)+".csproj"), new DotNetCoreTestSettings{Framework = fw}); @@ -176,9 +178,9 @@ void RunCoreTest(string dir, Parameters parameters) Task("Run-Net-Core-Unit-Tests") .IsDependentOn("Clean") .Does(() => { - RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters); - RunCoreTest("./tests/Avalonia.Controls.UnitTests", parameters); - RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters); + RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters, false); + RunCoreTest("./tests/Avalonia.Controls.UnitTests", parameters, true); + RunCoreTest("./tests/Avalonia.Layout.UnitTests", parameters, true); }); Task("Run-Unit-Tests") From 25c7be5b7a1786cd9e8a4fe8fa58bb33ec5554ce Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Fri, 10 Mar 2017 14:55:44 +0300 Subject: [PATCH 31/38] Removed packages.config from csproj.files --- samples/VirtualizationTest/VirtualizationTest.csproj | 1 - src/Android/Avalonia.Android/Avalonia.Android.csproj | 1 - .../Avalonia.AndroidTestApplication.csproj | 1 - .../Avalonia.DotNetFrameworkRuntime.csproj | 3 --- src/Avalonia.Interactivity/Avalonia.Interactivity.csproj | 5 ----- src/Avalonia.Layout/Avalonia.Layout.csproj | 5 ----- src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj | 1 - src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj | 3 --- src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj | 3 --- src/Windows/Avalonia.Designer/Avalonia.Designer.csproj | 1 - src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj | 1 - src/Windows/Avalonia.Win32/Avalonia.Win32.csproj | 1 - src/iOS/Avalonia.iOS/Avalonia.iOS.csproj | 3 --- .../Avalonia.iOSTestApplication.csproj | 1 - tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj | 1 - .../Avalonia.DesignerSupport.Tests.csproj | 3 --- .../Avalonia.Direct2D1.UnitTests.csproj | 1 - .../Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj | 1 - .../Avalonia.Interactivity.UnitTests.csproj | 3 --- tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj | 1 - .../Avalonia.Markup.Xaml.UnitTests.csproj | 1 - .../Avalonia.Styling.UnitTests.csproj | 1 - .../Avalonia.Visuals.UnitTests.csproj | 3 --- 23 files changed, 45 deletions(-) diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 99f99cfe85..5065d70737 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -60,7 +60,6 @@ - diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index b763aad8f3..01fa9f9241 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -74,7 +74,6 @@ - diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index 0b6dee0d7d..a12356b959 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -76,7 +76,6 @@ - diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj index 350b4c4fbc..5c84f88d7e 100644 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj +++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj @@ -66,9 +66,6 @@ Avalonia.Styling - - - - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index bfcf4c6dda..8fbaa604cf 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -203,31 +203,24 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} Avalonia.Styling diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 9d1f82a105..c66810721b 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -28,47 +28,36 @@ - {3e53a01a-b331-47f3-b828-4a5717e77a24} Avalonia.Markup.Xaml - {6417e941-21bc-467b-a771-0de389353ce6} Avalonia.Markup - {d211e587-d8bc-45b9-95a4-f297c8fa5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} Avalonia.Styling - {3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F} Avalonia.Themes.Default diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 5eb0f899b8..5967970e71 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -29,51 +29,39 @@ - {3e53a01a-b331-47f3-b828-4a5717e77a24} Avalonia.Markup.Xaml - {6417e941-21bc-467b-a771-0de389353ce6} Avalonia.Markup - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Avalonia.ReactiveUI - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} Avalonia.Styling - {3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f} Avalonia.Themes.Default diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index 1004201ec4..a0f42ff2b0 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -33,27 +33,21 @@ - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Avalonia.Base - {d2221c82-4a25-4583-9b43-d791e3f6820c} Avalonia.Controls - {eb582467-6abb-43a1-b052-e981ba910e3a} Avalonia.Visuals - {bb1f7bb5-6ad4-4776-94d9-c09d0a972658} Avalonia.Gtk3 - {7d2d3083-71dd-4cc9-8907-39a0d86fb322} Avalonia.Skia.Desktop.NetStandard - {40759a76-d0f2-464e-8000-6ff0f5c4bd7c} Avalonia.Win32.NetStandard diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index 7c10c0f65e..f193d8a107 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -126,35 +126,27 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} Avalonia.Styling @@ -162,4 +154,4 @@ - + \ No newline at end of file diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index 6384f55006..7d4f4934ea 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -29,23 +29,18 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 4664357004..348cdcdcfd 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -29,19 +29,15 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 8af0aad659..49823a0ef7 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -29,15 +29,12 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 9935f1421f..4d840c7f14 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -32,7 +32,6 @@ - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Avalonia.Base diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index 98cb17d710..f3df2cbccc 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -69,15 +69,12 @@ - {d211e587-d8bc-45b9-95a4-f297c8fa5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 99f332214e..b4c1302969 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -27,39 +27,30 @@ - {3e53a01a-b331-47f3-b828-4a5717e77a24} Avalonia.Markup.Xaml - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} Avalonia.Styling diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 2f4cfe944a..1194606b68 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -29,11 +29,9 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index 3541a139dd..7efa58151f 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -59,23 +59,18 @@ - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} Avalonia.Interactivity - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.SceneGraph diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 478dd67a3c..1b14cb0518 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -270,39 +270,30 @@ - {D211E587-D8BC-45B9-95A4-F297C8FA5200} Avalonia.Animation - {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - {6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B} Avalonia.Interactivity - {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - {EB582467-6ABB-43A1-B052-E981BA910E3A} Avalonia.Visuals - {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} Avalonia.Styling - {6417e941-21bc-467b-a771-0de389353ce6} Avalonia.Markup @@ -327,4 +318,4 @@ - + \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index a50aa9570a..ce8c67d182 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -73,31 +73,24 @@ - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Avalonia.Base - {d2221c82-4a25-4583-9b43-d791e3f6820c} Avalonia.Controls - {62024b2d-53eb-4638-b26b-85eeaa54866e} Avalonia.Input - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} Avalonia.Interactivity - {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - {eb582467-6abb-43a1-b052-e981ba910e3a} Avalonia.Visuals - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} Avalonia.Styling diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index f1df5d36ea..80c3c4f117 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -36,31 +36,24 @@ - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Avalonia.Base - {d2221c82-4a25-4583-9b43-d791e3f6820c} Avalonia.Controls - {62024b2d-53eb-4638-b26b-85eeaa54866e} Avalonia.Input - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} Avalonia.Interactivity - {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} Avalonia.Styling - {eb582467-6abb-43a1-b052-e981ba910e3a} Avalonia.Visuals diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj index 5059131371..aec03d2966 100644 --- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj +++ b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj @@ -31,35 +31,27 @@ - {d211e587-d8bc-45b9-95a4-f297c8fa5200} Avalonia.Animation - {b09b78d8-9b26-48b0-9149-d64a2f120f3f} Avalonia.Base - {d2221c82-4a25-4583-9b43-d791e3f6820c} Avalonia.Controls - {62024b2d-53eb-4638-b26b-85eeaa54866e} Avalonia.Input - {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} Avalonia.Interactivity - {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} Avalonia.Styling - {eb582467-6abb-43a1-b052-e981ba910e3a} Avalonia.Visuals diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index 01e35df0d3..a7ddb3768f 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -99,10 +99,6 @@ Avalonia.Styling - - Designer - - - Avalonia.Base diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index 8fbaa604cf..d5e877e86d 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -203,25 +203,18 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index c66810721b..9f00cf64b5 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -28,37 +28,26 @@ - Avalonia.Markup.Xaml - Avalonia.Markup - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling - Avalonia.Themes.Default diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 5967970e71..b0680e8bf7 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -29,40 +29,28 @@ - Avalonia.Markup.Xaml - Avalonia.Markup - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.ReactiveUI - Avalonia.Visuals - Avalonia.Styling - Avalonia.Themes.Default diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index a0f42ff2b0..d9dd3c6ad3 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -33,22 +33,16 @@ - Avalonia.Base - Avalonia.Controls - Avalonia.Visuals - Avalonia.Gtk3 - Avalonia.Skia.Desktop.NetStandard - Avalonia.Win32.NetStandard diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index f193d8a107..4381650ac3 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -126,28 +126,20 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index 7d4f4934ea..5a66782864 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -29,19 +29,14 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 348cdcdcfd..8c9ff9bec4 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -29,16 +29,12 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Layout - Avalonia.Visuals diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 49823a0ef7..91ddda774d 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -29,13 +29,10 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Visuals diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 4d840c7f14..6bc3d64608 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -32,7 +32,6 @@ - Avalonia.Base diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index f3df2cbccc..6ffa9ce4fc 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -69,13 +69,10 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Visuals diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index b4c1302969..511181bc52 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -27,31 +27,22 @@ - Avalonia.Markup.Xaml - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 1194606b68..5b332fb790 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -29,10 +29,8 @@ - Avalonia.Animation - Avalonia.Base diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index 7efa58151f..391ef46741 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -59,19 +59,14 @@ - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.SceneGraph \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 1b14cb0518..afa4c5db2d 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -270,31 +270,22 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling - Avalonia.Markup diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index ce8c67d182..05eb298a8c 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -73,25 +73,18 @@ - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index 80c3c4f117..1b7321d3ed 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -36,25 +36,18 @@ - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Styling - Avalonia.Visuals diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj index aec03d2966..194b96db45 100644 --- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj +++ b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj @@ -31,28 +31,20 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Styling - Avalonia.Visuals diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index 48e7c6e33d..021fba7069 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -30,10 +30,8 @@ - Avalonia.Base - Avalonia.UnitTests diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 1e4a2d88a6..8d098fa677 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -67,37 +67,26 @@ - Avalonia.Markup.Xaml - Avalonia.Markup - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling - Avalonia.UnitTests diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index f09b415733..89ee3c4305 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -14,43 +14,30 @@ - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Diagnostics - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.ReactiveUI - Avalonia.Visuals - Avalonia.Styling - Avalonia.Themes.Default - Avalonia.UnitTests - Avalonia.UnitTests diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index 11c4ea65bf..cebd13837b 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -45,43 +45,30 @@ - Avalonia.DotNetFrameworkRuntime - Avalonia.DotNetCoreRuntime - Avalonia.Markup.Xaml - Avalonia.Markup - Avalonia.Animation - Avalonia.Base - Avalonia.Controls - Avalonia.Input - Avalonia.Interactivity - Avalonia.Layout - Avalonia.Visuals - Avalonia.Styling - Avalonia.Themes.Default From 6cf037ad7cddf846d8c4b2cefe983fa3a045b5b4 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Fri, 10 Mar 2017 15:10:43 +0300 Subject: [PATCH 34/38] One liners --- samples/ControlCatalog/ControlCatalog.csproj | 42 +++++++------------ .../Avalonia.Animation.csproj | 3 +- .../Avalonia.Controls.csproj | 21 ++++------ .../Avalonia.DesignerSupport.csproj | 33 +++++---------- .../Avalonia.Diagnostics.csproj | 36 ++++++---------- .../Avalonia.DotNetCoreRuntime.csproj | 18 +++----- .../Avalonia.HtmlRenderer.csproj | 24 ++++------- src/Avalonia.Input/Avalonia.Input.csproj | 15 +++---- .../Avalonia.Interactivity.csproj | 12 ++---- src/Avalonia.Layout/Avalonia.Layout.csproj | 9 ++-- .../Avalonia.Logging.Serilog.csproj | 3 +- src/Avalonia.Styling/Avalonia.Styling.csproj | 9 ++-- .../Avalonia.Themes.Default.csproj | 27 ++++-------- src/Avalonia.Visuals/Avalonia.Visuals.csproj | 6 +-- src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj | 15 +++---- .../Avalonia.Markup.Xaml.csproj | 27 ++++-------- .../Avalonia.Markup/Avalonia.Markup.csproj | 21 ++++------ .../Avalonia.Skia.Desktop.NetStandard.csproj | 21 ++++------ .../Avalonia.Win32.NetStandard.csproj | 24 ++++------- .../Avalonia.Base.UnitTests.csproj | 6 +-- .../Avalonia.Controls.UnitTests.csproj | 33 +++++---------- .../Avalonia.Layout.UnitTests.csproj | 39 ++++++----------- .../Avalonia.UnitTests.csproj | 39 ++++++----------- 23 files changed, 161 insertions(+), 322 deletions(-) diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 465f47cdbb..4741c8b35d 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -141,34 +141,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index 2801b078f8..c27b001688 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -28,8 +28,7 @@ - - + diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index d5e877e86d..588034bbce 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -202,20 +202,13 @@ - - - - - - - - - - - - - - + + + + + + + diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 9f00cf64b5..45d4946951 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -27,28 +27,17 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index b0680e8bf7..329055c56b 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -28,30 +28,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index d9dd3c6ad3..b1a52e86ea 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -32,18 +32,12 @@ - - - - - - - - - - - - + + + + + + diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index 4381650ac3..0d5d328e70 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -125,22 +125,14 @@ - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index 5a66782864..b3f58baa3b 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -28,16 +28,11 @@ - - - - - - - - - - + + + + + diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 8c9ff9bec4..1aa63cf3da 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -28,14 +28,10 @@ - - - - - - - - + + + + diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 91ddda774d..739560b2ad 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -28,12 +28,9 @@ - - - - - - + + + diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 6bc3d64608..3aa02ee130 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -31,8 +31,7 @@ - - + diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index 6ffa9ce4fc..33f6039574 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -68,12 +68,9 @@ - - - - - - + + + diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 511181bc52..9af563ac6c 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -26,24 +26,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 5b332fb790..1dcb7a180d 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -28,10 +28,8 @@ - - - - + + diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index 391ef46741..d16e9e0521 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -58,15 +58,10 @@ - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index afa4c5db2d..b71ae65347 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -269,24 +269,15 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 05eb298a8c..1054e0ffb9 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -72,20 +72,13 @@ - - - - - - - - - - - - - - + + + + + + + diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index 1b7321d3ed..df2af71ded 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -35,20 +35,13 @@ - - - - - - - - - - - - - - + + + + + + + diff --git a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj index 194b96db45..a685afe2f2 100644 --- a/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj +++ b/src/Windows/Avalonia.Win32.NetStandard/Avalonia.Win32.NetStandard.csproj @@ -30,22 +30,14 @@ - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index 021fba7069..fed77a8c33 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -29,10 +29,8 @@ - - - - + + \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 8d098fa677..de315afe3b 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -66,28 +66,17 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index 89ee3c4305..4d038d1cb2 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -13,32 +13,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index cebd13837b..9a71c70322 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -44,32 +44,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + From 96d9cfa2fcbad919f7295909aad51729a48a164d Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 10 Mar 2017 20:20:51 +0100 Subject: [PATCH 35/38] Use the default compile items in core libs. Now we're using the new project system, we don't have to have a `` element for each file. --- Avalonia.sln | 3 + .../Avalonia.Animation.csproj | 18 +- src/Avalonia.Base/Avalonia.Base.csproj | 83 --------- .../Avalonia.Controls.csproj | 171 ------------------ .../Avalonia.DesignerSupport.csproj | 9 - .../Avalonia.Diagnostics.csproj | 32 +--- .../Avalonia.DotNetCoreRuntime.csproj | 17 +- .../Properties/AssemblyInfo.cs | 6 + .../Avalonia.HtmlRenderer.csproj | 1 - src/Avalonia.Input/Avalonia.Input.csproj | 51 ------ .../Avalonia.Interactivity.csproj | 9 - src/Avalonia.Layout/Avalonia.Layout.csproj | 9 - .../Avalonia.Logging.Serilog.csproj | 7 - src/Avalonia.Styling/Avalonia.Styling.csproj | 41 ----- .../Avalonia.Themes.Default.csproj | 117 +----------- src/Avalonia.Visuals/Avalonia.Visuals.csproj | 114 ------------ .../Avalonia.Markup/Avalonia.Markup.csproj | 45 ----- 17 files changed, 21 insertions(+), 712 deletions(-) create mode 100644 src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs diff --git a/Avalonia.sln b/Avalonia.sln index d563d4548b..1233e603d7 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -176,6 +176,9 @@ Global src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4 src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{9defc6b7-845b-4d8f-afc0-d32bf0032b8c}*SharedItemsImports = 13 + tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{d35a9f3d-8bb0-496e-bf72-444038a7debb}*SharedItemsImports = 4 + tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{dabfd304-d6a4-4752-8123-c2ccf7ac7831}*SharedItemsImports = 4 + tests\Avalonia.RenderTests\Avalonia.RenderTests.projitems*{e106cf37-4066-4615-b684-172a6d30b058}*SharedItemsImports = 4 src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13 src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4 EndGlobalSection diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj index c27b001688..27f948b447 100644 --- a/src/Avalonia.Animation/Avalonia.Animation.csproj +++ b/src/Avalonia.Animation/Avalonia.Animation.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -26,28 +25,13 @@ CS1591 true - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - + diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 535090fd9c..1bcfd813c8 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -30,88 +29,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index 588034bbce..72a78b0738 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -30,176 +29,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 45d4946951..3bb74451e7 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -26,7 +25,6 @@ CS1591 - @@ -43,14 +41,7 @@ Properties\SharedAssemblyInfo.cs - - - - - - - diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 329055c56b..04499c7df3 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -27,7 +26,6 @@ true - @@ -45,34 +43,10 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - TreePageView.xaml + + %(Filename) - - DevTools.xaml - - - - - - - - - Designer - - + Designer diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index b1a52e86ea..257e27b043 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -1,9 +1,8 @@  - - netcoreapp1.0 - False - false - + + netcoreapp1.0 + false + true full @@ -25,11 +24,8 @@ - SharedAssemblyInfo.cs + Properties\SharedAssemblyInfo.cs - - - @@ -39,9 +35,6 @@ - - - diff --git a/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs b/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..51ec3975c9 --- /dev/null +++ b/src/Avalonia.DotNetCoreRuntime/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// 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.Reflection; + +[assembly: AssemblyTitle("Avalonia.DotNetCoreRuntime")] diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index 0d5d328e70..7cb66d588a 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -23,7 +23,6 @@ 4 - diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index b3f58baa3b..c3b30bb435 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -27,7 +26,6 @@ true - @@ -38,55 +36,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index 1aa63cf3da..154c8d35d0 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -27,7 +26,6 @@ true - @@ -37,13 +35,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 739560b2ad..d034004428 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -27,7 +26,6 @@ true - @@ -36,13 +34,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - diff --git a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj index 3aa02ee130..7905e5270d 100644 --- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj +++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -24,12 +23,6 @@ bin\Release\Avalonia.Logging.Serilog.XML true - - - - - - diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index 33f6039574..bc51b4c843 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -30,52 +29,12 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 9af563ac6c..ddf5857ce1 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -25,7 +24,6 @@ true - @@ -40,119 +38,10 @@ Properties\SharedAssemblyInfo.cs - - DefaultTheme.xaml + + %(Filename) - - - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - - - Designer - - - - - - + Designer diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj index 1dcb7a180d..5f879682c2 100644 --- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -27,7 +26,6 @@ true - @@ -35,118 +33,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 1054e0ffb9..38070a3655 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -1,7 +1,6 @@  netstandard1.1 - False false @@ -30,46 +29,6 @@ Properties\SharedAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80,10 +39,6 @@ - - - - From 65dd1a423b7183e74665dec68cfc96e6be8d34e2 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 12 Mar 2017 00:30:00 +0100 Subject: [PATCH 36/38] Use the default compile items in unit tests. For the tests that have been ported to .net core at least. --- .../Avalonia.Base.UnitTests.csproj | 29 +------- .../Avalonia.Controls.UnitTests.csproj | 71 ++----------------- .../WindowTests.cs | 24 ++----- .../Avalonia.Layout.UnitTests.csproj | 54 ++++++-------- tests/coretests.props | 4 +- 5 files changed, 38 insertions(+), 144 deletions(-) diff --git a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj index fed77a8c33..6f2007e8b1 100644 --- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj +++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj @@ -1,36 +1,13 @@  net461;netcoreapp1.1 - {2905FF23-53FB-45E6-AA49-6AF47A172056} - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index de315afe3b..c0e807f966 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -1,70 +1,8 @@  - - net461;netcoreapp1.1 - {5CCB5571-7C30-4E7D-967D-0E2158EBD91F} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + net461;netcoreapp1.1 + + @@ -84,6 +22,7 @@ + diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs index c4c637ec5b..ad88cf518c 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs @@ -4,33 +4,21 @@ // // ----------------------------------------------------------------------- +using Avalonia.Platform; +using Moq; +using Xunit; + namespace Avalonia.Controls.UnitTests { - using System.Reactive; - using System.Reactive.Subjects; - using Moq; - using Avalonia.Controls.Presenters; - using Avalonia.Controls.Templates; - using Avalonia.Input; - using Avalonia.Input.Raw; - using Avalonia.Layout; - using Avalonia.Platform; - using Avalonia.Rendering; - using Avalonia.Styling; - using Ploeh.AutoFixture; - using Ploeh.AutoFixture.AutoMoq; - using Splat; - using Xunit; - public class WindowTests { [Fact] public void Setting_Title_Should_Set_Impl_Title() { - using (Locator.CurrentMutable.WithResolver()) + using (AvaloniaLocator.EnterScope()) { var windowImpl = new Mock(); - Locator.CurrentMutable.RegisterConstant(windowImpl.Object, typeof(IWindowImpl)); + AvaloniaLocator.CurrentMutable.Bind().ToConstant(windowImpl.Object); var target = new Window(); diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index 4d038d1cb2..40118188dc 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -1,33 +1,25 @@  - - net461;netcoreapp1.1 - {DB070A10-BF39-4752-8456-86E9D5928478} - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + net461;netcoreapp1.1 + {DB070A10-BF39-4752-8456-86E9D5928478} + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/coretests.props b/tests/coretests.props index 57b235dd60..ab9d865b48 100644 --- a/tests/coretests.props +++ b/tests/coretests.props @@ -1,7 +1,5 @@ - - + - False false true From a2fe941e2ee5aa5b00268eb3eaa4c69327c6525b Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 12 Mar 2017 00:39:17 +0100 Subject: [PATCH 37/38] Added more comments on workaround. --- src/Shared/nuget.workaround.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Shared/nuget.workaround.targets b/src/Shared/nuget.workaround.targets index bf6b71ddba..dee700ce08 100644 --- a/src/Shared/nuget.workaround.targets +++ b/src/Shared/nuget.workaround.targets @@ -1,5 +1,9 @@ - + From d7703d619ca96f29b1f6284b205b00c79fe20c89 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 12 Mar 2017 00:53:24 +0100 Subject: [PATCH 38/38] Fixed failing test. And removed `TestServices.WindowImpl` as it was being ignored. --- tests/Avalonia.Controls.UnitTests/WindowTests.cs | 9 +++++---- tests/Avalonia.UnitTests/TestServices.cs | 4 ---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs index ad88cf518c..7b5e3197df 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs +++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs @@ -5,6 +5,7 @@ // ----------------------------------------------------------------------- using Avalonia.Platform; +using Avalonia.UnitTests; using Moq; using Xunit; @@ -15,11 +16,11 @@ namespace Avalonia.Controls.UnitTests [Fact] public void Setting_Title_Should_Set_Impl_Title() { - using (AvaloniaLocator.EnterScope()) - { - var windowImpl = new Mock(); - AvaloniaLocator.CurrentMutable.Bind().ToConstant(windowImpl.Object); + var windowImpl = new Mock(); + var windowingPlatform = new MockWindowingPlatform(() => windowImpl.Object); + using (UnitTestApplication.Start(new TestServices(windowingPlatform: windowingPlatform))) + { var target = new Window(); target.Title = "Hello World"; diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs index 8dc838163f..a5d9fb6d2f 100644 --- a/tests/Avalonia.UnitTests/TestServices.cs +++ b/tests/Avalonia.UnitTests/TestServices.cs @@ -67,7 +67,6 @@ namespace Avalonia.UnitTests IStyler styler = null, Func theme = null, IPlatformThreadingInterface threadingInterface = null, - IWindowImpl windowImpl = null, IWindowingPlatform windowingPlatform = null) { AssetLoader = assetLoader; @@ -83,7 +82,6 @@ namespace Avalonia.UnitTests Styler = styler; Theme = theme; ThreadingInterface = threadingInterface; - WindowImpl = windowImpl; WindowingPlatform = windowingPlatform; } @@ -100,7 +98,6 @@ namespace Avalonia.UnitTests public IStyler Styler { get; } public Func Theme { get; } public IPlatformThreadingInterface ThreadingInterface { get; } - public IWindowImpl WindowImpl { get; } public IWindowingPlatform WindowingPlatform { get; } public TestServices With( @@ -134,7 +131,6 @@ namespace Avalonia.UnitTests styler: styler ?? Styler, theme: theme ?? Theme, threadingInterface: threadingInterface ?? ThreadingInterface, - windowImpl: windowImpl ?? WindowImpl, windowingPlatform: windowingPlatform ?? WindowingPlatform); }