From 903c85382160d0abc785be31b91c9c894f8437cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:19:21 +0100 Subject: [PATCH 1/8] Add missing shared imports --- Avalonia.sln | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Avalonia.sln b/Avalonia.sln index 1233e603d7..6f9e81b44a 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -166,6 +166,9 @@ 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,6 +179,8 @@ 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 From 980808aacb57f00df5591130a5f5eb7d810514bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:19:43 +0100 Subject: [PATCH 2/8] Removed getting started item --- samples/ControlCatalog.Android/ControlCatalog.Android.csproj | 1 - samples/ControlCatalog.Android/GettingStarted.Xamarin | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 samples/ControlCatalog.Android/GettingStarted.Xamarin diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj index c9b12305dc..8df2a8764f 100644 --- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj +++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj @@ -73,7 +73,6 @@ - diff --git a/samples/ControlCatalog.Android/GettingStarted.Xamarin b/samples/ControlCatalog.Android/GettingStarted.Xamarin deleted file mode 100644 index e9d4f6a411..0000000000 --- a/samples/ControlCatalog.Android/GettingStarted.Xamarin +++ /dev/null @@ -1,4 +0,0 @@ - - GS\Android\CS\AndroidApp\GettingStarted.html - false - \ No newline at end of file From 7146b9130372bd4dc1155549206d89a9416de4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:20:41 +0100 Subject: [PATCH 3/8] Removed unnecessary project.json --- src/Gtk/Avalonia.Gtk3/.gitignore | 1 - src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj | 4 ---- src/Gtk/Avalonia.Gtk3/project.json | 10 ---------- 3 files changed, 15 deletions(-) delete mode 100644 src/Gtk/Avalonia.Gtk3/.gitignore delete mode 100644 src/Gtk/Avalonia.Gtk3/project.json diff --git a/src/Gtk/Avalonia.Gtk3/.gitignore b/src/Gtk/Avalonia.Gtk3/.gitignore deleted file mode 100644 index ddb0c6248b..0000000000 --- a/src/Gtk/Avalonia.Gtk3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -project.lock.json \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj index d16e9e0521..1874d92f4d 100644 --- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj +++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj @@ -23,10 +23,6 @@ 4 true - - - - KeyTransform.cs diff --git a/src/Gtk/Avalonia.Gtk3/project.json b/src/Gtk/Avalonia.Gtk3/project.json deleted file mode 100644 index 7af946da1a..0000000000 --- a/src/Gtk/Avalonia.Gtk3/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "supports": {}, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.1": {} - } -} \ No newline at end of file From 6d557f7819bc79d12bed60ccc8cc2c5958b76953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:21:03 +0100 Subject: [PATCH 4/8] Already included in coretests.props --- .../Avalonia.Controls.UnitTests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index c0e807f966..ff72edab11 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -34,5 +34,4 @@ - \ No newline at end of file From e2489a6b28edc0be600f426266447ac4cd2cd483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:21:12 +0100 Subject: [PATCH 5/8] Removed unused variable --- tests/Avalonia.DesignerSupport.Tests/Checker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Avalonia.DesignerSupport.Tests/Checker.cs b/tests/Avalonia.DesignerSupport.Tests/Checker.cs index 9d761689e7..5e71c85e6f 100644 --- a/tests/Avalonia.DesignerSupport.Tests/Checker.cs +++ b/tests/Avalonia.DesignerSupport.Tests/Checker.cs @@ -23,7 +23,7 @@ namespace Avalonia.DesignerSupport.Tests { Assembly.LoadFrom(asm); } - catch (Exception e) + catch (Exception) { } var dic = new Dictionary(); From 07b5756b2132ae99f102f0dd251e4ec201df659b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:21:33 +0100 Subject: [PATCH 6/8] Removed non existing items --- tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj | 1 - tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj index fed9e121e5..e2aafb1464 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj @@ -74,7 +74,6 @@ - diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj index 32a27e1f23..29a1dcec0f 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj @@ -74,7 +74,6 @@ - From 26561a5ad40fe72072206c2db210bf92e0f317ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:21:50 +0100 Subject: [PATCH 7/8] Only include when using net461 framework --- tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index 9a71c70322..e45ecce07e 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -21,7 +21,7 @@ prompt 4 - + From 1615b7992c80689fda0020ed36ea4f1103d0ea4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 13 Mar 2017 19:22:12 +0100 Subject: [PATCH 8/8] Do not include sdk framework twice --- tests/coretests.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/coretests.props b/tests/coretests.props index ab9d865b48..590017c025 100644 --- a/tests/coretests.props +++ b/tests/coretests.props @@ -1,4 +1,4 @@ - + false true