diff --git a/Avalonia.sln b/Avalonia.sln index 7a0ae0ce53..db23458673 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -4,7 +4,7 @@ VisualStudioVersion = 14.0.25420.1 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 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.SceneGraph", "src\Avalonia.SceneGraph\Avalonia.SceneGraph.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Visuals", "src\Avalonia.Visuals\Avalonia.Visuals.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Layout", "src\Avalonia.Layout\Avalonia.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}" EndProject @@ -39,7 +39,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Styling.UnitTests" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls.UnitTests", "tests\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.SceneGraph.UnitTests", "tests\Avalonia.SceneGraph.UnitTests\Avalonia.SceneGraph.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Visuals.UnitTests", "tests\Avalonia.Visuals.UnitTests\Avalonia.Visuals.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}" EndProject diff --git a/build.cake b/build.cake index cb8ed5b9f5..9b8604f79f 100644 --- a/build.cake +++ b/build.cake @@ -232,8 +232,8 @@ var coreLibraries = new string[][] new [] { "./src/", "Avalonia.Layout", ".xml" }, new [] { "./src/", "Avalonia.Logging.Serilog", ".dll" }, new [] { "./src/", "Avalonia.Logging.Serilog", ".xml" }, - new [] { "./src/", "Avalonia.SceneGraph", ".dll" }, - new [] { "./src/", "Avalonia.SceneGraph", ".xml" }, + new [] { "./src/", "Avalonia.Visuals", ".dll" }, + new [] { "./src/", "Avalonia.Visuals", ".xml" }, new [] { "./src/", "Avalonia.Styling", ".dll" }, new [] { "./src/", "Avalonia.Styling", ".xml" }, new [] { "./src/", "Avalonia.ReactiveUI", ".dll" }, diff --git a/docs/docfx.json b/docs/docfx.json index 2b86d31d57..d49ee066ed 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -18,7 +18,7 @@ "/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj", "/src/Avalonia.Layout/Avalonia.Layout.csproj", "/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj", - "/src/Avalonia.SceneGraph/Avalonia.SceneGraph.csproj", + "/src/Avalonia.Visuals/Avalonia.Visuals.csproj", "/src/Avalonia.Styling/Avalonia.Styling.csproj", "/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj", "/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj", diff --git a/docs/spec/architecture.md b/docs/spec/architecture.md index 8966308a24..1245bdbfd4 100644 --- a/docs/spec/architecture.md +++ b/docs/spec/architecture.md @@ -40,7 +40,7 @@ The main class in the assembly is `Animatable`. Allows AvaloniaProperties to be animated and provides various utilities related to animation. -### Avalonia.SceneGraph +### Avalonia.Visuals The main class in this assembly is `Visual` and its interface `IVisual`. diff --git a/docs/tutorial/nuget.md b/docs/tutorial/nuget.md index 314575258c..b5f8f50242 100644 --- a/docs/tutorial/nuget.md +++ b/docs/tutorial/nuget.md @@ -20,7 +20,7 @@ Avalonia is divided into several `NuGet` packages. - Avalonia.Interactivity (.dll) - Avalonia.Layout (.dll) - Avalonia.Logging.Serilog (.dll) - - Avalonia.SceneGraph (.dll) + - Avalonia.Visuals (.dll) - Avalonia.Styling (.dll) - Avalonia.ReactiveUI (.dll) - Avalonia.Themes.Default (.dll) diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index a1d79472d8..2dc0cd445b 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -148,9 +148,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj index f83b1f3422..5b39aa3dfb 100644 --- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj +++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj @@ -129,9 +129,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj index 82f4ee1c28..53cb277233 100644 --- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj +++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj @@ -112,9 +112,9 @@ {B61B66A3-B82D-4875-8001-89D3394FE0C9} Avalonia.Logging.Serilog - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj index 0e85a4e865..1c4d31b62c 100644 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj +++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj @@ -144,9 +144,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 63c82d9e8a..f4a0915dd1 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -197,9 +197,9 @@ {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Avalonia.ReactiveUI - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/samples/RenderTest/RenderTest.csproj b/samples/RenderTest/RenderTest.csproj index 49ce4603ce..f117c76342 100644 --- a/samples/RenderTest/RenderTest.csproj +++ b/samples/RenderTest/RenderTest.csproj @@ -139,9 +139,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj index 171e9991b6..691c4ea5bb 100644 --- a/samples/TestApplication/TestApplication.csproj +++ b/samples/TestApplication/TestApplication.csproj @@ -143,9 +143,9 @@ {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Avalonia.ReactiveUI - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/samples/VirtualizationTest/VirtualizationTest.csproj b/samples/VirtualizationTest/VirtualizationTest.csproj index 512d4c361f..9e80dfdc8f 100644 --- a/samples/VirtualizationTest/VirtualizationTest.csproj +++ b/samples/VirtualizationTest/VirtualizationTest.csproj @@ -127,9 +127,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj index d3c9ba8d7d..a2cc00b150 100644 --- a/samples/XamlTestApplication/XamlTestApplication.csproj +++ b/samples/XamlTestApplication/XamlTestApplication.csproj @@ -143,9 +143,9 @@ {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Avalonia.ReactiveUI - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj index 9a9b75d5d7..b966cff6df 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj +++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj @@ -106,9 +106,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj b/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj index 0d87af8838..738a1e776c 100644 --- a/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj +++ b/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj @@ -112,9 +112,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj index 827f73d7ae..671ebd0020 100644 --- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj +++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj @@ -136,9 +136,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj index a412930b85..70c70ad56e 100644 --- a/src/Android/Avalonia.Android/Avalonia.Android.csproj +++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj @@ -124,9 +124,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index d86215248a..e004121323 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -160,9 +160,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj index 3d27a5e501..10fbe746e3 100644 --- a/src/Avalonia.Controls/Avalonia.Controls.csproj +++ b/src/Avalonia.Controls/Avalonia.Controls.csproj @@ -256,9 +256,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj index 7c26e0275c..478d0eaa57 100644 --- a/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj +++ b/src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj @@ -73,9 +73,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj index 7ac724fcf4..5381f55288 100644 --- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj +++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj @@ -78,9 +78,9 @@ {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Avalonia.ReactiveUI - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj index ff481f769e..f11b67dcc9 100644 --- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj +++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj @@ -65,9 +65,9 @@ {D2221C82-4A25-4583-9B43-D791E3F6820C} Avalonia.Controls - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj index be0e107f91..dd0a6f2cef 100644 --- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj +++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj @@ -161,9 +161,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/Avalonia.Input/Avalonia.Input.csproj b/src/Avalonia.Input/Avalonia.Input.csproj index 45a1ce9015..5e0fb50b67 100644 --- a/src/Avalonia.Input/Avalonia.Input.csproj +++ b/src/Avalonia.Input/Avalonia.Input.csproj @@ -58,9 +58,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals diff --git a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj index a9ddc316ca..499a55ef12 100644 --- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj +++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj @@ -54,9 +54,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals diff --git a/src/Avalonia.Layout/Avalonia.Layout.csproj b/src/Avalonia.Layout/Avalonia.Layout.csproj index 4db2398dbe..4bc27fc96b 100644 --- a/src/Avalonia.Layout/Avalonia.Layout.csproj +++ b/src/Avalonia.Layout/Avalonia.Layout.csproj @@ -50,9 +50,9 @@ {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj index 067900e5ca..3566ed7268 100644 --- a/src/Avalonia.Styling/Avalonia.Styling.csproj +++ b/src/Avalonia.Styling/Avalonia.Styling.csproj @@ -111,9 +111,9 @@ {B09B78D8-9B26-48B0-9149-D64A2F120F3F} Avalonia.Base - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index cd0bf77eae..578bb9cdff 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -68,9 +68,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/Avalonia.SceneGraph/Animation/CrossFade.cs b/src/Avalonia.Visuals/Animation/CrossFade.cs similarity index 100% rename from src/Avalonia.SceneGraph/Animation/CrossFade.cs rename to src/Avalonia.Visuals/Animation/CrossFade.cs diff --git a/src/Avalonia.SceneGraph/Animation/IPageTransition.cs b/src/Avalonia.Visuals/Animation/IPageTransition.cs similarity index 100% rename from src/Avalonia.SceneGraph/Animation/IPageTransition.cs rename to src/Avalonia.Visuals/Animation/IPageTransition.cs diff --git a/src/Avalonia.SceneGraph/Animation/PageSlide.cs b/src/Avalonia.Visuals/Animation/PageSlide.cs similarity index 100% rename from src/Avalonia.SceneGraph/Animation/PageSlide.cs rename to src/Avalonia.Visuals/Animation/PageSlide.cs diff --git a/src/Avalonia.SceneGraph/Avalonia.SceneGraph.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj similarity index 97% rename from src/Avalonia.SceneGraph/Avalonia.SceneGraph.csproj rename to src/Avalonia.Visuals/Avalonia.Visuals.csproj index 3d2347683d..d9736e4c6e 100644 --- a/src/Avalonia.SceneGraph/Avalonia.SceneGraph.csproj +++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj @@ -9,7 +9,7 @@ Library Properties Avalonia - Avalonia.SceneGraph + Avalonia.Visuals en-US 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -26,7 +26,7 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.SceneGraph.XML + bin\Debug\Avalonia.Visuals.xml CS1591 @@ -36,7 +36,7 @@ TRACE prompt 4 - bin\Release\Avalonia.SceneGraph.XML + bin\Release\Avalonia.Visuals.xml CS1591 true diff --git a/src/Avalonia.SceneGraph/Avalonia.SceneGraph.v2.ncrunchproject b/src/Avalonia.Visuals/Avalonia.Visuals.v2.ncrunchproject similarity index 100% rename from src/Avalonia.SceneGraph/Avalonia.SceneGraph.v2.ncrunchproject rename to src/Avalonia.Visuals/Avalonia.Visuals.v2.ncrunchproject diff --git a/src/Avalonia.SceneGraph/INamed.cs b/src/Avalonia.Visuals/INamed.cs similarity index 100% rename from src/Avalonia.SceneGraph/INamed.cs rename to src/Avalonia.Visuals/INamed.cs diff --git a/src/Avalonia.SceneGraph/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs similarity index 100% rename from src/Avalonia.SceneGraph/Matrix.cs rename to src/Avalonia.Visuals/Matrix.cs diff --git a/src/Avalonia.SceneGraph/Media/AlignmentX.cs b/src/Avalonia.Visuals/Media/AlignmentX.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/AlignmentX.cs rename to src/Avalonia.Visuals/Media/AlignmentX.cs diff --git a/src/Avalonia.SceneGraph/Media/AlignmentY.cs b/src/Avalonia.Visuals/Media/AlignmentY.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/AlignmentY.cs rename to src/Avalonia.Visuals/Media/AlignmentY.cs diff --git a/src/Avalonia.SceneGraph/Media/ArcSegment.cs b/src/Avalonia.Visuals/Media/ArcSegment.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/ArcSegment.cs rename to src/Avalonia.Visuals/Media/ArcSegment.cs diff --git a/src/Avalonia.SceneGraph/Media/BezierSegment .cs b/src/Avalonia.Visuals/Media/BezierSegment .cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/BezierSegment .cs rename to src/Avalonia.Visuals/Media/BezierSegment .cs diff --git a/src/Avalonia.SceneGraph/Media/Brush.cs b/src/Avalonia.Visuals/Media/Brush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Brush.cs rename to src/Avalonia.Visuals/Media/Brush.cs diff --git a/src/Avalonia.SceneGraph/Media/BrushMappingMode.cs b/src/Avalonia.Visuals/Media/BrushMappingMode.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/BrushMappingMode.cs rename to src/Avalonia.Visuals/Media/BrushMappingMode.cs diff --git a/src/Avalonia.SceneGraph/Media/Brushes.cs b/src/Avalonia.Visuals/Media/Brushes.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Brushes.cs rename to src/Avalonia.Visuals/Media/Brushes.cs diff --git a/src/Avalonia.SceneGraph/Media/Color.cs b/src/Avalonia.Visuals/Media/Color.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Color.cs rename to src/Avalonia.Visuals/Media/Color.cs diff --git a/src/Avalonia.SceneGraph/Media/Colors.cs b/src/Avalonia.Visuals/Media/Colors.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Colors.cs rename to src/Avalonia.Visuals/Media/Colors.cs diff --git a/src/Avalonia.SceneGraph/Media/DashStyle.cs b/src/Avalonia.Visuals/Media/DashStyle.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/DashStyle.cs rename to src/Avalonia.Visuals/Media/DashStyle.cs diff --git a/src/Avalonia.SceneGraph/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/DrawingContext.cs rename to src/Avalonia.Visuals/Media/DrawingContext.cs diff --git a/src/Avalonia.SceneGraph/Media/EllipseGeometry.cs b/src/Avalonia.Visuals/Media/EllipseGeometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/EllipseGeometry.cs rename to src/Avalonia.Visuals/Media/EllipseGeometry.cs diff --git a/src/Avalonia.SceneGraph/Media/FillRule.cs b/src/Avalonia.Visuals/Media/FillRule.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/FillRule.cs rename to src/Avalonia.Visuals/Media/FillRule.cs diff --git a/src/Avalonia.SceneGraph/Media/FontStyle.cs b/src/Avalonia.Visuals/Media/FontStyle.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/FontStyle.cs rename to src/Avalonia.Visuals/Media/FontStyle.cs diff --git a/src/Avalonia.SceneGraph/Media/FontWeight.cs b/src/Avalonia.Visuals/Media/FontWeight.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/FontWeight.cs rename to src/Avalonia.Visuals/Media/FontWeight.cs diff --git a/src/Avalonia.SceneGraph/Media/FormattedText.cs b/src/Avalonia.Visuals/Media/FormattedText.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/FormattedText.cs rename to src/Avalonia.Visuals/Media/FormattedText.cs diff --git a/src/Avalonia.SceneGraph/Media/FormattedTextLine.cs b/src/Avalonia.Visuals/Media/FormattedTextLine.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/FormattedTextLine.cs rename to src/Avalonia.Visuals/Media/FormattedTextLine.cs diff --git a/src/Avalonia.SceneGraph/Media/Geometry.cs b/src/Avalonia.Visuals/Media/Geometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Geometry.cs rename to src/Avalonia.Visuals/Media/Geometry.cs diff --git a/src/Avalonia.SceneGraph/Media/GradientBrush.cs b/src/Avalonia.Visuals/Media/GradientBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/GradientBrush.cs rename to src/Avalonia.Visuals/Media/GradientBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/GradientSpreadMethod.cs b/src/Avalonia.Visuals/Media/GradientSpreadMethod.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/GradientSpreadMethod.cs rename to src/Avalonia.Visuals/Media/GradientSpreadMethod.cs diff --git a/src/Avalonia.SceneGraph/Media/GradientStop.cs b/src/Avalonia.Visuals/Media/GradientStop.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/GradientStop.cs rename to src/Avalonia.Visuals/Media/GradientStop.cs diff --git a/src/Avalonia.SceneGraph/Media/IBrush.cs b/src/Avalonia.Visuals/Media/IBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/IBrush.cs rename to src/Avalonia.Visuals/Media/IBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/IDrawingContext.cs b/src/Avalonia.Visuals/Media/IDrawingContext.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/IDrawingContext.cs rename to src/Avalonia.Visuals/Media/IDrawingContext.cs diff --git a/src/Avalonia.SceneGraph/Media/ISolidColorBrush.cs b/src/Avalonia.Visuals/Media/ISolidColorBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/ISolidColorBrush.cs rename to src/Avalonia.Visuals/Media/ISolidColorBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/ImageBush.cs b/src/Avalonia.Visuals/Media/ImageBush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/ImageBush.cs rename to src/Avalonia.Visuals/Media/ImageBush.cs diff --git a/src/Avalonia.SceneGraph/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Imaging/Bitmap.cs rename to src/Avalonia.Visuals/Media/Imaging/Bitmap.cs diff --git a/src/Avalonia.SceneGraph/Media/Imaging/IBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/IBitmap.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Imaging/IBitmap.cs rename to src/Avalonia.Visuals/Media/Imaging/IBitmap.cs diff --git a/src/Avalonia.SceneGraph/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Imaging/RenderTargetBitmap.cs rename to src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs diff --git a/src/Avalonia.SceneGraph/Media/LineGeometry.cs b/src/Avalonia.Visuals/Media/LineGeometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/LineGeometry.cs rename to src/Avalonia.Visuals/Media/LineGeometry.cs diff --git a/src/Avalonia.SceneGraph/Media/LineSegment.cs b/src/Avalonia.Visuals/Media/LineSegment.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/LineSegment.cs rename to src/Avalonia.Visuals/Media/LineSegment.cs diff --git a/src/Avalonia.SceneGraph/Media/LinearGradientBrush.cs b/src/Avalonia.Visuals/Media/LinearGradientBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/LinearGradientBrush.cs rename to src/Avalonia.Visuals/Media/LinearGradientBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/MatrixTransform.cs b/src/Avalonia.Visuals/Media/MatrixTransform.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/MatrixTransform.cs rename to src/Avalonia.Visuals/Media/MatrixTransform.cs diff --git a/src/Avalonia.SceneGraph/Media/MediaExtensions.cs b/src/Avalonia.Visuals/Media/MediaExtensions.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/MediaExtensions.cs rename to src/Avalonia.Visuals/Media/MediaExtensions.cs diff --git a/src/Avalonia.SceneGraph/Media/Mutable/SolidColorBrush.cs b/src/Avalonia.Visuals/Media/Mutable/SolidColorBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Mutable/SolidColorBrush.cs rename to src/Avalonia.Visuals/Media/Mutable/SolidColorBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/PathFigure.cs b/src/Avalonia.Visuals/Media/PathFigure.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PathFigure.cs rename to src/Avalonia.Visuals/Media/PathFigure.cs diff --git a/src/Avalonia.SceneGraph/Media/PathGeometry.cs b/src/Avalonia.Visuals/Media/PathGeometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PathGeometry.cs rename to src/Avalonia.Visuals/Media/PathGeometry.cs diff --git a/src/Avalonia.SceneGraph/Media/PathGeometryCollections.cs b/src/Avalonia.Visuals/Media/PathGeometryCollections.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PathGeometryCollections.cs rename to src/Avalonia.Visuals/Media/PathGeometryCollections.cs diff --git a/src/Avalonia.SceneGraph/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PathMarkupParser.cs rename to src/Avalonia.Visuals/Media/PathMarkupParser.cs diff --git a/src/Avalonia.SceneGraph/Media/PathSegment.cs b/src/Avalonia.Visuals/Media/PathSegment.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PathSegment.cs rename to src/Avalonia.Visuals/Media/PathSegment.cs diff --git a/src/Avalonia.SceneGraph/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Pen.cs rename to src/Avalonia.Visuals/Media/Pen.cs diff --git a/src/Avalonia.SceneGraph/Media/PenLineCap.cs b/src/Avalonia.Visuals/Media/PenLineCap.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PenLineCap.cs rename to src/Avalonia.Visuals/Media/PenLineCap.cs diff --git a/src/Avalonia.SceneGraph/Media/PenLineJoin.cs b/src/Avalonia.Visuals/Media/PenLineJoin.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PenLineJoin.cs rename to src/Avalonia.Visuals/Media/PenLineJoin.cs diff --git a/src/Avalonia.SceneGraph/Media/PolylineGeometry.cs b/src/Avalonia.Visuals/Media/PolylineGeometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/PolylineGeometry.cs rename to src/Avalonia.Visuals/Media/PolylineGeometry.cs diff --git a/src/Avalonia.SceneGraph/Media/QuadraticBezierSegment .cs b/src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/QuadraticBezierSegment .cs rename to src/Avalonia.Visuals/Media/QuadraticBezierSegment .cs diff --git a/src/Avalonia.SceneGraph/Media/RadialGradientBrush.cs b/src/Avalonia.Visuals/Media/RadialGradientBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/RadialGradientBrush.cs rename to src/Avalonia.Visuals/Media/RadialGradientBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/RectangleGeometry.cs b/src/Avalonia.Visuals/Media/RectangleGeometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/RectangleGeometry.cs rename to src/Avalonia.Visuals/Media/RectangleGeometry.cs diff --git a/src/Avalonia.SceneGraph/Media/RotateTransform.cs b/src/Avalonia.Visuals/Media/RotateTransform.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/RotateTransform.cs rename to src/Avalonia.Visuals/Media/RotateTransform.cs diff --git a/src/Avalonia.SceneGraph/Media/ScaleTransform.cs b/src/Avalonia.Visuals/Media/ScaleTransform.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/ScaleTransform.cs rename to src/Avalonia.Visuals/Media/ScaleTransform.cs diff --git a/src/Avalonia.SceneGraph/Media/SolidColorBrush.cs b/src/Avalonia.Visuals/Media/SolidColorBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/SolidColorBrush.cs rename to src/Avalonia.Visuals/Media/SolidColorBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/StreamGeometry.cs b/src/Avalonia.Visuals/Media/StreamGeometry.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/StreamGeometry.cs rename to src/Avalonia.Visuals/Media/StreamGeometry.cs diff --git a/src/Avalonia.SceneGraph/Media/StreamGeometryContext.cs b/src/Avalonia.Visuals/Media/StreamGeometryContext.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/StreamGeometryContext.cs rename to src/Avalonia.Visuals/Media/StreamGeometryContext.cs diff --git a/src/Avalonia.SceneGraph/Media/Stretch.cs b/src/Avalonia.Visuals/Media/Stretch.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Stretch.cs rename to src/Avalonia.Visuals/Media/Stretch.cs diff --git a/src/Avalonia.SceneGraph/Media/SweepDirection.cs b/src/Avalonia.Visuals/Media/SweepDirection.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/SweepDirection.cs rename to src/Avalonia.Visuals/Media/SweepDirection.cs diff --git a/src/Avalonia.SceneGraph/Media/TextAlignment.cs b/src/Avalonia.Visuals/Media/TextAlignment.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/TextAlignment.cs rename to src/Avalonia.Visuals/Media/TextAlignment.cs diff --git a/src/Avalonia.SceneGraph/Media/TextHitTestResult.cs b/src/Avalonia.Visuals/Media/TextHitTestResult.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/TextHitTestResult.cs rename to src/Avalonia.Visuals/Media/TextHitTestResult.cs diff --git a/src/Avalonia.SceneGraph/Media/TextWrapping.cs b/src/Avalonia.Visuals/Media/TextWrapping.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/TextWrapping.cs rename to src/Avalonia.Visuals/Media/TextWrapping.cs diff --git a/src/Avalonia.SceneGraph/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/TileBrush.cs rename to src/Avalonia.Visuals/Media/TileBrush.cs diff --git a/src/Avalonia.SceneGraph/Media/Transform.cs b/src/Avalonia.Visuals/Media/Transform.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/Transform.cs rename to src/Avalonia.Visuals/Media/Transform.cs diff --git a/src/Avalonia.SceneGraph/Media/TransformGroup.cs b/src/Avalonia.Visuals/Media/TransformGroup.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/TransformGroup.cs rename to src/Avalonia.Visuals/Media/TransformGroup.cs diff --git a/src/Avalonia.SceneGraph/Media/TranslateTransform.cs b/src/Avalonia.Visuals/Media/TranslateTransform.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/TranslateTransform.cs rename to src/Avalonia.Visuals/Media/TranslateTransform.cs diff --git a/src/Avalonia.SceneGraph/Media/VisualBrush.cs b/src/Avalonia.Visuals/Media/VisualBrush.cs similarity index 100% rename from src/Avalonia.SceneGraph/Media/VisualBrush.cs rename to src/Avalonia.Visuals/Media/VisualBrush.cs diff --git a/src/Avalonia.SceneGraph/Platform/ExportRenderingSubsystemAttribute.cs b/src/Avalonia.Visuals/Platform/ExportRenderingSubsystemAttribute.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/ExportRenderingSubsystemAttribute.cs rename to src/Avalonia.Visuals/Platform/ExportRenderingSubsystemAttribute.cs diff --git a/src/Avalonia.SceneGraph/Platform/IBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IBitmapImpl.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IBitmapImpl.cs rename to src/Avalonia.Visuals/Platform/IBitmapImpl.cs diff --git a/src/Avalonia.SceneGraph/Platform/IFormattedTextImpl.cs b/src/Avalonia.Visuals/Platform/IFormattedTextImpl.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IFormattedTextImpl.cs rename to src/Avalonia.Visuals/Platform/IFormattedTextImpl.cs diff --git a/src/Avalonia.SceneGraph/Platform/IGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IGeometryImpl.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IGeometryImpl.cs rename to src/Avalonia.Visuals/Platform/IGeometryImpl.cs diff --git a/src/Avalonia.SceneGraph/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IPlatformRenderInterface.cs rename to src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs diff --git a/src/Avalonia.SceneGraph/Platform/IPlatformSettings.cs b/src/Avalonia.Visuals/Platform/IPlatformSettings.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IPlatformSettings.cs rename to src/Avalonia.Visuals/Platform/IPlatformSettings.cs diff --git a/src/Avalonia.SceneGraph/Platform/IRenderTarget.cs b/src/Avalonia.Visuals/Platform/IRenderTarget.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IRenderTarget.cs rename to src/Avalonia.Visuals/Platform/IRenderTarget.cs diff --git a/src/Avalonia.SceneGraph/Platform/IRenderTargetBitmapImpl.cs b/src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IRenderTargetBitmapImpl.cs rename to src/Avalonia.Visuals/Platform/IRenderTargetBitmapImpl.cs diff --git a/src/Avalonia.SceneGraph/Platform/IStreamGeometryContextImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IStreamGeometryContextImpl.cs rename to src/Avalonia.Visuals/Platform/IStreamGeometryContextImpl.cs diff --git a/src/Avalonia.SceneGraph/Platform/IStreamGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs similarity index 100% rename from src/Avalonia.SceneGraph/Platform/IStreamGeometryImpl.cs rename to src/Avalonia.Visuals/Platform/IStreamGeometryImpl.cs diff --git a/src/Avalonia.SceneGraph/Point.cs b/src/Avalonia.Visuals/Point.cs similarity index 100% rename from src/Avalonia.SceneGraph/Point.cs rename to src/Avalonia.Visuals/Point.cs diff --git a/src/Avalonia.SceneGraph/Properties/AssemblyInfo.cs b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs similarity index 84% rename from src/Avalonia.SceneGraph/Properties/AssemblyInfo.cs rename to src/Avalonia.Visuals/Properties/AssemblyInfo.cs index b70832a031..25f5aeb8f8 100644 --- a/src/Avalonia.SceneGraph/Properties/AssemblyInfo.cs +++ b/src/Avalonia.Visuals/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Reflection; using Avalonia.Metadata; -[assembly: AssemblyTitle("Avalonia.SceneGraph")] +[assembly: AssemblyTitle("Avalonia.Visuals")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")] [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")] [assembly: XmlnsDefinition("https://github.com/avaloniaui/mutable", "Avalonia.Media.Mutable")] \ No newline at end of file diff --git a/src/Avalonia.SceneGraph/Rect.cs b/src/Avalonia.Visuals/Rect.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rect.cs rename to src/Avalonia.Visuals/Rect.cs diff --git a/src/Avalonia.SceneGraph/RelativePoint.cs b/src/Avalonia.Visuals/RelativePoint.cs similarity index 100% rename from src/Avalonia.SceneGraph/RelativePoint.cs rename to src/Avalonia.Visuals/RelativePoint.cs diff --git a/src/Avalonia.SceneGraph/RelativeRect.cs b/src/Avalonia.Visuals/RelativeRect.cs similarity index 100% rename from src/Avalonia.SceneGraph/RelativeRect.cs rename to src/Avalonia.Visuals/RelativeRect.cs diff --git a/src/Avalonia.SceneGraph/RenderTargetCorruptedException.cs b/src/Avalonia.Visuals/RenderTargetCorruptedException.cs similarity index 100% rename from src/Avalonia.SceneGraph/RenderTargetCorruptedException.cs rename to src/Avalonia.Visuals/RenderTargetCorruptedException.cs diff --git a/src/Avalonia.SceneGraph/Rendering/DefaultRenderLoop.cs b/src/Avalonia.Visuals/Rendering/DefaultRenderLoop.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/DefaultRenderLoop.cs rename to src/Avalonia.Visuals/Rendering/DefaultRenderLoop.cs diff --git a/src/Avalonia.SceneGraph/Rendering/IRenderLoop.cs b/src/Avalonia.Visuals/Rendering/IRenderLoop.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/IRenderLoop.cs rename to src/Avalonia.Visuals/Rendering/IRenderLoop.cs diff --git a/src/Avalonia.SceneGraph/Rendering/IRenderRoot.cs b/src/Avalonia.Visuals/Rendering/IRenderRoot.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/IRenderRoot.cs rename to src/Avalonia.Visuals/Rendering/IRenderRoot.cs diff --git a/src/Avalonia.SceneGraph/Rendering/IRenderer.cs b/src/Avalonia.Visuals/Rendering/IRenderer.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/IRenderer.cs rename to src/Avalonia.Visuals/Rendering/IRenderer.cs diff --git a/src/Avalonia.SceneGraph/Rendering/IRendererFactory.cs b/src/Avalonia.Visuals/Rendering/IRendererFactory.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/IRendererFactory.cs rename to src/Avalonia.Visuals/Rendering/IRendererFactory.cs diff --git a/src/Avalonia.SceneGraph/Rendering/Renderer.cs b/src/Avalonia.Visuals/Rendering/Renderer.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/Renderer.cs rename to src/Avalonia.Visuals/Rendering/Renderer.cs diff --git a/src/Avalonia.SceneGraph/Rendering/RendererMixin.cs b/src/Avalonia.Visuals/Rendering/RendererMixin.cs similarity index 100% rename from src/Avalonia.SceneGraph/Rendering/RendererMixin.cs rename to src/Avalonia.Visuals/Rendering/RendererMixin.cs diff --git a/src/Avalonia.SceneGraph/Size.cs b/src/Avalonia.Visuals/Size.cs similarity index 100% rename from src/Avalonia.SceneGraph/Size.cs rename to src/Avalonia.Visuals/Size.cs diff --git a/src/Avalonia.SceneGraph/Thickness.cs b/src/Avalonia.Visuals/Thickness.cs similarity index 100% rename from src/Avalonia.SceneGraph/Thickness.cs rename to src/Avalonia.Visuals/Thickness.cs diff --git a/src/Avalonia.SceneGraph/Vector.cs b/src/Avalonia.Visuals/Vector.cs similarity index 100% rename from src/Avalonia.SceneGraph/Vector.cs rename to src/Avalonia.Visuals/Vector.cs diff --git a/src/Avalonia.SceneGraph/Visual.cs b/src/Avalonia.Visuals/Visual.cs similarity index 100% rename from src/Avalonia.SceneGraph/Visual.cs rename to src/Avalonia.Visuals/Visual.cs diff --git a/src/Avalonia.SceneGraph/VisualExtensions.cs b/src/Avalonia.Visuals/VisualExtensions.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualExtensions.cs rename to src/Avalonia.Visuals/VisualExtensions.cs diff --git a/src/Avalonia.SceneGraph/VisualTree/BoundsTracker.cs b/src/Avalonia.Visuals/VisualTree/BoundsTracker.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTree/BoundsTracker.cs rename to src/Avalonia.Visuals/VisualTree/BoundsTracker.cs diff --git a/src/Avalonia.SceneGraph/VisualTree/IHostedVisualTreeRoot.cs b/src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTree/IHostedVisualTreeRoot.cs rename to src/Avalonia.Visuals/VisualTree/IHostedVisualTreeRoot.cs diff --git a/src/Avalonia.SceneGraph/VisualTree/IVisual.cs b/src/Avalonia.Visuals/VisualTree/IVisual.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTree/IVisual.cs rename to src/Avalonia.Visuals/VisualTree/IVisual.cs diff --git a/src/Avalonia.SceneGraph/VisualTree/IVisualTreeHost.cs b/src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTree/IVisualTreeHost.cs rename to src/Avalonia.Visuals/VisualTree/IVisualTreeHost.cs diff --git a/src/Avalonia.SceneGraph/VisualTree/TransformedBounds.cs b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTree/TransformedBounds.cs rename to src/Avalonia.Visuals/VisualTree/TransformedBounds.cs diff --git a/src/Avalonia.SceneGraph/VisualTree/VisualExtensions.cs b/src/Avalonia.Visuals/VisualTree/VisualExtensions.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTree/VisualExtensions.cs rename to src/Avalonia.Visuals/VisualTree/VisualExtensions.cs diff --git a/src/Avalonia.SceneGraph/VisualTreeAttachmentEventArgs.cs b/src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs similarity index 100% rename from src/Avalonia.SceneGraph/VisualTreeAttachmentEventArgs.cs rename to src/Avalonia.Visuals/VisualTreeAttachmentEventArgs.cs diff --git a/src/Avalonia.SceneGraph/packages.config b/src/Avalonia.Visuals/packages.config similarity index 100% rename from src/Avalonia.SceneGraph/packages.config rename to src/Avalonia.Visuals/packages.config diff --git a/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj b/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj index 16a09821cb..3ecd91eee2 100644 --- a/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj +++ b/src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj @@ -98,9 +98,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj index 7e8c118196..b001c7bc19 100644 --- a/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj +++ b/src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj @@ -79,9 +79,9 @@ {62024B2D-53EB-4638-B26B-85EEAA54866E} Avalonia.Input - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {42472427-4774-4C81-8AFF-9F27B8E31721} diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 2b0d034a5a..00edd205f3 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -308,9 +308,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj index 1c3f453280..5bdbb5a827 100644 --- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj +++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj @@ -103,9 +103,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj b/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj index db2964fdb2..041c8d9ecb 100644 --- a/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj +++ b/src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj @@ -110,9 +110,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj index b3b9a57880..cf352607f0 100644 --- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj +++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj @@ -77,9 +77,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj index f5dd4180eb..d7d865225a 100644 --- a/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj +++ b/src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj @@ -103,9 +103,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.csproj b/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.csproj index 6bfba688f9..9cef634048 100644 --- a/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.csproj +++ b/src/Skia/Avalonia.Skia.iOS.TestApp/Avalonia.Skia.iOS.TestApp.csproj @@ -1,4 +1,4 @@ - + Debug @@ -124,9 +124,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj index 21123fae29..28892c3c01 100644 --- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj +++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj @@ -76,9 +76,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index f11eba2397..6b7e19d3f7 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -109,9 +109,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj index 51ad5ce05e..4b190dc469 100644 --- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj +++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj @@ -113,9 +113,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj index 6385ef3352..cbe17022b1 100644 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj +++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj @@ -72,9 +72,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj index 51f21312c6..9909d7b9f5 100644 --- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj +++ b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj @@ -171,9 +171,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj index ada6b53cda..cb8b32c2cc 100644 --- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj +++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj @@ -1,4 +1,4 @@ - + @@ -98,9 +98,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index b967f68b78..aea972ec42 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -190,9 +190,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj index e0a25ededb..49d7f44102 100644 --- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj +++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj @@ -117,9 +117,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj index 17da11e190..3db0bfa876 100644 --- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj +++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj @@ -1,4 +1,4 @@ - + @@ -90,9 +90,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj index 7e37dceadd..5ed05e9e33 100644 --- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj +++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj @@ -121,9 +121,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj index d68cb184d3..6dfefe1a63 100644 --- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj +++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj @@ -1,4 +1,4 @@ - + @@ -91,9 +91,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj index e70ecb7a5e..d7912d1828 100644 --- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj +++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj @@ -129,9 +129,9 @@ {6417b24e-49c2-4985-8db2-3ab9d898ec91} Avalonia.ReactiveUI - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj index 9aef304beb..b3734255d6 100644 --- a/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj +++ b/tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj @@ -142,9 +142,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index 66d234ac19..e2b11dc1f0 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -149,9 +149,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} 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 54e61fc7d2..4ad740bab0 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj @@ -154,9 +154,9 @@ {6417B24E-49C2-4985-8DB2-3AB9D898EC91} Avalonia.ReactiveUI - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj index a4089d6f4c..bebfdfad51 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj @@ -118,9 +118,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj index b81ff06e87..c615d5a59f 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj @@ -101,9 +101,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj index ee30860df9..c374d8d4e0 100644 --- a/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj +++ b/tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj @@ -111,9 +111,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj index 16d33fa2f1..cf53b4ef9b 100644 --- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj +++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj @@ -138,9 +138,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj index 56b2dc6850..7a84243953 100644 --- a/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj +++ b/tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj @@ -101,9 +101,9 @@ {42472427-4774-4c81-8aff-9f27b8e31721} Avalonia.Layout - + {eb582467-6abb-43a1-b052-e981ba910e3a} - Avalonia.SceneGraph + Avalonia.Visuals {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} diff --git a/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj similarity index 96% rename from tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj rename to tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj index 9d6f861ddf..9e7f739a1c 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.csproj +++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj @@ -7,8 +7,8 @@ {76716382-3159-460E-BDA6-C5715CF606D7} Library Properties - Avalonia.SceneGraph.UnitTests - Avalonia.SceneGraph.UnitTests + Avalonia.Visuals.UnitTests + Avalonia.Visuals.UnitTests v4.5 512 10.0 @@ -27,7 +27,7 @@ DEBUG;TRACE prompt 4 - bin\Debug\Avalonia.SceneGraph.UnitTests.XML + bin\Debug\Avalonia.Visuals.UnitTests.xml CS1591 @@ -119,9 +119,9 @@ {42472427-4774-4C81-8AFF-9F27B8E31721} Avalonia.Layout - + {EB582467-6ABB-43A1-B052-E981BA910E3A} - Avalonia.SceneGraph + Avalonia.Visuals {F1BAA01A-F176-4C6A-B39D-5B40BB1B148F} diff --git a/tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.v2.ncrunchproject b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.v2.ncrunchproject similarity index 100% rename from tests/Avalonia.SceneGraph.UnitTests/Avalonia.SceneGraph.UnitTests.v2.ncrunchproject rename to tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.v2.ncrunchproject diff --git a/tests/Avalonia.SceneGraph.UnitTests/Media/BrushTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs similarity index 97% rename from tests/Avalonia.SceneGraph.UnitTests/Media/BrushTests.cs rename to tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs index 63e1db4fc8..ae88a94073 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/Media/BrushTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/BrushTests.cs @@ -5,7 +5,7 @@ using System; using Avalonia.Media; using Xunit; -namespace Avalonia.SceneGraph.UnitTests.Media +namespace Avalonia.Visuals.UnitTests.Media { public class BrushTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/Media/ColorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs similarity index 97% rename from tests/Avalonia.SceneGraph.UnitTests/Media/ColorTests.cs rename to tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs index 2e93dcb66a..5f0144ffc5 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/Media/ColorTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/ColorTests.cs @@ -5,7 +5,7 @@ using System; using Avalonia.Media; using Xunit; -namespace Avalonia.SceneGraph.UnitTests.Media +namespace Avalonia.Visuals.UnitTests.Media { public class ColorTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/Media/FormattedTextTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/FormattedTextTests.cs similarity index 93% rename from tests/Avalonia.SceneGraph.UnitTests/Media/FormattedTextTests.cs rename to tests/Avalonia.Visuals.UnitTests/Media/FormattedTextTests.cs index d36e23a6d8..648595fa2b 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/Media/FormattedTextTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/FormattedTextTests.cs @@ -2,7 +2,7 @@ using Avalonia.Media; using Xunit; -namespace Avalonia.SceneGraph.UnitTests.Media +namespace Avalonia.Visuals.UnitTests.Media { public class FormattedTextTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs similarity index 98% rename from tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs rename to tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs index da48ea36f0..f0d41680c0 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/Media/PathMarkupParserTests.cs @@ -6,7 +6,7 @@ using Avalonia.Platform; using Moq; using Xunit; -namespace Avalonia.SceneGraph.UnitTests.Media +namespace Avalonia.Visuals.UnitTests.Media { public class PathMarkupParserTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/Properties/AssemblyInfo.cs b/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs similarity index 83% rename from tests/Avalonia.SceneGraph.UnitTests/Properties/AssemblyInfo.cs rename to tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs index 96ee859316..dc29e93ea2 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/Properties/AssemblyInfo.cs +++ b/tests/Avalonia.Visuals.UnitTests/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Reflection; using Xunit; -[assembly: AssemblyTitle("Avalonia.SceneGraph.UnitTests")] +[assembly: AssemblyTitle("Avalonia.Visuals.UnitTests")] // Don't run tests in parallel. [assembly: CollectionBehavior(DisableTestParallelization = true)] \ No newline at end of file diff --git a/tests/Avalonia.SceneGraph.UnitTests/RelativePointTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs similarity index 95% rename from tests/Avalonia.SceneGraph.UnitTests/RelativePointTests.cs rename to tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs index 3dc6e4e04d..f4a21fb6b4 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/RelativePointTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/RelativePointTests.cs @@ -4,7 +4,7 @@ using System.Globalization; using Xunit; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class RelativePointTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/RelativeRectComparer.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs similarity index 95% rename from tests/Avalonia.SceneGraph.UnitTests/RelativeRectComparer.cs rename to tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs index b46f0754cd..9cca2bfc19 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/RelativeRectComparer.cs +++ b/tests/Avalonia.Visuals.UnitTests/RelativeRectComparer.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class RelativeRectComparer : IEqualityComparer { diff --git a/tests/Avalonia.SceneGraph.UnitTests/RelativeRectTests.cs b/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs similarity index 95% rename from tests/Avalonia.SceneGraph.UnitTests/RelativeRectTests.cs rename to tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs index e0c0a0b35a..8ba4f3b739 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/RelativeRectTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/RelativeRectTests.cs @@ -4,7 +4,7 @@ using System.Globalization; using Xunit; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class RelativeRectTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs similarity index 99% rename from tests/Avalonia.SceneGraph.UnitTests/RenderTests_Culling.cs rename to tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs index e002c57dff..caa7011075 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/RenderTests_Culling.cs +++ b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs @@ -7,7 +7,7 @@ using Avalonia.Media; using Avalonia.Rendering; using Xunit; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class RenderTests_Culling { diff --git a/tests/Avalonia.SceneGraph.UnitTests/TestRoot.cs b/tests/Avalonia.Visuals.UnitTests/TestRoot.cs similarity index 95% rename from tests/Avalonia.SceneGraph.UnitTests/TestRoot.cs rename to tests/Avalonia.Visuals.UnitTests/TestRoot.cs index aa5eb64691..bdcbae59ce 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/TestRoot.cs +++ b/tests/Avalonia.Visuals.UnitTests/TestRoot.cs @@ -5,7 +5,7 @@ using System; using Avalonia.Platform; using Avalonia.Rendering; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class TestRoot : TestVisual, IRenderRoot { diff --git a/tests/Avalonia.SceneGraph.UnitTests/TestVisual.cs b/tests/Avalonia.Visuals.UnitTests/TestVisual.cs similarity index 97% rename from tests/Avalonia.SceneGraph.UnitTests/TestVisual.cs rename to tests/Avalonia.Visuals.UnitTests/TestVisual.cs index 4743d3fde4..dfd3d180ba 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/TestVisual.cs +++ b/tests/Avalonia.Visuals.UnitTests/TestVisual.cs @@ -7,7 +7,7 @@ using System.Linq; using Avalonia.Rendering; using Avalonia.VisualTree; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class ParamEventArgs : EventArgs { diff --git a/tests/Avalonia.SceneGraph.UnitTests/ThicknessTests.cs b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs similarity index 96% rename from tests/Avalonia.SceneGraph.UnitTests/ThicknessTests.cs rename to tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs index 97b1ae4b64..bd694d073a 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/ThicknessTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/ThicknessTests.cs @@ -4,7 +4,7 @@ using System.Globalization; using Xunit; -namespace Avalonia.SceneGraph.UnitTests.Media +namespace Avalonia.Visuals.UnitTests.Media { public class ThicknessTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/VisualTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs similarity index 98% rename from tests/Avalonia.SceneGraph.UnitTests/VisualTests.cs rename to tests/Avalonia.Visuals.UnitTests/VisualTests.cs index 6679138e6d..8daaacd051 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/VisualTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs @@ -8,7 +8,7 @@ using Avalonia.Controls; using Avalonia.VisualTree; using Xunit; -namespace Avalonia.SceneGraph.UnitTests +namespace Avalonia.Visuals.UnitTests { public class VisualTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs similarity index 97% rename from tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs rename to tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs index 93b8a088d8..d18a604f31 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/BoundsTrackerTests.cs +++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs @@ -14,7 +14,7 @@ using Avalonia.Media; using Moq; using Avalonia.UnitTests; -namespace Avalonia.SceneGraph.UnitTests.VisualTree +namespace Avalonia.Visuals.UnitTests.VisualTree { public class BoundsTrackerTests { diff --git a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs similarity index 98% rename from tests/Avalonia.SceneGraph.UnitTests/VisualTree/MockRenderInterface.cs rename to tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs index d7c8899f8a..3d6a9093e4 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/MockRenderInterface.cs +++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs @@ -4,7 +4,7 @@ using System.IO; using Avalonia.Media; using Avalonia.Platform; -namespace Avalonia.SceneGraph.UnitTests.VisualTree +namespace Avalonia.Visuals.UnitTests.VisualTree { class MockRenderInterface : IPlatformRenderInterface { diff --git a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs similarity index 99% rename from tests/Avalonia.SceneGraph.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs rename to tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs index 896b6f8237..28ca7cdd41 100644 --- a/tests/Avalonia.SceneGraph.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs +++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs @@ -12,7 +12,7 @@ using Avalonia.VisualTree; using Moq; using Xunit; -namespace Avalonia.SceneGraph.UnitTests.VisualTree +namespace Avalonia.Visuals.UnitTests.VisualTree { public class VisualExtensionsTests_GetVisualsAt { diff --git a/tests/Avalonia.SceneGraph.UnitTests/packages.config b/tests/Avalonia.Visuals.UnitTests/packages.config similarity index 100% rename from tests/Avalonia.SceneGraph.UnitTests/packages.config rename to tests/Avalonia.Visuals.UnitTests/packages.config