Re-work the projects and add the UI and Controls (#97)

- moved existing files - added the UI project - added tests - added WPF sample
mono · Sep 8, 2020 · 00ad92b · 00ad92b
1 parent f662e1d
commit 00ad92b
Show file tree

Hide file tree

Showing 84 changed files with 1,518 additions and 488 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2015-2016 Xamarin, Inc.
-Copyright (c) 2017-2019 Microsoft Corporation.
+Copyright (c) 2017-2020 Microsoft Corporation.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ interesting projects:
 
  - [SkiaSharp][skiasharp] _(the engine)_
  - [SkiaSharp.Extended][extended] _(additional APIs)_
- - [SkiaSharp.Extended.Controls][controls] _(additional Xamarin.Forms controls)_
+ - [SkiaSharp.Extended.UI][controls] _(additional Xamarin.Forms controls)_
 
 **Deprecated / Unmaintained Libraries**
 
@@ -35,6 +35,6 @@ The code in this repository is licensed under the [MIT License][license].
 
 [skiasharp]: https://github.com/mono/SkiaSharp
 [extended]: https://github.com/mono/SkiaSharp.Extended/wiki/SkiaSharp.Extended
-[controls]: https://github.com/mono/SkiaSharp.Extended/wiki/SkiaSharp.Extended.Controls
+[controls]: https://github.com/mono/SkiaSharp.Extended/wiki/SkiaSharp.Extended.UI
 [iconify]: https://github.com/mono/SkiaSharp.Extended/wiki/SkiaSharp.Extended.Iconify
 [svg]: https://github.com/mono/SkiaSharp.Extended/wiki/SkiaSharp.Extended.Svg
diff --git a/SkiaSharp.Extended.macOS.sln b/SkiaSharp.Extended.macOS.sln
diff --git a/SkiaSharp.Extended.sln b/SkiaSharp.Extended.sln
@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Android", "samples\SkiaSharpDemo.Android\SkiaSharpDemo.Android.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
 EndProject
@@ -37,7 +37,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.WeatherIcons", "source\SkiaSharp.Extended.Iconify.WeatherIcons\SkiaSharp.Extended.Iconify.WeatherIcons.csproj", "{4B690A05-D653-4CC5-A34E-CB4A6472729A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconifyGenerator", "source\IconifyGenerator\IconifyGenerator.csproj", "{8E2211C7-EA20-4670-98DB-0489D2127DAB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconifyGenerator", "utils\IconifyGenerator\IconifyGenerator.csproj", "{8E2211C7-EA20-4670-98DB-0489D2127DAB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{E546FFE2-58F6-4F5B-8EDB-15056F9810BA}"
 EndProject
@@ -47,7 +47,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Tests", "tests\SkiaSharp.Extended.Tests\SkiaSharp.Extended.Tests.csproj", "{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprectated", "deprectated", "{7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.UI", "source\SkiaSharp.Extended.UI\SkiaSharp.Extended.UI.csproj", "{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.UI.Tests", "tests\SkiaSharp.Extended.UI.Tests\SkiaSharp.Extended.UI.Tests.csproj", "{33B974F8-1076-4D66-A212-75614C888B26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.UI.WPF", "source\SkiaSharp.Extended.UI.WPF\SkiaSharp.Extended.UI.WPF.csproj", "{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo.WPF", "samples\SkiaSharpDemo.WPF\SkiaSharpDemo.WPF.csproj", "{97749245-E046-4722-947F-F618DE04512D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -177,28 +185,36 @@ Global
 		{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|x64.Build.0 = Release|Any CPU
 		{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|x86.Build.0 = Release|Any CPU
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|Any CPU.Build.0 = Debug|x86
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|Any CPU.Deploy.0 = Debug|x86
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|Any CPU.Build.0 = Debug|x64
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|ARM.ActiveCfg = Debug|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|ARM.Build.0 = Debug|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|ARM.Deploy.0 = Debug|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhone.ActiveCfg = Debug|ARM
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhone.Build.0 = Debug|ARM
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhone.Deploy.0 = Debug|ARM
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhoneSimulator.Build.0 = Debug|x64
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|x64.ActiveCfg = Debug|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|x64.Build.0 = Debug|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|x64.Deploy.0 = Debug|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|x86.ActiveCfg = Debug|x86
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|x86.Build.0 = Debug|x86
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Debug|x86.Deploy.0 = Debug|x86
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|Any CPU.ActiveCfg = Release|x86
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|Any CPU.Build.0 = Release|x86
-		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|Any CPU.Deploy.0 = Release|x86
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|Any CPU.ActiveCfg = Release|x64
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|Any CPU.Build.0 = Release|x64
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|Any CPU.Deploy.0 = Release|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|ARM.ActiveCfg = Release|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|ARM.Build.0 = Release|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|ARM.Deploy.0 = Release|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|iPhone.ActiveCfg = Release|ARM
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|iPhone.Build.0 = Release|ARM
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|iPhone.Deploy.0 = Release|ARM
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|iPhoneSimulator.Build.0 = Release|x86
+		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|iPhoneSimulator.Deploy.0 = Release|x86
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x64.ActiveCfg = Release|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x64.Build.0 = Release|x64
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x64.Deploy.0 = Release|x64
@@ -541,6 +557,102 @@ Global
 		{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5}.Release|x64.Build.0 = Release|Any CPU
 		{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5}.Release|x86.ActiveCfg = Release|Any CPU
 		{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5}.Release|x86.Build.0 = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|ARM.Build.0 = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|iPhone.Build.0 = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|x64.Build.0 = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFCC1DB4-0405-4DA7-BCEE-D78F524A1F05}.Release|x86.Build.0 = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|ARM.Build.0 = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|x64.Build.0 = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Debug|x86.Build.0 = Debug|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|ARM.ActiveCfg = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|ARM.Build.0 = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|iPhone.Build.0 = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|x64.ActiveCfg = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|x64.Build.0 = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|x86.ActiveCfg = Release|Any CPU
+		{33B974F8-1076-4D66-A212-75614C888B26}.Release|x86.Build.0 = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|x64.Build.0 = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Debug|x86.Build.0 = Debug|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|ARM.Build.0 = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|iPhone.Build.0 = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|x64.ActiveCfg = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|x64.Build.0 = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|x86.ActiveCfg = Release|Any CPU
+		{4006BF0F-2CDA-4E1B-8ADE-FF7B3D91ABE1}.Release|x86.Build.0 = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|x64.Build.0 = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Debug|x86.Build.0 = Debug|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|ARM.Build.0 = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|iPhone.Build.0 = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|x64.ActiveCfg = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|x64.Build.0 = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|x86.ActiveCfg = Release|Any CPU
+		{97749245-E046-4722-947F-F618DE04512D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -564,6 +676,8 @@ Global
 		{8E2211C7-EA20-4670-98DB-0489D2127DAB} = {E546FFE2-58F6-4F5B-8EDB-15056F9810BA}
 		{4EDBF443-6305-48DA-90E7-9943E6E97B03} = {5555F827-12DF-4D15-BF07-3A720FC2EF3F}
 		{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5} = {5555F827-12DF-4D15-BF07-3A720FC2EF3F}
+		{33B974F8-1076-4D66-A212-75614C888B26} = {5555F827-12DF-4D15-BF07-3A720FC2EF3F}
+		{97749245-E046-4722-947F-F618DE04512D} = {51B0C2C7-732B-4A5C-A4F2-55655D147866}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {08D78153-5DD7-4C52-A348-46AA448B2CFC}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -45,12 +45,22 @@ jobs:
           Write-Host "Build label: $label"
           Write-Host "##vso[build.updatebuildnumber]$label"
         displayName: Update the build number with a more readable one
+
   - template: .ci/build.yml@components
     parameters:
       areaPath: 'DevDiv\Xamarin SDK\SkiaSharp'
       linuxImage: 'ubuntu-latest'
+      publishJob: 'windows'
       validPackagePrefixes:
         - SkiaSharp
+      preBuildSteps:
+        - bash: |
+            cd /opt/hostedtoolcache/dotnet/sdk/3.1.302/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets && \
+              mv Microsoft.WinFx.props Microsoft.WinFX.props && \
+              mv Microsoft.WinFx.targets Microsoft.WinFX.targets
+          condition: eq(variables['System.JobName'], 'linux')
+          displayName: Fix the casing bug for files in .NET Core SDK on Linux
+
   - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
     - template: sign-artifacts/jobs/v1.yml@internal-templates
       parameters:

diff --git a/build.cake b/build.cake
@@ -13,16 +13,23 @@ Task("libs")
 		.EnableBinaryLogger("./output/binlogs/libs.binlog")
 		.SetConfiguration("Release")
 		.WithRestore();
-	if (!IsRunningOnWindows())
-		settings = settings.WithProperty("Platform", "iPhone");
-	MSBuild("./SkiaSharp.Extended.sln", settings);
+
+	var sln = IsRunningOnWindows()
+		? "./SkiaSharp.Extended.sln"
+		: "./SkiaSharp.Extended.macOS.sln";
+
+	MSBuild(sln, settings);
 });
 
 Task("nugets")
 	.IsDependentOn("libs")
 	.Does(() =>
 {
-	MSBuild("./source/source.sln", new MSBuildSettings()
+	var sln = IsRunningOnWindows()
+		? "./source/Source.sln"
+		: "./source/Source.macOS.sln";
+
+	MSBuild(sln, new MSBuildSettings()
 		.EnableBinaryLogger("./output/binlogs/nugets.binlog")
 		.SetConfiguration("Release")
 		.WithRestore()
@@ -34,7 +41,7 @@ Task("nugets")
 		preview += $".{BUILD_NUMBER}";
 	}
 
-	MSBuild("./source/source.sln", new MSBuildSettings()
+	MSBuild(sln, new MSBuildSettings()
 		.EnableBinaryLogger("./output/binlogs/nugets-preview.binlog")
 		.SetConfiguration("Release")
 		.WithRestore()
@@ -69,17 +76,20 @@ Task("tests")
 });
 
 Task("samples")
-	.IsDependentOn("nugets")
 	.WithCriteria(Context.Environment.Platform.Family != PlatformFamily.Linux)
+	.IsDependentOn("nugets")
 	.Does(() =>
 {
 	var settings = new MSBuildSettings()
 		.EnableBinaryLogger("./output/binlogs/samples.binlog")
 		.SetConfiguration("Release")
 		.WithRestore();
-	if (!IsRunningOnWindows())
-		settings = settings.WithProperty("Platform", "iPhone");
-	MSBuild("./SkiaSharp.Extended.sln", settings);
+
+	var sln = IsRunningOnWindows()
+		? "./SkiaSharp.Extended.sln"
+		: "./SkiaSharp.Extended.macOS.sln";
+
+	MSBuild(sln, settings);
 });
 
 Task("ci")

diff --git a/samples/SkiaSharpDemo.Droid/MainActivity.cs → ...les/SkiaSharpDemo.Android/MainActivity.cs b/samples/SkiaSharpDemo.Droid/MainActivity.cs → ...les/SkiaSharpDemo.Android/MainActivity.cs
@@ -3,7 +3,7 @@
 using Android.OS;
 using Xamarin.Forms.Platform.Android;
 
-namespace SkiaSharpDemo.Droid
+namespace SkiaSharpDemo.Android
 {
 	[Activity(
 		Label = "SkiaSharpDemo",
@@ -20,8 +20,16 @@ protected override void OnCreate(Bundle bundle)
 
 			base.OnCreate(bundle);
 
+			Xamarin.Essentials.Platform.Init(this, bundle);
 			Xamarin.Forms.Forms.Init(this, bundle);
 			LoadApplication(new App());
 		}
+
+		public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
+		{
+			Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+
+			base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+		}
 	}
 }