diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index be9f7f6ef8..ed4900a402 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -120,6 +120,10 @@ {d2221c82-4a25-4583-9b43-d791e3f6820c} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062ae20-5dcc-4442-9645-8195bdece63e} Perspex.Diagnostics diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 1dc0a1e7c3..0afab93b30 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -154,6 +154,10 @@ {d2221c82-4a25-4583-9b43-d791e3f6820c} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062ae20-5dcc-4442-9645-8195bdece63e} Perspex.Diagnostics diff --git a/samples/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj index 11d9ad9939..d8159c2649 100644 --- a/samples/TestApplication/TestApplication.csproj +++ b/samples/TestApplication/TestApplication.csproj @@ -106,6 +106,10 @@ {D2221C82-4A25-4583-9B43-D791E3F6820C} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062AE20-5DCC-4442-9645-8195BDECE63E} Perspex.Diagnostics diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj index e40b734d3c..be4aa1671a 100644 --- a/samples/XamlTestApplication/XamlTestApplication.csproj +++ b/samples/XamlTestApplication/XamlTestApplication.csproj @@ -103,6 +103,10 @@ {D2221C82-4A25-4583-9B43-D791E3F6820C} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062AE20-5DCC-4442-9645-8195BDECE63E} Perspex.Diagnostics diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj index 1e30c29730..6d15fea543 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj +++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj @@ -77,6 +77,10 @@ {d2221c82-4a25-4583-9b43-d791e3f6820c} Perspex.Controls + + {799a7bb5-3c2c-48b6-85a7-406a12c420da} + Perspex.DesignerSupport + {7062ae20-5dcc-4442-9645-8195bdece63e} Perspex.Diagnostics diff --git a/src/Perspex.Controls/Properties/AssemblyInfo.cs b/src/Perspex.Controls/Properties/AssemblyInfo.cs index 5126ed362a..fa4f1c7d9a 100644 --- a/src/Perspex.Controls/Properties/AssemblyInfo.cs +++ b/src/Perspex.Controls/Properties/AssemblyInfo.cs @@ -9,6 +9,7 @@ using Perspex.Metadata; [assembly: InternalsVisibleTo("Perspex.Controls.UnitTests")] [assembly: InternalsVisibleTo("Perspex.DesignerSupport")] +[assembly: XmlnsDefinition("https://github.com/perspex", "Perspex")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls.Presenters")] [assembly: XmlnsDefinition("https://github.com/perspex", "Perspex.Controls.Primitives")] diff --git a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj index 614b0210bb..36cb4b0e0b 100644 --- a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj +++ b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off True - v6.0 + v5.0 Properties\AndroidManifest.xml diff --git a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak index 36cb4b0e0b..614b0210bb 100644 --- a/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak +++ b/src/Skia/Perspex.Skia.Android.TestApp/Perspex.Skia.Android.TestApp.csproj.bak @@ -16,7 +16,7 @@ Resources\Resource.Designer.cs Off True - v5.0 + v6.0 Properties\AndroidManifest.xml diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj index 2916c4059e..2160eb2592 100644 --- a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj @@ -15,7 +15,7 @@ Resources\Resource.Designer.cs Off True - v6.0 + v5.0 true diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak new file mode 100644 index 0000000000..2916c4059e --- /dev/null +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj.bak @@ -0,0 +1,108 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {BD43F7C0-396B-4AA1-BAD9-DFDE54D51298} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + Perspex.Skia.Android + Perspex.Skia.Android + 512 + Resources\Resource.Designer.cs + Off + True + v6.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + + + + + + + + + + + + + {d211e587-d8bc-45b9-95a4-f297c8fa5200} + Perspex.Animation + + + {b09b78d8-9b26-48b0-9149-d64a2f120f3f} + Perspex.Base + + + {d2221c82-4a25-4583-9b43-d791e3f6820c} + Perspex.Controls + + + {62024b2d-53eb-4638-b26b-85eeaa54866e} + Perspex.Input + + + {6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b} + Perspex.Interactivity + + + {42472427-4774-4c81-8aff-9f27b8e31721} + Perspex.Layout + + + {eb582467-6abb-43a1-b052-e981ba910e3a} + Perspex.SceneGraph + + + {f1baa01a-f176-4c6a-b39d-5b40bb1b148f} + Perspex.Styling + + + + + + + + + + + native\armeabi-v7a\libperspesk.so + + + native\x86\libperspesk.so + + + + + + + \ No newline at end of file