From 6c63e3f72374f369012fc5161a53c6d73a863b65 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sun, 4 Mar 2018 22:03:03 +0200 Subject: [PATCH] Modernizing the build system (#30) This is a major overhaul of the build, projects and infrastructure, but, not to any actual code. - Using multi-targeting for: - PCL (backwards compatibility for the time being) - .NET Standard 1.3 - .NET Standard 2.0 - No more .nuspec files, the .csproj does this with the `Pack` target - No more AssemblyInfo.cs files, the .csproj has all this info - No longer the build system, but rather a single solution for each library with the code, tests and samples - No more shared projects - Using Xunit instead on NUnit as this has better cross-platform support - A single PowerShell script will build the entire repository --- .gitignore | 2 - README.md | 30 +- Signing.targets | 21 + .../SkiaSharp.Extended.Iconify.sln | 442 ++++++++++++++++++ SkiaSharp.Extended.Iconify/build.cake | 200 -------- ...aSharp.Extended.Iconify.FontAwesome.nuspec | 26 -- ...SkiaSharp.Extended.Iconify.IonIcons.nuspec | 26 -- ...xtended.Iconify.MaterialDesignIcons.nuspec | 26 -- ...harp.Extended.Iconify.MaterialIcons.nuspec | 26 -- ...kiaSharp.Extended.Iconify.Meteocons.nuspec | 26 -- ...rp.Extended.Iconify.SimpleLineIcons.nuspec | 26 -- ...SkiaSharp.Extended.Iconify.Typicons.nuspec | 26 -- ...Sharp.Extended.Iconify.WeatherIcons.nuspec | 26 -- .../nuget/SkiaSharp.Extended.Iconify.nuspec | 25 - .../samples/SkiaSharpDemo.sln | 402 ---------------- .../SkiaSharpDemo.UWP/Package.appxmanifest | 39 +- .../SkiaSharpDemo.UWP.csproj | 5 +- .../SkiaSharpDemo/SkiaSharpDemo.csproj | 1 - .../source/IconifyDownloader.targets | 338 ++++++++++++++ .../source/IconifyGenerator.sln | 17 - .../IconifyGenerator/IconifyGenerator.csproj | 36 +- .../Properties/AssemblyInfo.cs | 26 -- .../Properties/AssemblyInfo.cs | 27 -- ...aSharp.Extended.Iconify.FontAwesome.csproj | 87 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...SkiaSharp.Extended.Iconify.IonIcons.csproj | 87 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...xtended.Iconify.MaterialDesignIcons.csproj | 87 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...harp.Extended.Iconify.MaterialIcons.csproj | 88 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...kiaSharp.Extended.Iconify.Meteocons.csproj | 81 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...rp.Extended.Iconify.SimpleLineIcons.csproj | 87 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...SkiaSharp.Extended.Iconify.Typicons.csproj | 87 ++-- .../Properties/AssemblyInfo.cs | 27 -- ...Sharp.Extended.Iconify.WeatherIcons.csproj | 88 ++-- .../source/SkiaSharp.Extended.Iconify.sln | 69 --- .../Properties/AssemblyInfo.cs | 27 -- .../SkiaSharp.Extended.Iconify.csproj | 65 ++- SkiaSharp.Extended.Iconify/source/source.sln | 75 --- .../SkiaSharp.Extended.Svg.sln | 155 +++--- SkiaSharp.Extended.Svg/build.cake | 73 --- .../nuget/SkiaSharp.Extended.Svg.nuspec | 23 - .../SkiaSharpDemo.Droid.csproj | 5 +- .../SkiaSharpDemo.UWP/Package.appxmanifest | 39 +- .../SkiaSharpDemo.UWP.csproj | 10 +- .../SkiaSharpDemo.iOS.csproj | 5 +- .../SkiaSharpDemo.macOS.csproj | 5 +- .../SkiaSharpDemo/SkiaSharpDemo.csproj | 3 +- .../Properties/AssemblyInfo.cs | 1 - .../SkiaSharp.Extended.Svg.NetStandard.csproj | 29 -- .../Properties/SkiaSharpSvgAssemblyInfo.cs | 28 -- .../SkiaSharp.Extended.Svg.Shared.projitems | 25 - .../SkiaSharp.Extended.Svg.Shared.shproj | 13 - .../source/SkiaSharp.Extended.Svg.csproj | 56 +++ .../source/SkiaSharp.Extended.Svg.sln | 32 -- .../Properties/AssemblyInfo.cs | 1 - .../SkiaSharp.Extended.Svg.csproj | 53 --- .../tests/SkiaSharp.Extended.Svg.Tests.csproj | 34 ++ .../tests/SkiaSharp.Extended.Svg.Tests.sln | 36 -- .../Properties/AssemblyInfo.cs | 36 -- .../SkiaSharp.Extended.Svg.Tests/SKSvgTest.cs | 138 +++--- .../SkiaSharp.Extended.Svg.Tests/SKTest.cs | 6 +- .../SkiaSharp.Extended.Svg.Tests.csproj | 72 --- .../SkiaSharp.Extended.sln | 154 +++--- SkiaSharp.Extended/build.cake | 73 --- .../nuget/SkiaSharp.Extended.nuspec | 23 - .../SkiaSharpDemo.UWP/Package.appxmanifest | 39 +- .../SkiaSharpDemo.UWP.csproj | 5 +- .../SkiaSharpDemo/SkiaSharpDemo.csproj | 2 +- .../Properties/AssemblyInfo.cs | 1 - .../SkiaSharp.Extended.NetStandard.csproj | 29 -- .../SkiaSharpExtendedAssemblyInfo.cs | 28 -- .../SkiaSharp.Extended.Shared.projitems | 17 - .../SkiaSharp.Extended.Shared.shproj | 13 - .../source/SkiaSharp.Extended.csproj | 56 +++ .../source/SkiaSharp.Extended.sln | 36 -- .../Properties/AssemblyInfo.cs | 1 - .../SkiaSharp.Extended.csproj | 53 --- .../tests/SkiaSharp.Extended.Tests.csproj | 29 ++ .../tests/SkiaSharp.Extended.Tests.sln | 34 -- .../Properties/AssemblyInfo.cs | 36 -- .../SKGeometryTest.cs | 36 +- .../SkiaSharp.Extended.Tests.csproj | 63 --- build.cake | 282 ----------- build.ps1 | 281 +++-------- build.sh | 140 ------ cake.packages.config | 4 - common.cake | 115 ----- keys/UWP_App_Key.pfx | Bin 0 -> 2520 bytes manifest.yaml | 16 - publish.cake | 101 ---- 94 files changed, 1886 insertions(+), 3595 deletions(-) create mode 100644 Signing.targets create mode 100644 SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln delete mode 100644 SkiaSharp.Extended.Iconify/build.cake delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.FontAwesome.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.IonIcons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialDesignIcons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialIcons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Meteocons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.SimpleLineIcons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Typicons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.WeatherIcons.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.nuspec delete mode 100644 SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.sln create mode 100644 SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets delete mode 100644 SkiaSharp.Extended.Iconify/source/IconifyGenerator.sln delete mode 100644 SkiaSharp.Extended.Iconify/source/IconifyGenerator/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.sln delete mode 100644 SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Iconify/source/source.sln rename SkiaSharp.Extended/samples/SkiaSharpDemo.sln => SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln (61%) delete mode 100644 SkiaSharp.Extended.Svg/build.cake delete mode 100644 SkiaSharp.Extended.Svg/nuget/SkiaSharp.Extended.Svg.nuspec delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/SkiaSharp.Extended.Svg.NetStandard.csproj delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/Properties/SkiaSharpSvgAssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.projitems delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.shproj create mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.csproj delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.sln delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj create mode 100644 SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj delete mode 100644 SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.sln delete mode 100644 SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SkiaSharp.Extended.Svg.Tests.csproj rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.sln => SkiaSharp.Extended/SkiaSharp.Extended.sln (61%) delete mode 100644 SkiaSharp.Extended/build.cake delete mode 100644 SkiaSharp.Extended/nuget/SkiaSharp.Extended.nuspec delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/SkiaSharp.Extended.NetStandard.csproj delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/Properties/SkiaSharpExtendedAssemblyInfo.cs delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.projitems delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.shproj create mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.csproj delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended.sln delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj create mode 100644 SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj delete mode 100644 SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.sln delete mode 100644 SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/Properties/AssemblyInfo.cs delete mode 100644 SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj delete mode 100644 build.cake delete mode 100755 build.sh delete mode 100644 cake.packages.config delete mode 100644 common.cake create mode 100644 keys/UWP_App_Key.pfx delete mode 100644 manifest.yaml delete mode 100644 publish.cake diff --git a/.gitignore b/.gitignore index 7e8a9ee..d53c7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,6 @@ # Repository-specific files output/ -externals/ -tools/ # User-specific files *.suo diff --git a/README.md b/README.md index 90e9e1d..8aa217b 100644 --- a/README.md +++ b/README.md @@ -13,28 +13,19 @@ interesting projects: ## Building -The root just contains a build script that will build all the other -scripts. To build everything, just run the command-line: +Each sub-directory has a solution file that can be opened in Visual Studio or +built by MSBuild. All stripting and tasks are performed by MSBuild, so no +external tooling is needed. -Mac/Linux: +There is a single PowerShell script that can be used to build the entire +repository: - $ ./build.sh -t build --force=true + > .\build.ps1 -Windows: +The CI server just runs that single file and outputs all the packages, +assemblies and test results. - > .\build.ps1 -Target build --Force='true' - -If only a specific project, or a set of projects, are to be built, -then pass a value to the `names` argument: - - -Mac/Linux: - - $ ./build.sh -t build --force=true -names=SkiaSharp.Extended.Iconify - -Windows: - - > .\build.ps1 -Target build --Force='true' -Names='SkiaSharp.Extended.Iconify' +_NOTE: for macOS, you may need to [first install PowerShell][pwsh]._ ## License @@ -46,4 +37,5 @@ 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/tree/master/SkiaSharp.Extended [iconify]: https://github.com/mono/SkiaSharp.Extended/tree/master/SkiaSharp.Extended.Iconify -[svg]: https://github.com/mono/SkiaSharp.Extended/tree/master/SkiaSharp.Extended.Svg \ No newline at end of file +[svg]: https://github.com/mono/SkiaSharp.Extended/tree/master/SkiaSharp.Extended.Svg +[pwsh]: https://github.com/PowerShell/PowerShell diff --git a/Signing.targets b/Signing.targets new file mode 100644 index 0000000..5fa0b65 --- /dev/null +++ b/Signing.targets @@ -0,0 +1,21 @@ + + + + + true + Open.snk + $(MSBuildThisFileDirectory)keys\$(KeyFileName) + + + + + + + + diff --git a/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln b/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln new file mode 100644 index 0000000..40ac6ce --- /dev/null +++ b/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln @@ -0,0 +1,442 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2036 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify", "source\SkiaSharp.Extended.Iconify\SkiaSharp.Extended.Iconify.csproj", "{C020BBFB-1814-43A5-8814-042FDE8F1F0A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.FontAwesome", "source\SkiaSharp.Extended.Iconify.FontAwesome\SkiaSharp.Extended.Iconify.FontAwesome.csproj", "{F41B555A-BFA6-4722-AFB0-990BF46C6B41}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.IonIcons", "source\SkiaSharp.Extended.Iconify.IonIcons\SkiaSharp.Extended.Iconify.IonIcons.csproj", "{55608075-0BF3-4CEC-A316-AFEAF7B994AE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialDesignIcons", "source\SkiaSharp.Extended.Iconify.MaterialDesignIcons\SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj", "{A4DCD57C-5660-4D12-9F0F-7918246790FF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialIcons", "source\SkiaSharp.Extended.Iconify.MaterialIcons\SkiaSharp.Extended.Iconify.MaterialIcons.csproj", "{3373459E-E23E-41CD-9C1E-46ACE8B850DD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.SimpleLineIcons", "source\SkiaSharp.Extended.Iconify.SimpleLineIcons\SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj", "{E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Typicons", "source\SkiaSharp.Extended.Iconify.Typicons\SkiaSharp.Extended.Iconify.Typicons.csproj", "{50DBE8DE-B04D-485A-9104-438709130392}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.WeatherIcons", "source\SkiaSharp.Extended.Iconify.WeatherIcons\SkiaSharp.Extended.Iconify.WeatherIcons.csproj", "{FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Meteocons", "source\SkiaSharp.Extended.Iconify.Meteocons\SkiaSharp.Extended.Iconify.Meteocons.csproj", "{42D414B5-A510-4545-A546-23786CF2442F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconifyGenerator", "source\IconifyGenerator\IconifyGenerator.csproj", "{42DF7988-F443-47F6-B374-75DCAF51D8BE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FA22FC8D-C653-44B6-BA8E-0BBA7CFCA8C9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{6F5C7A8D-8B31-40FE-A48B-7441810658AE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|ARM.Build.0 = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|iPhone.Build.0 = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|x64.ActiveCfg = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|x64.Build.0 = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|x86.ActiveCfg = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Debug|x86.Build.0 = Debug|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|Any CPU.Build.0 = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|ARM.ActiveCfg = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|ARM.Build.0 = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|iPhone.ActiveCfg = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|iPhone.Build.0 = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|x64.ActiveCfg = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|x64.Build.0 = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|x86.ActiveCfg = Release|Any CPU + {C020BBFB-1814-43A5-8814-042FDE8F1F0A}.Release|x86.Build.0 = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|ARM.Build.0 = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|iPhone.Build.0 = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|x64.ActiveCfg = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|x64.Build.0 = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|x86.ActiveCfg = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Debug|x86.Build.0 = Debug|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|Any CPU.Build.0 = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|ARM.ActiveCfg = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|ARM.Build.0 = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|iPhone.ActiveCfg = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|iPhone.Build.0 = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|x64.ActiveCfg = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|x64.Build.0 = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|x86.ActiveCfg = Release|Any CPU + {F41B555A-BFA6-4722-AFB0-990BF46C6B41}.Release|x86.Build.0 = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|ARM.Build.0 = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|iPhone.Build.0 = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|x64.ActiveCfg = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|x64.Build.0 = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|x86.ActiveCfg = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Debug|x86.Build.0 = Debug|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|Any CPU.Build.0 = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|ARM.ActiveCfg = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|ARM.Build.0 = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|iPhone.ActiveCfg = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|iPhone.Build.0 = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|x64.ActiveCfg = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|x64.Build.0 = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|x86.ActiveCfg = Release|Any CPU + {55608075-0BF3-4CEC-A316-AFEAF7B994AE}.Release|x86.Build.0 = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|ARM.Build.0 = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|iPhone.Build.0 = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|x64.ActiveCfg = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|x64.Build.0 = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|x86.ActiveCfg = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Debug|x86.Build.0 = Debug|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|Any CPU.Build.0 = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|ARM.ActiveCfg = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|ARM.Build.0 = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|iPhone.ActiveCfg = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|iPhone.Build.0 = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|x64.ActiveCfg = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|x64.Build.0 = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|x86.ActiveCfg = Release|Any CPU + {A4DCD57C-5660-4D12-9F0F-7918246790FF}.Release|x86.Build.0 = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|ARM.Build.0 = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|iPhone.Build.0 = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|x64.ActiveCfg = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|x64.Build.0 = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|x86.ActiveCfg = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Debug|x86.Build.0 = Debug|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|Any CPU.Build.0 = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|ARM.ActiveCfg = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|ARM.Build.0 = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|iPhone.ActiveCfg = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|iPhone.Build.0 = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|x64.ActiveCfg = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|x64.Build.0 = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|x86.ActiveCfg = Release|Any CPU + {3373459E-E23E-41CD-9C1E-46ACE8B850DD}.Release|x86.Build.0 = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|ARM.Build.0 = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|iPhone.Build.0 = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|x64.ActiveCfg = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|x64.Build.0 = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|x86.ActiveCfg = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Debug|x86.Build.0 = Debug|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|Any CPU.Build.0 = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|ARM.ActiveCfg = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|ARM.Build.0 = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|iPhone.ActiveCfg = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|iPhone.Build.0 = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|x64.ActiveCfg = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|x64.Build.0 = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|x86.ActiveCfg = Release|Any CPU + {E434CB95-5B1C-4EE5-B5D8-0F540EBC5B91}.Release|x86.Build.0 = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|ARM.ActiveCfg = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|ARM.Build.0 = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|iPhone.Build.0 = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|x64.ActiveCfg = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|x64.Build.0 = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|x86.ActiveCfg = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Debug|x86.Build.0 = Debug|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|Any CPU.Build.0 = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|ARM.ActiveCfg = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|ARM.Build.0 = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|iPhone.ActiveCfg = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|iPhone.Build.0 = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|x64.ActiveCfg = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|x64.Build.0 = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|x86.ActiveCfg = Release|Any CPU + {50DBE8DE-B04D-485A-9104-438709130392}.Release|x86.Build.0 = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|ARM.Build.0 = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|iPhone.Build.0 = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|x64.ActiveCfg = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|x64.Build.0 = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|x86.ActiveCfg = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Debug|x86.Build.0 = Debug|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|Any CPU.Build.0 = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|ARM.ActiveCfg = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|ARM.Build.0 = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|iPhone.ActiveCfg = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|iPhone.Build.0 = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|x64.ActiveCfg = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|x64.Build.0 = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|x86.ActiveCfg = Release|Any CPU + {FA862A2C-C173-4AFA-BBA8-9A70D1FF2EB3}.Release|x86.Build.0 = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|ARM.Build.0 = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|iPhone.Build.0 = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|x64.ActiveCfg = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|x64.Build.0 = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|x86.ActiveCfg = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Debug|x86.Build.0 = Debug|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|Any CPU.Build.0 = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|ARM.ActiveCfg = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|ARM.Build.0 = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|iPhone.ActiveCfg = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|iPhone.Build.0 = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|x64.ActiveCfg = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|x64.Build.0 = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|x86.ActiveCfg = Release|Any CPU + {42D414B5-A510-4545-A546-23786CF2442F}.Release|x86.Build.0 = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|ARM.Build.0 = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|iPhone.Build.0 = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|x64.ActiveCfg = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|x64.Build.0 = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Debug|x86.Build.0 = Debug|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|Any CPU.Build.0 = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|ARM.ActiveCfg = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|ARM.Build.0 = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|iPhone.ActiveCfg = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|iPhone.Build.0 = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|x64.ActiveCfg = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|x64.Build.0 = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|x86.ActiveCfg = Release|Any CPU + {42DF7988-F443-47F6-B374-75DCAF51D8BE}.Release|x86.Build.0 = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|ARM.Build.0 = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|iPhone.Build.0 = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|x64.ActiveCfg = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|x64.Build.0 = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|x86.ActiveCfg = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Debug|x86.Build.0 = Debug|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|Any CPU.Build.0 = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|ARM.ActiveCfg = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|ARM.Build.0 = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|iPhone.ActiveCfg = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|iPhone.Build.0 = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|x64.ActiveCfg = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|x64.Build.0 = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|x86.ActiveCfg = Release|Any CPU + {6F5C7A8D-8B31-40FE-A48B-7441810658AE}.Release|x86.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|ARM.Build.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|ARM.Deploy.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhone.Build.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x64.ActiveCfg = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x64.Build.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x64.Deploy.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x86.ActiveCfg = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x86.Build.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x86.Deploy.0 = Debug|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|Any CPU.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|Any CPU.Deploy.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|ARM.ActiveCfg = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|ARM.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|ARM.Deploy.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhone.ActiveCfg = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhone.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhone.Deploy.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x64.ActiveCfg = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x64.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x64.Deploy.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x86.ActiveCfg = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x86.Build.0 = Release|Any CPU + {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x86.Deploy.0 = Release|Any CPU + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|ARM.ActiveCfg = Debug|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|ARM.Build.0 = Debug|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhone.ActiveCfg = Debug|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhone.Build.0 = Debug|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x64.Build.0 = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x86.Build.0 = Debug|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|Any CPU.Build.0 = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|ARM.ActiveCfg = Release|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|ARM.Build.0 = Release|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhone.ActiveCfg = Release|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhone.Build.0 = Release|iPhone + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x64.ActiveCfg = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x64.Build.0 = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x86.ActiveCfg = Release|iPhoneSimulator + {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x86.Build.0 = Release|iPhoneSimulator + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|ARM.Build.0 = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhone.Build.0 = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x64.ActiveCfg = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x64.Build.0 = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x86.ActiveCfg = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x86.Build.0 = Debug|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|Any CPU.Build.0 = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|ARM.ActiveCfg = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|ARM.Build.0 = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhone.ActiveCfg = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhone.Build.0 = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|x64.ActiveCfg = Release|Any CPU + {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|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|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|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|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 + {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.ActiveCfg = Release|x86 + {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Build.0 = Release|x86 + {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA} = {FA22FC8D-C653-44B6-BA8E-0BBA7CFCA8C9} + {6F5C7A8D-8B31-40FE-A48B-7441810658AE} = {C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA} + {9B960D09-426D-4D5A-90AC-8971D255E48F} = {C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA} + {C9938859-CB05-4AAD-909A-8118F3D6B47A} = {C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA} + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C} = {C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA} + {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8} = {C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5D97663F-1712-4C13-89BE-6C4CCBDEA9CE} + EndGlobalSection +EndGlobal diff --git a/SkiaSharp.Extended.Iconify/build.cake b/SkiaSharp.Extended.Iconify/build.cake deleted file mode 100644 index 45c65ba..0000000 --- a/SkiaSharp.Extended.Iconify/build.cake +++ /dev/null @@ -1,200 +0,0 @@ -#load "../common.cake" - -var target = Argument("target", "Default"); -var configuration = Argument("configuration", "Release"); -var verbosity = Argument("verbosity", "Verbose"); - -var directories = GetDirectories("./source/SkiaSharp.Extended.Iconify*"); -var assemblies = directories.Select(dir => dir.Combine("bin/" + configuration).CombineWithFilePath(dir.GetDirectoryName() + ".dll")); - -var buildSpec = new BuildSpec { - Libs = new ISolutionBuilder [] { - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, - SolutionPath = "./source/SkiaSharp.Extended.Iconify.sln", - Configuration = configuration, - OutputFiles = assemblies.Select(ass => new OutputFileCopy { FromFile = ass, ToDirectory = "./output/portable" }).ToArray(), - PostBuildAction = () => { foreach (var ass in assemblies) SignAssembly(ass, "../keys/Open.snk"); }, - }, - }, - - Samples = new ISolutionBuilder [] { - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Windows, - SolutionPath = "./samples/SkiaSharpDemo.sln" - }, - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Mac, - Platform = "iPhone", - SolutionPath = "./samples/SkiaSharpDemo.sln" - }, - }, - - NuGets = GetFiles("./nuget/*.nuspec") - .Select(nuspec => new NuGetInfo { NuSpec = nuspec }) - .ToArray(), -}; - -Task("externals-download") - .Does(() => -{ - var FontAwesomeVersion = "4.7.0"; - var FontAwesomeStyleUrl = string.Format("https://raw.githubusercontent.com/FortAwesome/Font-Awesome/v{0}/css/font-awesome.min.css", FontAwesomeVersion); - var FontAwesomeFontUrl = string.Format("https://raw.githubusercontent.com/FortAwesome/Font-Awesome/v{0}/fonts/fontawesome-webfont.ttf", FontAwesomeVersion); - - // var EntypoUrl = "https://dl.dropboxusercontent.com/u/4339492/entypo.zip"; - - var IonIconsVersion = "2.0.1"; - var IonIconsStyleUrl = string.Format("https://raw.githubusercontent.com/ionic-team/ionicons/v{0}/css/ionicons.min.css", IonIconsVersion); - var IonIconsFontUrl = string.Format("https://raw.githubusercontent.com/ionic-team/ionicons/v{0}/fonts/ionicons.ttf", IonIconsVersion); - - var MaterialDesignIconsVersion = "1.9.32"; - var MaterialDesignIconsStyleUrl = string.Format("http://cdn.materialdesignicons.com/{0}/css/materialdesignicons.min.css", MaterialDesignIconsVersion); - var MaterialDesignIconsFontUrl = string.Format("http://cdn.materialdesignicons.com/{0}/fonts/materialdesignicons-webfont.ttf", MaterialDesignIconsVersion); - - var MaterialIconsVersion = "3.0.1"; - var MaterialIconsStyleUrl = string.Format("https://raw.githubusercontent.com/google/material-design-icons/{0}/iconfont/codepoints", MaterialIconsVersion); - var MaterialIconsFontUrl = string.Format("https://raw.githubusercontent.com/google/material-design-icons/{0}/iconfont/MaterialIcons-Regular.ttf", MaterialIconsVersion); - - var MeteoconsUrl = "http://www.alessioatzeni.com/meteocons/res/download/meteocons-font.zip"; - - var SimpleLineIconsVersion = "2.4.1"; - var SimpleLineIconsStyleUrl = string.Format("https://raw.githubusercontent.com/thesabbir/simple-line-icons/{0}/css/simple-line-icons.css", SimpleLineIconsVersion); - var SimpleLineIconsFontUrl = string.Format("https://raw.githubusercontent.com/thesabbir/simple-line-icons/{0}/fonts/Simple-Line-Icons.ttf", SimpleLineIconsVersion); - - var TypiconsVersion = "2.0.9"; - var TypiconsStyleUrl = string.Format("https://raw.githubusercontent.com/stephenhutchings/typicons.font/v{0}/src/font/typicons.min.css", TypiconsVersion); - var TypiconsFontUrl = string.Format("https://raw.githubusercontent.com/stephenhutchings/typicons.font/v{0}/src/font/typicons.ttf", TypiconsVersion); - - var WeatherIconsVersion = "2.0.10"; - var WeatherIconsStyleUrl = string.Format("https://raw.githubusercontent.com/erikflowers/weather-icons/{0}/css/weather-icons.min.css", WeatherIconsVersion); - var WeatherIconsStyleWindUrl = string.Format("https://raw.githubusercontent.com/erikflowers/weather-icons/{0}/css/weather-icons-wind.min.css", WeatherIconsVersion); - var WeatherIconsFontUrl = string.Format("https://raw.githubusercontent.com/erikflowers/weather-icons/{0}/font/weathericons-regular-webfont.ttf", WeatherIconsVersion); - - // download all the styles - - // FontAwesome - EnsureDirectoryExists("./externals/FontAwesome/"); - if (!FileExists("./externals/FontAwesome/font-awesome.min.css")) - DownloadFile(FontAwesomeStyleUrl, "./externals/FontAwesome/font-awesome.min.css"); - if (!FileExists("./externals/FontAwesome/fontawesome-webfont.ttf")) - DownloadFile(FontAwesomeFontUrl, "./externals/FontAwesome/fontawesome-webfont.ttf"); - - // // Entypo - // EnsureDirectoryExists("./externals/Entypo/"); - // if (!FileExists("./externals/Entypo/Entypo.zip")) DownloadFile(EntypoUrl, "./externals/Entypo/Entypo.zip"); - // Unzip("./externals/Entypo/Entypo.zip", "./externals/Entypo/Entypo/"); - - // IonIcons - EnsureDirectoryExists("./externals/IonIcons/"); - if (!FileExists("./externals/IonIcons/ionicons.min.css")) - DownloadFile(IonIconsStyleUrl, "./externals/IonIcons/ionicons.min.css"); - if (!FileExists("./externals/IonIcons/ionicons.ttf")) - DownloadFile(IonIconsFontUrl, "./externals/IonIcons/ionicons.ttf"); - - // MaterialDesignIcons - EnsureDirectoryExists("./externals/MaterialDesignIcons/"); - if (!FileExists("./externals/MaterialDesignIcons/materialdesignicons.min.css")) - DownloadFile(MaterialDesignIconsStyleUrl, "./externals/MaterialDesignIcons/materialdesignicons.min.css"); - if (!FileExists("./externals/MaterialDesignIcons/materialdesignicons-webfont.ttf")) - DownloadFile(MaterialDesignIconsFontUrl, "./externals/MaterialDesignIcons/materialdesignicons-webfont.ttf"); - - // MaterialIcons - EnsureDirectoryExists("./externals/MaterialIcons/"); - if (!FileExists("./externals/MaterialIcons/codepoints")) - DownloadFile(MaterialIconsStyleUrl, "./externals/MaterialIcons/codepoints"); - if (!FileExists("./externals/MaterialIcons/MaterialIcons-Regular.ttf")) - DownloadFile(MaterialIconsFontUrl, "./externals/MaterialIcons/MaterialIcons-Regular.ttf"); - - // Meteocons - EnsureDirectoryExists("./externals/Meteocons/"); - if (!FileExists("./externals/Meteocons/meteocons-font.zip")) - DownloadFile(MeteoconsUrl, "./externals/Meteocons/meteocons-font.zip"); - if (!FileExists("./externals/Meteocons/meteocons-font/FONT/Font-face/meteocons-webfont.ttf")) - Unzip("./externals/Meteocons/meteocons-font.zip", "./externals/Meteocons/"); - - // SimpleLineIcons - EnsureDirectoryExists("./externals/SimpleLineIcons/"); - if (!FileExists("./externals/SimpleLineIcons/simple-line-icons.css")) - DownloadFile(SimpleLineIconsStyleUrl, "./externals/SimpleLineIcons/simple-line-icons.css"); - if (!FileExists("./externals/SimpleLineIcons/Simple-Line-Icons.ttf")) - DownloadFile(SimpleLineIconsFontUrl, "./externals/SimpleLineIcons/Simple-Line-Icons.ttf"); - - // Typicons - EnsureDirectoryExists("./externals/Typicons/"); - if (!FileExists("./externals/Typicons/typicons.min.css")) - DownloadFile(TypiconsStyleUrl, "./externals/Typicons/typicons.min.css"); - if (!FileExists("./externals/Typicons/typicons.ttf")) - DownloadFile(TypiconsFontUrl, "./externals/Typicons/typicons.ttf"); - - // WeatherIcons - EnsureDirectoryExists("./externals/WeatherIcons/"); - if (!FileExists("./externals/WeatherIcons/weather-icons.min.css")) - DownloadFile(WeatherIconsStyleUrl, "./externals/WeatherIcons/weather-icons.min.css"); - if (!FileExists("./externals/WeatherIcons/weather-icons-wind.min.css")) - DownloadFile(WeatherIconsStyleWindUrl, "./externals/WeatherIcons/weather-icons-wind.min.css"); - if (!FileExists("./externals/WeatherIcons/weathericons-regular-webfont.ttf")) - DownloadFile(WeatherIconsFontUrl, "./externals/WeatherIcons/weathericons-regular-webfont.ttf"); - if (!FileExists("./externals/WeatherIcons/weather-icons.css")) { - CopyFile("./externals/WeatherIcons/weather-icons.min.css", "./externals/WeatherIcons/weather-icons.css"); - FileAppendText("./externals/WeatherIcons/weather-icons.css", FileReadText("./externals/WeatherIcons/weather-icons-wind.min.css")); - } -}); - -Task("externals") - .IsDependentOn("externals-download") - .IsDependentOn("externals-base") - .Does(() => -{ - var GenerateIconifySource = new Action((stylesheet, type, codepointType) => { - var iconify = MakeAbsolute((FilePath)"./output/IconifyGenerator/iconify.exe"); - var iconifyResult = StartProcess(iconify, new ProcessSettings { - Arguments = new ProcessArgumentBuilder() - .AppendSwitchQuoted("-o", "=", stylesheet.GetDirectory().CombineWithFilePath(type + ".generated.cs").FullPath) - .AppendSwitchQuoted("-n", "SkiaSharp.Extended.Iconify") - .AppendSwitchQuoted("-t", type) - .AppendSwitchQuoted("-c", "=", codepointType) - .AppendQuoted(stylesheet.FullPath) - }); - if (iconifyResult != 0) { - throw new Exception("iconify.exe failed."); - } - }); - - // first build the generator - NuGetRestore("./source/IconifyGenerator.sln"); - MSBuild("./source/IconifyGenerator.sln", settings => settings.SetConfiguration(configuration)); - - // copy generator to output - EnsureDirectoryExists("./output/"); - CopyDirectory("./source/IconifyGenerator/bin/" + configuration, "./output/IconifyGenerator/"); - - // then, run the generator on the styles - GenerateIconifySource("externals/FontAwesome/font-awesome.min.css", "FontAwesome", "css"); - GenerateIconifySource("externals/IonIcons/ionicons.min.css", "IonIcons", "css"); - GenerateIconifySource("externals/MaterialDesignIcons/materialdesignicons.min.css", "MaterialDesignIcons", "css"); - GenerateIconifySource("externals/MaterialIcons/codepoints", "MaterialIcons", "codepoints"); - GenerateIconifySource("externals/SimpleLineIcons/simple-line-icons.css", "SimpleLineIcons", "css"); - GenerateIconifySource("externals/Typicons/typicons.min.css", "Typicons", "css"); - GenerateIconifySource("externals/WeatherIcons/weather-icons.css", "WeatherIcons", "css"); -}); - -Task("clean") - .IsDependentOn("clean-base") - .Does(() => -{ - if (DirectoryExists ("./externals")) - DeleteDirectory ("./externals", true); -}); - -Task("Default") - .IsDependentOn("libs") - .IsDependentOn("nuget") - .IsDependentOn("samples"); - -SetupXamarinBuildTasks (buildSpec, Tasks, Task); - -RunTarget(target); diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.FontAwesome.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.FontAwesome.nuspec deleted file mode 100644 index 3020c90..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.FontAwesome.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.FontAwesome - 2.0.10 - FontAwesome for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The FontAwesome font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.IonIcons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.IonIcons.nuspec deleted file mode 100644 index db26eee..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.IonIcons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.IonIcons - 2.0.1 - IonIcons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The IonIcons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialDesignIcons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialDesignIcons.nuspec deleted file mode 100644 index 24da438..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialDesignIcons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.MaterialDesignIcons - 1.9.32 - MaterialDesignIcons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The MaterialDesignIcons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialIcons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialIcons.nuspec deleted file mode 100644 index 63729a8..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.MaterialIcons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.MaterialIcons - 3.0.1 - MaterialIcons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The MaterialIcons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Meteocons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Meteocons.nuspec deleted file mode 100644 index ecddb50..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Meteocons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.Meteocons - 1.0.0 - Meteocons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The Meteocons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.SimpleLineIcons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.SimpleLineIcons.nuspec deleted file mode 100644 index f0c66af..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.SimpleLineIcons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.SimpleLineIcons - 2.4.1 - SimpleLineIcons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The SimpleLineIcons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Typicons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Typicons.nuspec deleted file mode 100644 index 85f2e3d..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.Typicons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.Typicons - 2.0.9 - Typicons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The Typicons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.WeatherIcons.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.WeatherIcons.nuspec deleted file mode 100644 index ddaf8ba..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.WeatherIcons.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - SkiaSharp.Extended.Iconify.WeatherIcons - 4.7.0 - WeatherIcons for SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - The WeatherIcons font for SkiaSharp.Extended.Iconify. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.nuspec b/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.nuspec deleted file mode 100644 index d5153f3..0000000 --- a/SkiaSharp.Extended.Iconify/nuget/SkiaSharp.Extended.Iconify.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - SkiaSharp.Extended.Iconify - 1.60.0 - SkiaSharp.Extended.Iconify - Matthew Leibowitz - Matthew Leibowitz - false - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE - https://github.com/mono/SkiaSharp.Extended - A simple way to draw a string that contains icons inline with normal characters. - - - Copyright (c) 2017 Matthew Leibowitz - - skiasharp,xamarin,windows,ios,android,uwp - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.sln b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.sln deleted file mode 100644 index 852bdfb..0000000 --- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.sln +++ /dev/null @@ -1,402 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{E4C866CF-F3C0-4893-8AD3-AB095536D054}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify", "..\source\SkiaSharp.Extended.Iconify\SkiaSharp.Extended.Iconify.csproj", "{BE4E2546-5569-4A50-A7AE-E300F326332F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.FontAwesome", "..\source\SkiaSharp.Extended.Iconify.FontAwesome\SkiaSharp.Extended.Iconify.FontAwesome.csproj", "{E42C525C-B924-424F-A1EA-8E3B9FD065DF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.IonIcons", "..\source\SkiaSharp.Extended.Iconify.IonIcons\SkiaSharp.Extended.Iconify.IonIcons.csproj", "{73436836-EC8A-4139-87DB-9C23ACA79E18}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialDesignIcons", "..\source\SkiaSharp.Extended.Iconify.MaterialDesignIcons\SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj", "{F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialIcons", "..\source\SkiaSharp.Extended.Iconify.MaterialIcons\SkiaSharp.Extended.Iconify.MaterialIcons.csproj", "{FF23141E-06C2-400D-8C59-A36A00110340}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Meteocons", "..\source\SkiaSharp.Extended.Iconify.Meteocons\SkiaSharp.Extended.Iconify.Meteocons.csproj", "{4D4C1800-2D96-43FF-8251-3CD96981A26C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.SimpleLineIcons", "..\source\SkiaSharp.Extended.Iconify.SimpleLineIcons\SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj", "{005E488F-F0F3-4FBD-825F-5A1C4970B73B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Typicons", "..\source\SkiaSharp.Extended.Iconify.Typicons\SkiaSharp.Extended.Iconify.Typicons.csproj", "{9D7E4310-776B-40C7-8446-82D109A3FA01}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.WeatherIcons", "..\source\SkiaSharp.Extended.Iconify.WeatherIcons\SkiaSharp.Extended.Iconify.WeatherIcons.csproj", "{F768714B-00A9-49DF-BA46-30C64B399186}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|ARM.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhone.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x64.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x64.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x86.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x86.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|Any CPU.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|ARM.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|ARM.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhone.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhone.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x64.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x64.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x86.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x86.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|ARM.Build.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|ARM.Deploy.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhone.Build.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x64.ActiveCfg = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x64.Build.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x64.Deploy.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x86.ActiveCfg = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x86.Build.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|x86.Deploy.0 = Debug|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|Any CPU.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|Any CPU.Deploy.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|ARM.ActiveCfg = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|ARM.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|ARM.Deploy.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhone.ActiveCfg = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhone.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhone.Deploy.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x64.ActiveCfg = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x64.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x64.Deploy.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x86.ActiveCfg = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x86.Build.0 = Release|Any CPU - {9B960D09-426D-4D5A-90AC-8971D255E48F}.Release|x86.Deploy.0 = Release|Any CPU - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|ARM.ActiveCfg = Debug|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|ARM.Build.0 = Debug|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhone.ActiveCfg = Debug|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhone.Build.0 = Debug|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x64.Build.0 = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Debug|x86.Build.0 = Debug|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|Any CPU.Build.0 = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|ARM.ActiveCfg = Release|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|ARM.Build.0 = Release|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhone.ActiveCfg = Release|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhone.Build.0 = Release|iPhone - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x64.ActiveCfg = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x64.Build.0 = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x86.ActiveCfg = Release|iPhoneSimulator - {C9938859-CB05-4AAD-909A-8118F3D6B47A}.Release|x86.Build.0 = Release|iPhoneSimulator - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|ARM.Build.0 = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhone.Build.0 = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x64.ActiveCfg = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x64.Build.0 = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x86.ActiveCfg = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Debug|x86.Build.0 = Debug|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|Any CPU.Build.0 = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|ARM.ActiveCfg = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|ARM.Build.0 = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhone.ActiveCfg = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhone.Build.0 = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}.Release|x64.ActiveCfg = Release|Any CPU - {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|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|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|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|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 - {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.ActiveCfg = Release|x86 - {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Build.0 = Release|x86 - {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Deploy.0 = Release|x86 - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|ARM.Build.0 = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|iPhone.Build.0 = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|x64.ActiveCfg = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|x64.Build.0 = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|x86.ActiveCfg = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Debug|x86.Build.0 = Debug|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|Any CPU.Build.0 = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|ARM.ActiveCfg = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|ARM.Build.0 = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|iPhone.ActiveCfg = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|iPhone.Build.0 = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|x64.ActiveCfg = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|x64.Build.0 = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|x86.ActiveCfg = Release|Any CPU - {BE4E2546-5569-4A50-A7AE-E300F326332F}.Release|x86.Build.0 = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|ARM.Build.0 = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|iPhone.Build.0 = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|x64.Build.0 = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Debug|x86.Build.0 = Debug|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|Any CPU.Build.0 = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|ARM.ActiveCfg = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|ARM.Build.0 = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|iPhone.ActiveCfg = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|iPhone.Build.0 = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|x64.ActiveCfg = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|x64.Build.0 = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|x86.ActiveCfg = Release|Any CPU - {E42C525C-B924-424F-A1EA-8E3B9FD065DF}.Release|x86.Build.0 = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|ARM.ActiveCfg = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|ARM.Build.0 = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|iPhone.Build.0 = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|x64.ActiveCfg = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|x64.Build.0 = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|x86.ActiveCfg = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Debug|x86.Build.0 = Debug|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|Any CPU.Build.0 = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|ARM.ActiveCfg = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|ARM.Build.0 = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|iPhone.ActiveCfg = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|iPhone.Build.0 = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|x64.ActiveCfg = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|x64.Build.0 = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|x86.ActiveCfg = Release|Any CPU - {73436836-EC8A-4139-87DB-9C23ACA79E18}.Release|x86.Build.0 = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|ARM.Build.0 = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|iPhone.Build.0 = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|x64.ActiveCfg = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|x64.Build.0 = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|x86.ActiveCfg = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Debug|x86.Build.0 = Debug|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|Any CPU.Build.0 = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|ARM.ActiveCfg = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|ARM.Build.0 = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|iPhone.ActiveCfg = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|iPhone.Build.0 = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|x64.ActiveCfg = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|x64.Build.0 = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|x86.ActiveCfg = Release|Any CPU - {F601F5B2-C2B3-4D5A-ADBF-FF2053CB6F0A}.Release|x86.Build.0 = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|ARM.ActiveCfg = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|ARM.Build.0 = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|iPhone.Build.0 = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|x64.ActiveCfg = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|x64.Build.0 = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|x86.ActiveCfg = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Debug|x86.Build.0 = Debug|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|Any CPU.Build.0 = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|ARM.ActiveCfg = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|ARM.Build.0 = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|iPhone.ActiveCfg = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|iPhone.Build.0 = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|x64.ActiveCfg = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|x64.Build.0 = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|x86.ActiveCfg = Release|Any CPU - {FF23141E-06C2-400D-8C59-A36A00110340}.Release|x86.Build.0 = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|ARM.Build.0 = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|iPhone.Build.0 = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|x64.ActiveCfg = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|x64.Build.0 = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Debug|x86.Build.0 = Debug|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|Any CPU.Build.0 = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|ARM.ActiveCfg = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|ARM.Build.0 = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|iPhone.ActiveCfg = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|iPhone.Build.0 = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|x64.ActiveCfg = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|x64.Build.0 = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|x86.ActiveCfg = Release|Any CPU - {4D4C1800-2D96-43FF-8251-3CD96981A26C}.Release|x86.Build.0 = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|ARM.Build.0 = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|iPhone.Build.0 = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|x64.ActiveCfg = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|x64.Build.0 = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|x86.ActiveCfg = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Debug|x86.Build.0 = Debug|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|Any CPU.Build.0 = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|ARM.ActiveCfg = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|ARM.Build.0 = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|iPhone.ActiveCfg = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|iPhone.Build.0 = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|x64.ActiveCfg = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|x64.Build.0 = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|x86.ActiveCfg = Release|Any CPU - {005E488F-F0F3-4FBD-825F-5A1C4970B73B}.Release|x86.Build.0 = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|ARM.Build.0 = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|iPhone.Build.0 = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|x64.Build.0 = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|x86.ActiveCfg = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Debug|x86.Build.0 = Debug|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|Any CPU.Build.0 = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|ARM.ActiveCfg = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|ARM.Build.0 = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|iPhone.ActiveCfg = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|iPhone.Build.0 = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|x64.ActiveCfg = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|x64.Build.0 = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|x86.ActiveCfg = Release|Any CPU - {9D7E4310-776B-40C7-8446-82D109A3FA01}.Release|x86.Build.0 = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|ARM.Build.0 = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|iPhone.Build.0 = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|x64.ActiveCfg = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|x64.Build.0 = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|x86.ActiveCfg = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Debug|x86.Build.0 = Debug|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|Any CPU.Build.0 = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|ARM.ActiveCfg = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|ARM.Build.0 = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|iPhone.ActiveCfg = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|iPhone.Build.0 = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|x64.ActiveCfg = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|x64.Build.0 = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|x86.ActiveCfg = Release|Any CPU - {F768714B-00A9-49DF-BA46-30C64B399186}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest index 60f49b4..0b38ce8 100644 --- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest +++ b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest @@ -1,48 +1,27 @@  - - - - - - - + + + SkiaSharpDemo.UWP - mattl + Xamarin Inc. Assets\StoreLogo.png - - - + - - - - + + + + - diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj index a29655c..56e100a 100644 --- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj +++ b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj @@ -17,7 +17,8 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Windows_TemporaryKey.pfx + ..\..\..\..\keys\UWP_App_Key.pfx + B78C3BAF61B65EE64B6B4EDB0B18039E968078B2 true @@ -114,7 +115,7 @@ Designer - + diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj index 6e4cd4d..c1edb00 100644 --- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj +++ b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj @@ -28,7 +28,6 @@ - diff --git a/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets b/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets new file mode 100644 index 0000000..db146e1 --- /dev/null +++ b/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets @@ -0,0 +1,338 @@ + + + + + $(MSBuildThisFileDirectory)\IconifyGenerator\bin\$(Configuration)\net461\iconify.exe + css + $([System.IO.Path]::GetExtension('$(AssemblyName)').Substring(1)) + + + + <_ManagedExeLauncher Condition=" Exists('/Library/Frameworks/Mono.framework/Versions/Current/bin/mono') ">/Library/Frameworks/Mono.framework/Versions/Current/bin/mono + <_ManagedExeLauncher Condition=" Exists('/usr/local/bin/mono') ">/usr/local/bin/mono + <_ManagedExeLauncher Condition=" Exists('/usr/bin/mono') ">/usr/bin/mono + <_ManagedExeLauncher Condition=" '$(_ManagedExeLauncher)' == '' ">mono + + + + + + + <_WaitForFile FileName="$(iconify).building" + ToExist="false" + Timeout="30" + Condition=" !Exists('$(iconify)') " /> + + + + + + + + + + + + + + + + + + $(MSBuildProjectDirectory)\$(IntermediateOutputPath)fonts\ + $(FontsDirectory)$(IconifyTypeName).generated.cs + $(FontsDirectory)$(IconifyTypeName).generated.css + + + + + + + + + + + + + + + <_Download Url="%(_DownloadZipFile.Identity)" + Destination="%(_DownloadZipFile.TargetPath)" + Timeout="30" + Condition=" '@(_DownloadZipFile)' != '' and !Exists('%(_DownloadZipFile.UnzipDirectory)%(_DownloadZipFile.Font)') " /> + + <_Unzip FileName="%(_DownloadZipFile.TargetPath)" + Destination="%(_DownloadZipFile.UnzipDirectory)" + Condition=" '@(_DownloadZipFile)' != '' " /> + + + <_Download Url="%(_RemoteStyleSheet.Identity)" + Destination="%(_RemoteStyleSheet.TargetPath)" + Timeout="30" + Condition=" '@(_RemoteStyleSheet)' != '' and !Exists('%(_RemoteStyleSheet.TargetPath)') " /> + <_Download Url="%(_RemoteFontFile.Identity)" + Destination="%(_RemoteFontFile.TargetPath)" + Timeout="30" + Condition=" '@(_RemoteFontFile)' != '' and !Exists('%(_RemoteFontFile.TargetPath)') " /> + + + <_MergeFiles Files="%(_RemoteStyleSheet.TargetPath)" + Destination="$(GeneratedStylesheetPath)" + Reset="true" + Condition=" '@(_RemoteStyleSheet)' != '' " /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (); + + Task.Run(async () => + { + Log.LogMessage("Downloading '{0}' to '{1}'...", Url, Destination); + + var dir = Path.GetDirectoryName(Destination); + if (!Directory.Exists(dir)) + Directory.CreateDirectory(dir); + + try + { + var client = new WebClient(); + + var token = cts.Token; + cts.CancelAfter(TimeSpan.FromSeconds(Timeout)); + token.Register(() => client.CancelAsync()); + token.ThrowIfCancellationRequested(); + + await client.DownloadFileTaskAsync(Url, Destination); + + Log.LogMessage("Download of '{0}' complete.", Url); + + tcs.SetResult(true); + } + catch (Exception ex) + { + tcs.SetException(ex); + } + }); + + return tcs.Task.Result; + } + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/IconifyGenerator.sln b/SkiaSharp.Extended.Iconify/source/IconifyGenerator.sln deleted file mode 100644 index a03c8fa..0000000 --- a/SkiaSharp.Extended.Iconify/source/IconifyGenerator.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconifyGenerator", "IconifyGenerator\IconifyGenerator.csproj", "{6BBB9C70-FCAF-4676-8600-03DE52F5341E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended.Iconify/source/IconifyGenerator/IconifyGenerator.csproj b/SkiaSharp.Extended.Iconify/source/IconifyGenerator/IconifyGenerator.csproj index 0dfdc38..893b427 100644 --- a/SkiaSharp.Extended.Iconify/source/IconifyGenerator/IconifyGenerator.csproj +++ b/SkiaSharp.Extended.Iconify/source/IconifyGenerator/IconifyGenerator.csproj @@ -1,41 +1,15 @@ - - + + - Debug - AnyCPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E} Exe + net461 IconifyGenerator iconify - v4.5 - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - - - true - bin\Release - prompt - 4 - true - - - - + - - - - - + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/IconifyGenerator/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/IconifyGenerator/Properties/AssemblyInfo.cs deleted file mode 100644 index c569e02..0000000 --- a/SkiaSharp.Extended.Iconify/source/IconifyGenerator/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("IconifyGenerator")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/Properties/AssemblyInfo.cs deleted file mode 100644 index 12d5e46..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.FontAwesome")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("4.0.0.0")] -[assembly: AssemblyFileVersion("4.7.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj index fa3feb6..dbaca57 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj @@ -1,41 +1,66 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.FontAwesome - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 4.0.0.0 + 4.7.0.0 + 5.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 4.7.0 + + + + + + + SkiaSharp.Extended.Iconify.FontAwesome + Font Awesome for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Font Awesome font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify fontawesome xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - FontAwesome.generated.cs - - - - - fontawesome-webfont.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/Properties/AssemblyInfo.cs deleted file mode 100644 index ab59825..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.IonIcons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj index c6da4b8..bd80b02 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj @@ -1,41 +1,66 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.IonIcons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 2.0.0.0 + 2.0.1.0 + 3.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 2.0.1 + + + + + + + SkiaSharp.Extended.Iconify.IonIcons + Ionicons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Ionicons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify ionicons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - IonIcons.generated.cs - - - - - ionicons.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/Properties/AssemblyInfo.cs deleted file mode 100644 index 3204e15..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.MaterialDesignIcons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.9.32.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj index b7f8c0d..7cce980 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj @@ -1,41 +1,66 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.MaterialDesignIcons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 1.0.0.0 + 1.9.32.0 + 2.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 1.9.32 + + + + + + + SkiaSharp.Extended.Iconify.MaterialDesignIcons + Material Design Icons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Material Design Icons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify materialdesignicons materialdesign xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - MaterialDesignIcons.generated.cs - - - - - materialdesignicons-webfont.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/Properties/AssemblyInfo.cs deleted file mode 100644 index bdc0ca0..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.MaterialIcons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.0.1.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj index 35837dc..816af0f 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj @@ -1,41 +1,67 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.MaterialIcons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 3.0.0.0 + 3.0.1.0 + 4.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 3.0.1 + codepoints + + + + + + + SkiaSharp.Extended.Iconify.MaterialIcons + Material Icons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Material Icons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify materialicons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - MaterialIcons.generated.cs - - - - - MaterialIcons-Regular.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/Properties/AssemblyInfo.cs deleted file mode 100644 index 571cca5..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.Meteocons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj index 2ef4b51..862e8ad 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj @@ -1,36 +1,65 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.Meteocons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 1.0.0.0 + 1.0.0.0 + 2.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + + + + + + SkiaSharp.Extended.Iconify.Meteocons + Meteocons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Meteocons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify meteocons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - meteocons-webfont.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/Properties/AssemblyInfo.cs deleted file mode 100644 index 07485dc..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.SimpleLineIcons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.4.1.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj index dbc2f1c..a870271 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj @@ -1,41 +1,66 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.SimpleLineIcons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 2.0.0.0 + 2.4.1.0 + 3.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 2.4.1 + + + + + + + SkiaSharp.Extended.Iconify.SimpleLineIcons + Simple Line Icons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Simple Line Icons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify simplelineicons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - SimpleLineIcons.generated.cs - - - - - Simple-Line-Icons.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/Properties/AssemblyInfo.cs deleted file mode 100644 index 7198af2..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.Typicons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.9.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj index 261cb52..2f974f2 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj @@ -1,41 +1,66 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.Typicons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 2.0.0.0 + 2.0.9.0 + 3.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 2.0.9 + + + + + + + SkiaSharp.Extended.Iconify.Typicons + Typicons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Typicons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify typicons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - Typicons.generated.cs - - - - - typicons.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/Properties/AssemblyInfo.cs deleted file mode 100644 index 8ecb7a3..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify.WeatherIcons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.10.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj index 8b871eb..f6caeee 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj @@ -1,41 +1,67 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify.WeatherIcons - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ + SkiaSharp.Extended.Iconify + 2.0.0.0 + 2.0.10.0 + 5.0.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + 2.0.10 + + + + + + + + SkiaSharp.Extended.Iconify.WeatherIcons + Weather Icons for SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + The Weather Icons font for SkiaSharp.Extended.Iconify. + © Microsoft Corporation. All rights reserved. + + skiasharp iconify weathericons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + - - - WeatherIcons.generated.cs - - - - - weathericons-regular-webfont.ttf - - + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.sln b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.sln deleted file mode 100644 index d47197f..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.sln +++ /dev/null @@ -1,69 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify", "SkiaSharp.Extended.Iconify\SkiaSharp.Extended.Iconify.csproj", "{B32E4823-D151-4A32-8C25-914BC7FB7B2C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.FontAwesome", "SkiaSharp.Extended.Iconify.FontAwesome\SkiaSharp.Extended.Iconify.FontAwesome.csproj", "{D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.IonIcons", "SkiaSharp.Extended.Iconify.IonIcons\SkiaSharp.Extended.Iconify.IonIcons.csproj", "{14A21586-B844-4955-9E17-90968EE71FFD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialDesignIcons", "SkiaSharp.Extended.Iconify.MaterialDesignIcons\SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj", "{E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialIcons", "SkiaSharp.Extended.Iconify.MaterialIcons\SkiaSharp.Extended.Iconify.MaterialIcons.csproj", "{E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Meteocons", "SkiaSharp.Extended.Iconify.Meteocons\SkiaSharp.Extended.Iconify.Meteocons.csproj", "{E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.SimpleLineIcons", "SkiaSharp.Extended.Iconify.SimpleLineIcons\SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj", "{14A21586-B844-4955-9E17-90968EE71FCC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Typicons", "SkiaSharp.Extended.Iconify.Typicons\SkiaSharp.Extended.Iconify.Typicons.csproj", "{14A21586-B844-4955-9E17-90968EE71ABC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.WeatherIcons", "SkiaSharp.Extended.Iconify.WeatherIcons\SkiaSharp.Extended.Iconify.WeatherIcons.csproj", "{408778E6-355A-42D4-851C-7E327423A09D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Release|Any CPU.Build.0 = Release|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Release|Any CPU.Build.0 = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Release|Any CPU.Build.0 = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Release|Any CPU.Build.0 = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Release|Any CPU.Build.0 = Release|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/Properties/AssemblyInfo.cs deleted file mode 100644 index f1e5d93..0000000 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended.Iconify")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.60.0.0")] -[assembly: AssemblyFileVersion("1.60.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj index e4636c2..30fb331 100644 --- a/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj +++ b/SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj @@ -1,28 +1,55 @@ - - + + - netstandard1.3 - library - SkiaSharp.Extended.Iconify + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 SkiaSharp.Extended.Iconify - False - False - 1.6.0 - - - true - true - ..\..\..\keys\Open.snk + SkiaSharp.Extended.Iconify + 1.60.0.0 + 1.60.0.0 + 1.60.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ + + + SkiaSharp.Extended.Iconify + SkiaSharp.Extended.Iconify + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + A simple way to draw a string that contains icons inline with normal characters. + © Microsoft Corporation. All rights reserved. + + xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform skiasharp + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended - - TRACE;NET_STANDARD - bin\Release\ + + + $(DefineConstants);NET_STANDARD; + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/source/source.sln b/SkiaSharp.Extended.Iconify/source/source.sln deleted file mode 100644 index 3e4715a..0000000 --- a/SkiaSharp.Extended.Iconify/source/source.sln +++ /dev/null @@ -1,75 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify", "SkiaSharp.Extended.Iconify\SkiaSharp.Extended.Iconify.csproj", "{B32E4823-D151-4A32-8C25-914BC7FB7B2C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.FontAwesome", "SkiaSharp.Extended.Iconify.FontAwesome\SkiaSharp.Extended.Iconify.FontAwesome.csproj", "{D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.IonIcons", "SkiaSharp.Extended.Iconify.IonIcons\SkiaSharp.Extended.Iconify.IonIcons.csproj", "{14A21586-B844-4955-9E17-90968EE71FFD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialDesignIcons", "SkiaSharp.Extended.Iconify.MaterialDesignIcons\SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj", "{E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.MaterialIcons", "SkiaSharp.Extended.Iconify.MaterialIcons\SkiaSharp.Extended.Iconify.MaterialIcons.csproj", "{E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Meteocons", "SkiaSharp.Extended.Iconify.Meteocons\SkiaSharp.Extended.Iconify.Meteocons.csproj", "{E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.SimpleLineIcons", "SkiaSharp.Extended.Iconify.SimpleLineIcons\SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj", "{14A21586-B844-4955-9E17-90968EE71FCC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.Typicons", "SkiaSharp.Extended.Iconify.Typicons\SkiaSharp.Extended.Iconify.Typicons.csproj", "{14A21586-B844-4955-9E17-90968EE71ABC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Iconify.WeatherIcons", "SkiaSharp.Extended.Iconify.WeatherIcons\SkiaSharp.Extended.Iconify.WeatherIcons.csproj", "{408778E6-355A-42D4-851C-7E327423A09D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconifyGenerator", "IconifyGenerator\IconifyGenerator.csproj", "{6BBB9C70-FCAF-4676-8600-03DE52F5341E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B32E4823-D151-4A32-8C25-914BC7FB7B2C}.Release|Any CPU.Build.0 = Release|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D74CA2AC-F45F-4E6A-9830-E9A9135E4D76}.Release|Any CPU.Build.0 = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FFD}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DE8FF}.Release|Any CPU.Build.0 = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4E220CE-0F9E-4963-9ECF-43F13B8DEABC}.Release|Any CPU.Build.0 = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71FCC}.Release|Any CPU.Build.0 = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14A21586-B844-4955-9E17-90968EE71ABC}.Release|Any CPU.Build.0 = Release|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {408778E6-355A-42D4-851C-7E327423A09D}.Release|Any CPU.Build.0 = Release|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BBB9C70-FCAF-4676-8600-03DE52F5341E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo.sln b/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln similarity index 61% rename from SkiaSharp.Extended/samples/SkiaSharpDemo.sln rename to SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln index 47dfbc9..b4f3514 100644 --- a/SkiaSharp.Extended/samples/SkiaSharpDemo.sln +++ b/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln @@ -1,26 +1,26 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Extended.Shared", "..\source\SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.shproj", "{E3290CE6-0ADA-486B-9BAB-8BCF07F9BE45}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.Tests", "tests\SkiaSharp.Extended.Svg.Tests.csproj", "{524491E8-1481-442F-9286-8D00BF807065}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.NetStandard", "..\source\SkiaSharp.Extended.NetStandard\SkiaSharp.Extended.NetStandard.csproj", "{2F629029-D670-418D-969C-B8125B482AEE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0C2C7-732B-4A5C-A4F2-55655D147866}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{E4C866CF-F3C0-4893-8AD3-AB095536D054}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{D3D0D6EA-99FE-4C5B-AD21-31E6332F0199}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg", "source\SkiaSharp.Extended.Svg.csproj", "{5F472166-361D-4D45-84C9-72B8566D03A2}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\source\SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.projitems*{e3290ce6-0ada-486b-9bab-8bcf07f9be45}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -36,54 +36,54 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|ARM.Build.0 = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|iPhone.Build.0 = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|x64.ActiveCfg = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|x64.Build.0 = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Debug|x86.Build.0 = Debug|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|Any CPU.Build.0 = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|ARM.ActiveCfg = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|ARM.Build.0 = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|iPhone.ActiveCfg = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|iPhone.Build.0 = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|x64.ActiveCfg = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|x64.Build.0 = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|x86.ActiveCfg = Release|Any CPU - {2F629029-D670-418D-969C-B8125B482AEE}.Release|x86.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|ARM.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhone.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x64.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x64.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x86.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x86.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|Any CPU.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|ARM.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|ARM.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhone.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhone.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x64.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x64.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x86.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x86.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|ARM.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|ARM.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhone.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x64.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x64.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x86.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x86.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|ARM.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|ARM.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhone.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhone.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x64.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x64.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x86.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x86.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|ARM.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhone.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x64.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x64.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x86.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x86.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|Any CPU.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|ARM.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|ARM.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhone.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhone.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x64.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x64.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x86.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x86.Build.0 = Release|Any CPU {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -192,8 +192,43 @@ Global {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.ActiveCfg = Release|x86 {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Build.0 = Release|x86 {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Deploy.0 = Release|x86 + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|ARM.ActiveCfg = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|ARM.Build.0 = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|iPhone.Build.0 = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|x64.ActiveCfg = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|x64.Build.0 = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|x86.ActiveCfg = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Debug|x86.Build.0 = Debug|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|Any CPU.Build.0 = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|ARM.ActiveCfg = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|ARM.Build.0 = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|iPhone.ActiveCfg = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|iPhone.Build.0 = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|x64.ActiveCfg = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|x64.Build.0 = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|x86.ActiveCfg = Release|Any CPU + {5F472166-361D-4D45-84C9-72B8566D03A2}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} = {51B0C2C7-732B-4A5C-A4F2-55655D147866} + {9B960D09-426D-4D5A-90AC-8971D255E48F} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {C9938859-CB05-4AAD-909A-8118F3D6B47A} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {08D78153-5DD7-4C52-A348-46AA448B2CFC} + EndGlobalSection EndGlobal diff --git a/SkiaSharp.Extended.Svg/build.cake b/SkiaSharp.Extended.Svg/build.cake deleted file mode 100644 index 51e87c7..0000000 --- a/SkiaSharp.Extended.Svg/build.cake +++ /dev/null @@ -1,73 +0,0 @@ -#load "../common.cake" - -var target = Argument("target", "Default"); -var configuration = Argument("configuration", "Release"); -var verbosity = Argument("verbosity", "Verbose"); - -var buildSpec = new BuildSpec { - Libs = new ISolutionBuilder [] { - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, - SolutionPath = "./source/SkiaSharp.Extended.Svg.sln", - Configuration = configuration, - OutputFiles = new [] { - new OutputFileCopy { - FromFile = "./source/SkiaSharp.Extended.Svg/bin/Release/SkiaSharp.Svg.dll", - ToDirectory = "./output/portable" - }, - new OutputFileCopy { - FromFile = "./source/SkiaSharp.Extended.Svg.NetStandard/bin/Release/SkiaSharp.Svg.dll", - ToDirectory = "./output/netstandard" - }, - }, - PostBuildAction = () => { - SignAssembly("./source/SkiaSharp.Extended.Svg/bin/Release/SkiaSharp.Svg.dll", "../keys/mono.snk"); - SignAssembly("./source/SkiaSharp.Extended.Svg.NetStandard/bin/Release/SkiaSharp.Svg.dll", "../keys/mono.snk"); - }, - }, - }, - - Samples = new ISolutionBuilder [] { - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Windows, - SolutionPath = "./samples/SkiaSharpDemo.sln" - }, - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Mac, - Platform = "iPhone", - SolutionPath = "./samples/SkiaSharpDemo.sln" - }, - }, - - NuGets = new [] { - new NuGetInfo { NuSpec = "./nuget/SkiaSharp.Extended.Svg.nuspec" }, - }, -}; - -Task("tests") - .IsDependentOn("libs") - .Does(() => -{ - // build the tests - NuGetRestore("./tests/SkiaSharp.Extended.Svg.Tests.sln"); - MSBuild("./tests/SkiaSharp.Extended.Svg.Tests.sln", settings => settings.SetConfiguration(configuration)); - - // run the tests - NUnit3("./tests/**/bin/" + configuration + "/*.Tests.dll", new NUnit3Settings { - Results = "./output/TestResult.xml", - ResultFormat = "nunit2", - }); -}); - -Task("Default") - .IsDependentOn("libs") - .IsDependentOn("nuget") - .IsDependentOn("tests") - .IsDependentOn("samples"); - -SetupXamarinBuildTasks (buildSpec, Tasks, Task); - -RunTarget(target); diff --git a/SkiaSharp.Extended.Svg/nuget/SkiaSharp.Extended.Svg.nuspec b/SkiaSharp.Extended.Svg/nuget/SkiaSharp.Extended.Svg.nuspec deleted file mode 100644 index c3a9498..0000000 --- a/SkiaSharp.Extended.Svg/nuget/SkiaSharp.Extended.Svg.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - SkiaSharp.Svg - SVG Support for SkiaSharp - 1.60.0 - Xamarin Inc. - Xamarin Inc. - false - This package adds support for reading SVG files into SkiaSharp. - Copyright (c) Xamarin Inc. 2016 - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE.md - https://github.com/mono/SkiaSharp.Extended - https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj index 2beec72..da4bb85 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj @@ -58,7 +58,10 @@ - + + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F} + SkiaSharpDemo + diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest index 60f49b4..0b38ce8 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest @@ -1,48 +1,27 @@  - - - - - - - + + + SkiaSharpDemo.UWP - mattl + Xamarin Inc. Assets\StoreLogo.png - - - + - - - - + + + + - diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj index a29655c..b7ee567 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj @@ -17,7 +17,8 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Windows_TemporaryKey.pfx + ..\..\..\..\keys\UWP_App_Key.pfx + B78C3BAF61B65EE64B6B4EDB0B18039E968078B2 true @@ -99,7 +100,10 @@ - + + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F} + SkiaSharpDemo + @@ -114,7 +118,7 @@ Designer - + diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj index 5c4bbd7..c56ad80 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj @@ -73,7 +73,10 @@ - + + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F} + SkiaSharpDemo + diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj index 5541956..2073799 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj @@ -56,7 +56,10 @@ - + + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F} + SkiaSharpDemo + diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj index 00c6f63..6219174 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj @@ -19,8 +19,7 @@ - - + diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f28270..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/SkiaSharp.Extended.Svg.NetStandard.csproj b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/SkiaSharp.Extended.Svg.NetStandard.csproj deleted file mode 100644 index f31595f..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.NetStandard/SkiaSharp.Extended.Svg.NetStandard.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - netstandard1.3 - library - SkiaSharp - SkiaSharp.Svg - False - False - 1.6.0 - - - true - true - ..\..\..\keys\mono.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ - - - - - - diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/Properties/SkiaSharpSvgAssemblyInfo.cs b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/Properties/SkiaSharpSvgAssemblyInfo.cs deleted file mode 100644 index b061b49..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/Properties/SkiaSharpSvgAssemblyInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Svg")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SkiaSharp.Svg")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.60.0.0")] -[assembly: AssemblyFileVersion("1.60.0.0")] -[assembly: AssemblyInformationalVersion("1.60.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.projitems b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.projitems deleted file mode 100644 index 985613f..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.projitems +++ /dev/null @@ -1,25 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - b201e760-db91-485c-a99a-814bded90bdb - - - SkiaSharp - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.shproj b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.shproj deleted file mode 100644 index 08272a4..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.Shared/SkiaSharp.Extended.Svg.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - b201e760-db91-485c-a99a-814bded90bdb - 14.0 - - - - - - - - diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.csproj b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.csproj new file mode 100644 index 0000000..efc5567 --- /dev/null +++ b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.csproj @@ -0,0 +1,56 @@ + + + + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 + SkiaSharp.Extended.Svg + SkiaSharp.Extended.Svg + 1.60.0.0 + 1.60.0.0 + 1.60.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + mono.snk + + + + SkiaSharp.Svg + SVG Support for SkiaSharp + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + This package adds support for reading SVG files into SkiaSharp. + © Microsoft Corporation. All rights reserved. + https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png + xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform skiasharp + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + + + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.sln b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.sln deleted file mode 100644 index 7a81560..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.sln +++ /dev/null @@ -1,32 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.12 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Extended.Svg.Shared", "SkiaSharp.Extended.Svg.Shared\SkiaSharp.Extended.Svg.Shared.shproj", "{B201E760-DB91-485C-A99A-814BDED90BDB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Extended.Svg", "SkiaSharp.Extended.Svg\SkiaSharp.Extended.Svg.csproj", "{04C4399A-6740-4733-B6B7-F968232A76C8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.NetStandard", "SkiaSharp.Extended.Svg.NetStandard\SkiaSharp.Extended.Svg.NetStandard.csproj", "{2720B8B4-3844-4A16-AC28-787011A59704}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharp.Extended.Svg.Shared\SkiaSharp.Extended.Svg.Shared.projitems*{b201e760-db91-485c-a99a-814bded90bdb}*SharedItemsImports = 13 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {04C4399A-6740-4733-B6B7-F968232A76C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Release|Any CPU.Build.0 = Release|Any CPU - {2720B8B4-3844-4A16-AC28-787011A59704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2720B8B4-3844-4A16-AC28-787011A59704}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2720B8B4-3844-4A16-AC28-787011A59704}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2720B8B4-3844-4A16-AC28-787011A59704}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f28270..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj b/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj deleted file mode 100644 index 9c54fb6..0000000 --- a/SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - 10.0 - Debug - AnyCPU - {04C4399A-6740-4733-B6B7-F968232A76C8} - Library - Properties - SkiaSharp - SkiaSharp.Svg - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile78 - v4.5 - true - ..\..\..\keys\mono.snk - - - true - full - false - bin\Debug\ - DEBUG;TRACE;PORTABLE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;PORTABLE - prompt - 4 - - - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj new file mode 100644 index 0000000..a1549df --- /dev/null +++ b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj @@ -0,0 +1,34 @@ + + + + net47 + false + x86 + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.sln b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.sln deleted file mode 100644 index 0e56d18..0000000 --- a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.sln +++ /dev/null @@ -1,36 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Extended.Svg.Tests", "SkiaSharp.Extended.Svg.Tests\SkiaSharp.Extended.Svg.Tests.csproj", "{524491E8-1481-442F-9286-8D00BF807065}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Extended.Svg", "..\source\SkiaSharp.Extended.Svg\SkiaSharp.Extended.Svg.csproj", "{04C4399A-6740-4733-B6B7-F968232A76C8}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Extended.Svg.Shared", "..\source\SkiaSharp.Extended.Svg.Shared\SkiaSharp.Extended.Svg.Shared.shproj", "{B201E760-DB91-485C-A99A-814BDED90BDB}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\source\SkiaSharp.Extended.Svg.Shared\SkiaSharp.Extended.Svg.Shared.projitems*{b201e760-db91-485c-a99a-814bded90bdb}*SharedItemsImports = 13 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.Build.0 = Release|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04C4399A-6740-4733-B6B7-F968232A76C8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D30A15C9-B8C5-488B-9556-DEA54857C6B2} - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index d30a168..0000000 --- a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SkiaSharp.Extended.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SkiaSharp.Extended.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("524491e8-1481-442f-9286-8d00bf807065")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKSvgTest.cs b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKSvgTest.cs index 1c322c8..f6842ee 100644 --- a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKSvgTest.cs +++ b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKSvgTest.cs @@ -1,13 +1,13 @@ using System; using System.IO; -using NUnit.Framework; using System.Xml.Linq; +using Xunit; namespace SkiaSharp.Extended.Svg.Tests { public class SKSvgTest : SKTest { - [Test] + [Fact] public void LoadSvgCanvasSize() { var path = Path.Combine(PathToImages, "logos.svg"); @@ -15,10 +15,10 @@ namespace SkiaSharp.Extended.Svg.Tests var svg = new SKSvg(); svg.Load(path); - Assert.AreEqual(new SKSize(300, 300), svg.CanvasSize); + Assert.Equal(new SKSize(300, 300), svg.CanvasSize); } - [Test] + [Fact] public void LoadSvgCustomCanvasSize() { var path = Path.Combine(PathToImages, "logos.svg"); @@ -26,10 +26,10 @@ namespace SkiaSharp.Extended.Svg.Tests var svg = new SKSvg(new SKSize(150, 150)); svg.Load(path); - Assert.AreEqual(new SKSize(150, 150), svg.CanvasSize); + Assert.Equal(new SKSize(150, 150), svg.CanvasSize); } - [Test] + [Fact] public void SvgLoadsToBitmap() { var path = Path.Combine(PathToImages, "logos.svg"); @@ -37,10 +37,10 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = LoadSvgBitmap(path); - Assert.AreEqual(background, bmp.GetPixel(0, 0)); + Assert.Equal(background, bmp.GetPixel(0, 0)); } - [Test] + [Fact] public void SvgRespectsBaselineShift() { var path = Path.Combine(PathToImages, "baselines.svg"); @@ -49,13 +49,13 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = LoadSvgBitmap(path, background); - Assert.AreEqual(background, bmp.GetPixel(25, 25)); + Assert.Equal(background, bmp.GetPixel(25, 25)); // test for the explicit positioning, the others aren't supported yet - Assert.AreEqual(fill, bmp.GetPixel(370, 40)); + Assert.Equal(fill, bmp.GetPixel(370, 40)); } - [Test] + [Fact] public void SvgLoadsLocalEmbeddedImages() { var path = Path.Combine(PathToImages, "embedded.svg"); @@ -64,11 +64,11 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = LoadSvgBitmap(path, background); - Assert.AreEqual(background, bmp.GetPixel(25, 25)); - Assert.AreEqual(fill, bmp.GetPixel(35, 50)); + Assert.Equal(background, bmp.GetPixel(25, 25)); + Assert.Equal(fill, bmp.GetPixel(35, 50)); } - [Test] + [Fact] public void SvgLoadsPolygon() { var path = Path.Combine(PathToImages, "sketch.svg"); @@ -77,35 +77,35 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = LoadSvgBitmap(path, background); - Assert.AreEqual(fill, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); - Assert.AreEqual(background, bmp.GetPixel(5, 5)); + Assert.Equal(fill, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); + Assert.Equal(background, bmp.GetPixel(5, 5)); } - [Test] + [Fact] public void SvgLoadsDashes() { var path = Path.Combine(PathToImages, "dashes.svg"); var bmp = LoadSvgBitmap(path, SKColors.White); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 3, 20)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 7, 20)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(10 + 13, 20)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 3, 20)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 7, 20)); + Assert.Equal(SKColors.White, bmp.GetPixel(10 + 13, 20)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 3, 40)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(10 + 7, 40)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 13, 40)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 3, 40)); + Assert.Equal(SKColors.White, bmp.GetPixel(10 + 7, 40)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 13, 40)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(10 + 3, 60)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 7, 60)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 13, 60)); + Assert.Equal(SKColors.White, bmp.GetPixel(10 + 3, 60)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 7, 60)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 13, 60)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 3, 80)); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(10 + 7, 80)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(10 + 13, 80)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 3, 80)); + Assert.Equal(SKColors.Black, bmp.GetPixel(10 + 7, 80)); + Assert.Equal(SKColors.White, bmp.GetPixel(10 + 13, 80)); } - [Test] + [Fact] public void SvgCanvasCreatesValidDrawing() { using (var stream = new MemoryStream()) @@ -133,27 +133,27 @@ namespace SkiaSharp.Extended.Svg.Tests var ns = (XNamespace)"http://www.w3.org/2000/svg"; - Assert.AreEqual(ns, svg.GetDefaultNamespace()); - Assert.AreEqual("200", svg.Attribute("width").Value); - Assert.AreEqual("150", svg.Attribute("height").Value); + Assert.Equal(ns, svg.GetDefaultNamespace()); + Assert.Equal("200", svg.Attribute("width").Value); + Assert.Equal("150", svg.Attribute("height").Value); var rect = svg.Element(ns + "rect"); - Assert.AreEqual("rgb(0,0,255)", rect.Attribute("fill").Value); - Assert.AreEqual("50", rect.Attribute("x").Value); - Assert.AreEqual("70", rect.Attribute("y").Value); - Assert.AreEqual("100", rect.Attribute("width").Value); - Assert.AreEqual("30", rect.Attribute("height").Value); + Assert.Equal("rgb(0,0,255)", rect.Attribute("fill").Value); + Assert.Equal("50", rect.Attribute("x").Value); + Assert.Equal("70", rect.Attribute("y").Value); + Assert.Equal("100", rect.Attribute("width").Value); + Assert.Equal("30", rect.Attribute("height").Value); var ellipse = svg.Element(ns + "ellipse"); - Assert.AreEqual("rgb(255,0,0)", ellipse.Attribute("fill").Value); - Assert.AreEqual("100", ellipse.Attribute("cx").Value); - Assert.AreEqual("85", ellipse.Attribute("cy").Value); - Assert.AreEqual("50", ellipse.Attribute("rx").Value); - Assert.AreEqual("15", ellipse.Attribute("ry").Value); + Assert.Equal("rgb(255,0,0)", ellipse.Attribute("fill").Value); + Assert.Equal("100", ellipse.Attribute("cx").Value); + Assert.Equal("85", ellipse.Attribute("cy").Value); + Assert.Equal("50", ellipse.Attribute("rx").Value); + Assert.Equal("15", ellipse.Attribute("ry").Value); } } - [Test] + [Fact] public void SvgCanUnderstandColorNames() { var svg = @@ -164,10 +164,10 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = CreateSvgBitmap(svg); - Assert.AreEqual(SKColors.Lime, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); + Assert.Equal(SKColors.Lime, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); } - [Test] + [Fact] public void SvgCanUnderstandRgbColors() { var svg = @@ -178,20 +178,20 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = CreateSvgBitmap(svg); - Assert.AreEqual(SKColors.Lime, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); + Assert.Equal(SKColors.Lime, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); } - [Test] + [Fact] public void RectWithSingleCornerRadius() { var check = new Action(svg => { var bmp = CreateSvgBitmap(svg, SKColors.White); - Assert.AreEqual(SKColors.White, bmp.GetPixel(3, 3)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(97, 3)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(3, 97)); - Assert.AreEqual(SKColors.White, bmp.GetPixel(97, 97)); + Assert.Equal(SKColors.White, bmp.GetPixel(3, 3)); + Assert.Equal(SKColors.White, bmp.GetPixel(97, 3)); + Assert.Equal(SKColors.White, bmp.GetPixel(3, 97)); + Assert.Equal(SKColors.White, bmp.GetPixel(97, 97)); }); check( @@ -213,7 +213,7 @@ namespace SkiaSharp.Extended.Svg.Tests "); } - [Test] + [Fact] public void SvgCanUnderstandPolygon() { var svg = @@ -224,10 +224,10 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = CreateSvgBitmap(svg); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(50, 70)); + Assert.Equal(SKColors.Black, bmp.GetPixel(50, 70)); } - [Test] + [Fact] public void SvgCanUnderstandPolyline() { var svg = @@ -238,10 +238,10 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = CreateSvgBitmap(svg, SKColors.Green); - Assert.AreEqual(SKColors.Green, bmp.GetPixel(50, 70)); + Assert.Equal(SKColors.Green, bmp.GetPixel(50, 70)); } - [Test] + [Fact] public void SvgStylesAreAlsoUsed() { var path = Path.Combine(PathToImages, "issues-22.svg"); @@ -250,10 +250,10 @@ namespace SkiaSharp.Extended.Svg.Tests svg.Load(path); var bmp = CreateBitmap(svg, SKColors.White); - Assert.AreEqual(SKColors.White, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); + Assert.Equal(SKColors.White, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); } - [Test] + [Fact] public void SvgCanReadFileWithNoXLinkNamespacePrefix() { var path = Path.Combine(PathToImages, "issues-8.svg"); @@ -264,11 +264,11 @@ namespace SkiaSharp.Extended.Svg.Tests svg.Load(path); var bmp = CreateBitmap(svg, background); - Assert.AreEqual(fill, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); - Assert.AreEqual(background, bmp.GetPixel(5, 5)); + Assert.Equal(fill, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); + Assert.Equal(background, bmp.GetPixel(5, 5)); } - [Test] + [Fact] public void SvgCanReadFileWithNoXLinkNamespacePrefixFromStreams() { var path = Path.Combine(PathToImages, "issues-8.svg"); @@ -283,12 +283,12 @@ namespace SkiaSharp.Extended.Svg.Tests var bmp = CreateBitmap(svg, background); - Assert.AreEqual(fill, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); - Assert.AreEqual(background, bmp.GetPixel(5, 5)); + Assert.Equal(fill, bmp.GetPixel(bmp.Width / 2, bmp.Height / 2)); + Assert.Equal(background, bmp.GetPixel(5, 5)); } - [Test] + [Fact] public void SvgRespectsClipPath() { var path = Path.Combine(PathToImages, "clipping.svg"); @@ -309,19 +309,19 @@ namespace SkiaSharp.Extended.Svg.Tests { for (int y = 1; y < 20; y++) { - Assert.AreEqual(fill, bmp.GetPixel(x, y)); - Assert.AreEqual(background, bmp.GetPixel(x + 20, y + 20)); + Assert.Equal(fill, bmp.GetPixel(x, y)); + Assert.Equal(background, bmp.GetPixel(x + 20, y + 20)); } } } - [Test] + [Fact] public void SvgCanReadFileWithDTD() { var path = Path.Combine(PathToImages, "dtd.svg"); var bmp = LoadSvgBitmap(path, SKColors.Red); - Assert.AreEqual(SKColors.Black, bmp.GetPixel(50, 50)); + Assert.Equal(SKColors.Black, bmp.GetPixel(50, 50)); } private static SKBitmap LoadSvgBitmap(string svgPath, SKColor? background = null) diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKTest.cs b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKTest.cs index a1b2d65..a9368cf 100644 --- a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKTest.cs +++ b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SKTest.cs @@ -5,8 +5,8 @@ namespace SkiaSharp.Extended.Svg.Tests { public abstract class SKTest { - protected static readonly string PathToAssembly = Path.GetDirectoryName(typeof(SKTest).GetTypeInfo().Assembly.Location); - protected static readonly string PathToFonts = Path.Combine(PathToAssembly, "fonts"); - protected static readonly string PathToImages = Path.Combine(PathToAssembly, "images"); + //protected static readonly string PathToAssembly = Path.GetDirectoryName(typeof(SKTest).GetTypeInfo().Assembly.Location); + protected static readonly string PathToFonts = Path.Combine("fonts"); + protected static readonly string PathToImages = Path.Combine("images"); } } diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SkiaSharp.Extended.Svg.Tests.csproj b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SkiaSharp.Extended.Svg.Tests.csproj deleted file mode 100644 index 9d8560a..0000000 --- a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests/SkiaSharp.Extended.Svg.Tests.csproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Debug - AnyCPU - {524491E8-1481-442F-9286-8D00BF807065} - Library - Properties - SkiaSharp.Extended.Svg.Tests - SkiaSharp.Extended.Svg.Tests - v4.5 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - {04C4399A-6740-4733-B6B7-F968232A76C8} - SkiaSharp.Extended.Svg - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.sln b/SkiaSharp.Extended/SkiaSharp.Extended.sln similarity index 61% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.sln rename to SkiaSharp.Extended/SkiaSharp.Extended.sln index 41f208d..04c3252 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.sln +++ b/SkiaSharp.Extended/SkiaSharp.Extended.sln @@ -1,26 +1,27 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 +VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{E4C866CF-F3C0-4893-8AD3-AB095536D054}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Tests", "tests\SkiaSharp.Extended.Tests.csproj", "{524491E8-1481-442F-9286-8D00BF807065}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended", "source\SkiaSharp.Extended.csproj", "{E646B59D-2F9F-4FCE-964B-71680BF7F463}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0C2C7-732B-4A5C-A4F2-55655D147866}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{D3D0D6EA-99FE-4C5B-AD21-31E6332F0199}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Extended.Svg.Shared", "..\source\SkiaSharp.Extended.Svg.Shared\SkiaSharp.Extended.Svg.Shared.shproj", "{B201E760-DB91-485C-A99A-814BDED90BDB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.NetStandard", "..\source\SkiaSharp.Extended.Svg.NetStandard\SkiaSharp.Extended.Svg.NetStandard.csproj", "{52E0EC39-9125-41B1-97CB-87896F4AF909}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\source\SkiaSharp.Extended.Svg.Shared\SkiaSharp.Extended.Svg.Shared.projitems*{b201e760-db91-485c-a99a-814bded90bdb}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -36,30 +37,78 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|ARM.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhone.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x64.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x64.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x86.ActiveCfg = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Debug|x86.Build.0 = Debug|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|Any CPU.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|ARM.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|ARM.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhone.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhone.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x64.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x64.Build.0 = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x86.ActiveCfg = Release|Any CPU - {E4C866CF-F3C0-4893-8AD3-AB095536D054}.Release|x86.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|ARM.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|ARM.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhone.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x64.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x64.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x86.ActiveCfg = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Debug|x86.Build.0 = Debug|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|ARM.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|ARM.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhone.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhone.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x64.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x64.Build.0 = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x86.ActiveCfg = Release|Any CPU + {524491E8-1481-442F-9286-8D00BF807065}.Release|x86.Build.0 = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|ARM.Build.0 = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|iPhone.Build.0 = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|x64.ActiveCfg = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|x64.Build.0 = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|x86.ActiveCfg = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Debug|x86.Build.0 = Debug|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|Any CPU.Build.0 = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|ARM.ActiveCfg = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|ARM.Build.0 = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|iPhone.ActiveCfg = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|iPhone.Build.0 = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|x64.ActiveCfg = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|x64.Build.0 = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|x86.ActiveCfg = Release|Any CPU + {E646B59D-2F9F-4FCE-964B-71680BF7F463}.Release|x86.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|ARM.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhone.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x64.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x64.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x86.ActiveCfg = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Debug|x86.Build.0 = Debug|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|Any CPU.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|ARM.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|ARM.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhone.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhone.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x64.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x64.Build.0 = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x86.ActiveCfg = Release|Any CPU + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F}.Release|x86.Build.0 = Release|Any CPU {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B960D09-426D-4D5A-90AC-8971D255E48F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -168,32 +217,19 @@ Global {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.ActiveCfg = Release|x86 {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Build.0 = Release|x86 {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}.Release|x86.Deploy.0 = Release|x86 - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|ARM.ActiveCfg = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|ARM.Build.0 = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|iPhone.Build.0 = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|x64.ActiveCfg = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|x64.Build.0 = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|x86.ActiveCfg = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Debug|x86.Build.0 = Debug|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|Any CPU.Build.0 = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|ARM.ActiveCfg = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|ARM.Build.0 = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|iPhone.ActiveCfg = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|iPhone.Build.0 = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|x64.ActiveCfg = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|x64.Build.0 = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|x86.ActiveCfg = Release|Any CPU - {52E0EC39-9125-41B1-97CB-87896F4AF909}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A2563433-9CE0-42ED-BB51-640A0FFA9D0F} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} = {51B0C2C7-732B-4A5C-A4F2-55655D147866} + {9B960D09-426D-4D5A-90AC-8971D255E48F} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {C9938859-CB05-4AAD-909A-8118F3D6B47A} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {F9CC0B31-7A41-46A6-9A23-EECF765F4E2C} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + {108D8FA2-92DB-4D6F-8E94-1C138CFC15E8} = {D3D0D6EA-99FE-4C5B-AD21-31E6332F0199} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {08D78153-5DD7-4C52-A348-46AA448B2CFC} + EndGlobalSection EndGlobal diff --git a/SkiaSharp.Extended/build.cake b/SkiaSharp.Extended/build.cake deleted file mode 100644 index b3f0aaa..0000000 --- a/SkiaSharp.Extended/build.cake +++ /dev/null @@ -1,73 +0,0 @@ -#load "../common.cake" - -var target = Argument("target", "Default"); -var configuration = Argument("configuration", "Release"); -var verbosity = Argument("verbosity", "Verbose"); - -var buildSpec = new BuildSpec { - Libs = new ISolutionBuilder [] { - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, - SolutionPath = "./source/SkiaSharp.Extended.sln", - Configuration = configuration, - OutputFiles = new [] { - new OutputFileCopy { - FromFile = "./source/SkiaSharp.Extended/bin/Release/SkiaSharp.Extended.dll", - ToDirectory = "./output/portable" - }, - new OutputFileCopy { - FromFile = "./source/SkiaSharp.Extended.NetStandard/bin/Release/SkiaSharp.Extended.dll", - ToDirectory = "./output/netstandard" - }, - }, - PostBuildAction = () => { - SignAssembly("./source/SkiaSharp.Extended/bin/Release/SkiaSharp.Extended.dll", "../keys/mono.snk"); - SignAssembly("./source/SkiaSharp.Extended.NetStandard/bin/Release/SkiaSharp.Extended.dll", "../keys/mono.snk"); - }, - }, - }, - - Samples = new ISolutionBuilder [] { - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Windows, - SolutionPath = "./samples/SkiaSharpDemo.sln" - }, - new DefaultSolutionBuilder { - AlwaysUseMSBuild = true, - BuildsOn = BuildPlatforms.Mac, - Platform = "iPhone", - SolutionPath = "./samples/SkiaSharpDemo.sln" - }, - }, - - NuGets = new [] { - new NuGetInfo { NuSpec = "./nuget/SkiaSharp.Extended.nuspec" }, - }, -}; - -Task("tests") - .IsDependentOn("libs") - .Does(() => -{ - // build the tests - NuGetRestore("./tests/SkiaSharp.Extended.Tests.sln"); - MSBuild("./tests/SkiaSharp.Extended.Tests.sln", settings => settings.SetConfiguration(configuration)); - - // run the tests - NUnit3("./tests/**/bin/" + configuration + "/*.Tests.dll", new NUnit3Settings { - Results = "./output/TestResult.xml", - ResultFormat = "nunit2", - }); -}); - -Task("Default") - .IsDependentOn("libs") - .IsDependentOn("nuget") - .IsDependentOn("tests") - .IsDependentOn("samples"); - -SetupXamarinBuildTasks (buildSpec, Tasks, Task); - -RunTarget(target); diff --git a/SkiaSharp.Extended/nuget/SkiaSharp.Extended.nuspec b/SkiaSharp.Extended/nuget/SkiaSharp.Extended.nuspec deleted file mode 100644 index 912b27f..0000000 --- a/SkiaSharp.Extended/nuget/SkiaSharp.Extended.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - SkiaSharp.Extended - SkiaSharp.Extended - 1.60.0 - Xamarin Inc. - Xamarin Inc. - false - This package adds many additional features and utilities for use with SkiaSharp. - Copyright (c) Xamarin Inc. 2016 - https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE.md - https://github.com/mono/SkiaSharp.Extended - https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest index 60f49b4..0b38ce8 100644 --- a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest +++ b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest @@ -1,48 +1,27 @@  - - - - - - - + + + SkiaSharpDemo.UWP - mattl + Xamarin Inc. Assets\StoreLogo.png - - - + - - - - + + + + - diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj index a29655c..56e100a 100644 --- a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj +++ b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj @@ -17,7 +17,8 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Windows_TemporaryKey.pfx + ..\..\..\..\keys\UWP_App_Key.pfx + B78C3BAF61B65EE64B6B4EDB0B18039E968078B2 true @@ -114,7 +115,7 @@ Designer - + diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj index 7e85012..2360a8b 100644 --- a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj +++ b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj @@ -19,7 +19,7 @@ - + diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/Properties/AssemblyInfo.cs b/SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f28270..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/SkiaSharp.Extended.NetStandard.csproj b/SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/SkiaSharp.Extended.NetStandard.csproj deleted file mode 100644 index dbe4ef1..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended.NetStandard/SkiaSharp.Extended.NetStandard.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - netstandard1.3 - library - SkiaSharp.Extended - SkiaSharp.Extended - False - False - 1.6.0 - - - true - true - ..\..\..\keys\mono.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/Properties/SkiaSharpExtendedAssemblyInfo.cs b/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/Properties/SkiaSharpExtendedAssemblyInfo.cs deleted file mode 100644 index 37fc965..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/Properties/SkiaSharpExtendedAssemblyInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("SkiaSharp.Extended")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SkiaSharp.Extended")] -[assembly: AssemblyCopyright("Copyright (c) 2017 Xamarin, Inc.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.60.0.0")] -[assembly: AssemblyFileVersion("1.60.0.0")] -[assembly: AssemblyInformationalVersion("1.60.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.projitems b/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.projitems deleted file mode 100644 index cdda815..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - e3290ce6-0ada-486b-9bab-8bcf07f9be45 - - - SkiaSharp.Extended - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.shproj b/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.shproj deleted file mode 100644 index 629fe1e..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended.Shared/SkiaSharp.Extended.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - e3290ce6-0ada-486b-9bab-8bcf07f9be45 - 14.0 - - - - - - - - diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.csproj b/SkiaSharp.Extended/source/SkiaSharp.Extended.csproj new file mode 100644 index 0000000..5cd8bf8 --- /dev/null +++ b/SkiaSharp.Extended/source/SkiaSharp.Extended.csproj @@ -0,0 +1,56 @@ + + + + netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8 + SkiaSharp.Extended + SkiaSharp.Extended + 1.60.0.0 + 1.60.0.0 + 1.60.0 + $(AssemblyName) ($(TargetFramework)) + en + $(DefineConstants); + mono.snk + + + + SkiaSharp.Extended + SkiaSharp.Extended + $(Version)-$(VersionSuffix) + Xamarin Inc. + microsoft,Xamarin,XamarinNuGet + true + This package adds many additional features and utilities for use with SkiaSharp. + © Microsoft Corporation. All rights reserved. + https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png + xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform skiasharp + https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE + https://github.com/mono/SkiaSharp.Extended + https://github.com/mono/SkiaSharp.Extended + + + + $(DefineConstants);NET_STANDARD; + + + + $(DefineConstants);PORTABLE; + + + + full + true + + + pdbonly + + + + + + + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended.sln b/SkiaSharp.Extended/source/SkiaSharp.Extended.sln deleted file mode 100644 index 2140b01..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended.sln +++ /dev/null @@ -1,36 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Extended", "SkiaSharp.Extended\SkiaSharp.Extended.csproj", "{FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Extended.Shared", "SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.shproj", "{E3290CE6-0ADA-486B-9BAB-8BCF07F9BE45}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.NetStandard", "SkiaSharp.Extended.NetStandard\SkiaSharp.Extended.NetStandard.csproj", "{1B4196C6-A892-4D3E-B3E7-FD0D3BF949FB}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.projitems*{e3290ce6-0ada-486b-9bab-8bcf07f9be45}*SharedItemsImports = 13 - SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.projitems*{fea1fec9-950c-46c0-9eb0-a515e0ab8f19}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Release|Any CPU.Build.0 = Release|Any CPU - {1B4196C6-A892-4D3E-B3E7-FD0D3BF949FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B4196C6-A892-4D3E-B3E7-FD0D3BF949FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B4196C6-A892-4D3E-B3E7-FD0D3BF949FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B4196C6-A892-4D3E-B3E7-FD0D3BF949FB}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E7CE57DC-513C-47B5-BBCC-416C92847868} - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended/Properties/AssemblyInfo.cs b/SkiaSharp.Extended/source/SkiaSharp.Extended/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f28270..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/SkiaSharp.Extended/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj b/SkiaSharp.Extended/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj deleted file mode 100644 index b87e7ea..0000000 --- a/SkiaSharp.Extended/source/SkiaSharp.Extended/SkiaSharp.Extended.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - 14.0 - Debug - AnyCPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19} - Library - Properties - SkiaSharp.Extended - SkiaSharp.Extended - en-US - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile78 - v4.5 - true - ..\..\..\keys\mono.snk - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj new file mode 100644 index 0000000..b016e73 --- /dev/null +++ b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj @@ -0,0 +1,29 @@ + + + + net47 + false + x86 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.sln b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.sln deleted file mode 100644 index df4e443..0000000 --- a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.12 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Extended.Tests", "SkiaSharp.Extended.Tests\SkiaSharp.Extended.Tests.csproj", "{524491E8-1481-442F-9286-8D00BF807065}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Extended.Shared", "..\source\SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.shproj", "{E3290CE6-0ADA-486B-9BAB-8BCF07F9BE45}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Extended", "..\source\SkiaSharp.Extended\SkiaSharp.Extended.csproj", "{FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\source\SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.projitems*{e3290ce6-0ada-486b-9bab-8bcf07f9be45}*SharedItemsImports = 13 - ..\source\SkiaSharp.Extended.Shared\SkiaSharp.Extended.Shared.projitems*{fea1fec9-950c-46c0-9eb0-a515e0ab8f19}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {524491E8-1481-442F-9286-8D00BF807065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {524491E8-1481-442F-9286-8D00BF807065}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA1FEC9-950C-46C0-9EB0-A515E0AB8F19}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/Properties/AssemblyInfo.cs b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index d30a168..0000000 --- a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SkiaSharp.Extended.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SkiaSharp.Extended.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("524491e8-1481-442f-9286-8d00bf807065")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SKGeometryTest.cs b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SKGeometryTest.cs index c0c161e..afde649 100644 --- a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SKGeometryTest.cs +++ b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SKGeometryTest.cs @@ -1,18 +1,18 @@ -using NUnit.Framework; +using Xunit; namespace SkiaSharp.Extended.Tests { public class SKGeometryTest { - [Test] + [Fact] public void GeometryGeneratesRectPath() { var rectPath = SKGeometry.CreateTrianglePath(100); - Assert.AreEqual(3, rectPath.PointCount); + Assert.Equal(3, rectPath.PointCount); } - [Test] + [Fact] public void TriangleAreaCalculation() { var points = new[] @@ -23,10 +23,10 @@ namespace SkiaSharp.Extended.Tests }; var area = SKGeometry.Area(points); - Assert.AreEqual(50f, area); + Assert.Equal(50f, area); } - [Test] + [Fact] public void RectangleAreaCalculation() { var points = new[] @@ -38,10 +38,10 @@ namespace SkiaSharp.Extended.Tests }; var area = SKGeometry.Area(points); - Assert.AreEqual(200f, area); + Assert.Equal(200f, area); } - [Test] + [Fact] public void PerimeterCalculation() { var points = new[] @@ -52,38 +52,38 @@ namespace SkiaSharp.Extended.Tests }; var perimeter = SKGeometry.Perimeter(points); - Assert.AreEqual(120f, perimeter); + Assert.Equal(120f, perimeter); } - [Test] + [Fact] public void DistanceCalculation() { var dist = SKGeometry.Distance(new SKPoint(10, 10), new SKPoint(10, 40)); - Assert.AreEqual(30f, dist); + Assert.Equal(30f, dist); } - [Test] + [Fact] public void CreateInterpolationReturnsOriginals() { var path1 = new SKPath(); var path2 = new SKPath(); var interpolated = SKGeometry.CreateInterpolation(path1, path2, -1); - Assert.AreEqual(path1, interpolated); + Assert.Equal(path1, interpolated); interpolated = SKGeometry.CreateInterpolation(path1, path2, 0); - Assert.AreEqual(path1, interpolated); + Assert.Equal(path1, interpolated); interpolated = SKGeometry.CreateInterpolation(path1, path2, 0.5f); - Assert.AreNotEqual(path1, interpolated); - Assert.AreNotEqual(path2, interpolated); + Assert.NotEqual(path1, interpolated); + Assert.NotEqual(path2, interpolated); interpolated = SKGeometry.CreateInterpolation(path1, path2, 1); - Assert.AreEqual(path2, interpolated); + Assert.Equal(path2, interpolated); interpolated = SKGeometry.CreateInterpolation(path1, path2, 2); - Assert.AreEqual(path2, interpolated); + Assert.Equal(path2, interpolated); } } } diff --git a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj deleted file mode 100644 index 07e8840..0000000 --- a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - - Debug - AnyCPU - {524491E8-1481-442F-9286-8D00BF807065} - Library - Properties - SkiaSharp.Extended.Tests - SkiaSharp.Extended.Tests - v4.5 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - {fea1fec9-950c-46c0-9eb0-a515e0ab8f19} - SkiaSharp.Extended - - - - - - - \ No newline at end of file diff --git a/build.cake b/build.cake deleted file mode 100644 index 4f7b2c7..0000000 --- a/build.cake +++ /dev/null @@ -1,282 +0,0 @@ -#addin nuget:?package=Cake.Xamarin.Build&version=1.1.14 -#addin nuget:?package=Cake.FileHelpers&version=1.0.4 -#addin nuget:?package=Cake.Yaml&version=1.0.3.7 -#addin nuget:?package=Cake.Json&version=1.0.2.13 - -var TARGET = Argument ("target", Argument ("t", Argument ("Target", "build"))); - -var GIT_PREVIOUS_COMMIT = EnvironmentVariable ("GIT_PREVIOUS_SUCCESSFUL_COMMIT") ?? Argument ("gitpreviouscommit", ""); -var GIT_COMMIT = EnvironmentVariable ("GIT_COMMIT") ?? Argument("gitcommit", ""); -var GIT_BRANCH = EnvironmentVariable ("GIT_BRANCH") ?? "origin/master"; -var GIT_PATH = EnvironmentVariable ("GIT_EXE") ?? (IsRunningOnWindows () ? "C:\\Program Files (x86)\\Git\\bin\\git.exe" : "git"); - -var BUILD_GROUPS = DeserializeYamlFromFile> ("./manifest.yaml"); -var BUILD_NAMES = Argument ("names", Argument ("name", Argument ("n", ""))) - .Split (new [] { ",", ";" }, StringSplitOptions.RemoveEmptyEntries); -var BUILD_TARGETS = Argument ("targets", Argument ("build-targets", Argument ("build-targets", Argument ("build", "")))) - .Split (new [] { ",", ";" }, StringSplitOptions.RemoveEmptyEntries); - - -var FORCE_BUILD = Argument ("force", Argument ("forcebuild", Argument ("force-build", "false"))).ToLower ().Equals ("true"); - -// Print out environment variables to console -var ENV_VARS = EnvironmentVariables (); -Information ("Environment Variables: {0}", ""); -foreach (var ev in ENV_VARS) - Information ("\t{0} = {1}", ev.Key, ev.Value); - -CakeStealer.CakeContext = Context; - -// From Cake.Xamarin.Build, dumps out versions of things -LogSystemInfo (); - -// Print out git commit info -Information ("Git Path: {0}", GIT_PATH); -Information ("Git Previous Commit: {0}", GIT_PREVIOUS_COMMIT); -Information ("Git Commit: {0}", GIT_COMMIT); -Information ("Force Build: {0}", FORCE_BUILD); - -public class CakeStealer -{ - static public ICakeContext CakeContext { get; set; } -} - -FilePath GetCakeToolPath () -{ - var possibleExe = GetFiles ("./**/tools/Cake/Cake.exe").FirstOrDefault (); - - if (possibleExe != null) - return possibleExe; - - var p = System.Diagnostics.Process.GetCurrentProcess (); - return new FilePath (p.Modules[0].FileName); -} - -void BuildSingleGroup (BuildGroup buildGroup) -{ - foreach (var target in buildGroup.BuildTargets) { - // TODO: Actually build this thing - var cakeSettings = new CakeSettings { - ToolPath = GetCakeToolPath (), - Arguments = new Dictionary { - { "target", target }, - { "configuration", CakeStealer.CakeContext.Arguments.GetArgument("configuration") }, - { "verbosity", CakeStealer.CakeContext.Arguments.GetArgument("verbosity") }, - } - }; - - // Run the script from the subfolder - CakeExecuteScript (buildGroup.BuildScript, cakeSettings); - } -} - -IEnumerable ExecuteProcess (string file, string args) -{ - IEnumerable stdout; - StartProcess (file, new ProcessSettings { - Arguments = args, - RedirectStandardOutput = true }, - out stdout); - - return stdout; -} - -void BuildGroups (List buildGroups, List names, List buildTargets, string gitPath, string gitBranch, string gitPreviousCommit, string gitCommit, bool forceBuild) -{ - bool runningOnMac = IsRunningOnUnix (); - bool runningOnWin = IsRunningOnWindows (); - - var groupsToBuild = new List (); - - if (!forceBuild) { - // If neither commit hash was found, we can't detect changes - if (string.IsNullOrWhiteSpace (gitPreviousCommit) && string.IsNullOrWhiteSpace (gitCommit)) - throw new CakeException ("GIT Commit/Previous Commit hashes were invalid, can't find affected files"); - - // Get all the changed files in this commit - IEnumerable changedFiles = new List (); - - if (!string.IsNullOrWhiteSpace (gitPreviousCommit)) { - // We have both commit hashes (previous and current) so do a diff on them - changedFiles = ExecuteProcess (gitPath, "--no-pager diff --name-only " + gitPreviousCommit + " " + gitCommit); - - // // TODO: This should be fixed in cake 0.7.0, right now it may hang on output - // StartProcess (gitPath, new ProcessSettings { - // Arguments = "--no-pager diff --name-only " + gitPreviousCommit + " " + gitCommit, - // RedirectStandardOutput = true, - // }, out changedFiles); - } else { - // We only have the current commit hash, so list files for this commit only - changedFiles = ExecuteProcess (gitPath, "--no-pager show --pretty=\"format:\" --name-only " + gitCommit); - - // // TODO: This should be fixed in cake 0.7.0, right now it may hang on output - // StartProcess (gitPath, new ProcessSettings { - // Arguments = "--no-pager show --pretty=\"format:\" --name-only " + gitCommit, - // RedirectStandardOutput = true, - // }, out changedFiles); - } - - Information ("Changed Files:"); - foreach (var file in changedFiles) { - Information ("\t{0}", file); - - foreach (var buildGroup in buildGroups) { - // If ignore triggers for the platform this is running on, do not add the group even if the trigger is matched - if ((buildGroup.IgnoreTriggersOnMac && runningOnMac) || (buildGroup.IgnoreTriggersOnWindows && runningOnWin)) - continue; - - foreach (var triggerPath in buildGroup.TriggerPaths) { - if (file.StartsWith (triggerPath.ToString ())) { - Information ("\t\tMatched: {0}", triggerPath); - if (!groupsToBuild.Contains (buildGroup)) - groupsToBuild.Add (buildGroup); - break; - } - } - foreach (var triggerFile in buildGroup.TriggerFiles) { - if (file.Equals (triggerFile.ToString ())) { - Information ("\t\tMatched: {0}", triggerFile); - if (!groupsToBuild.Contains (buildGroup)) - groupsToBuild.Add (buildGroup); - break; - } - } - } - } - } else { - Information ("Groups To Build: {0}", string.Join (", ", buildGroups)); - groupsToBuild.AddRange (buildGroups); - } - - // If a filter was specified use it - if (names != null && names.Any (n => !string.IsNullOrWhiteSpace (n))) { - Information ("Only building groups: {0}", string.Join (",", names)); - groupsToBuild = groupsToBuild.Where (bg => names.Any (n => n.ToLower ().Trim () == bg.Name.ToLower ().Trim ())).ToList (); - } - - if (groupsToBuild.Any ()) { - - // Logging about the jobs and what platforms they can run on - Information ("Running On: Mac? {0} Win? {1}", runningOnMac, runningOnWin); - foreach (var gtb in groupsToBuild) - Information ("{0} Build on: Mac? {1} Win? {2}", gtb.Name, gtb.BuildOnMac, gtb.BuildOnWindows); - - groupsToBuild = groupsToBuild.Where (bg => (bg.BuildOnMac && runningOnMac) || (bg.BuildOnWindows && runningOnWin)).ToList (); - - - // Replace build targets with custom specified build targets if any were specified - if (buildTargets != null && buildTargets.Any (bt => !string.IsNullOrWhiteSpace (bt))) { - foreach (var buildGroup in groupsToBuild) { - buildGroup.BuildTargets.Clear (); - buildGroup.BuildTargets.AddRange (buildTargets); - } - } - - if (!DirectoryExists ("./output/")) - CreateDirectory ("./output/"); - - // Write out some build information - SerializeJsonToFile ("./output/buildinfo.json", new BuildInfo { - BuiltGroups = groupsToBuild, - ManifestGroups = buildGroups - }); - - var groupsNameList = string.Join (", ", from gtb in groupsToBuild select gtb.Name); - if (groupsNameList.Length > 100) - groupsNameList = groupsNameList.Substring (0, 97) + "..."; - - var branchInfo = ""; - if (gitBranch != "origin/master") - branchInfo = " (" + gitBranch + ")"; - - Information ("[BUILD_DESC]{0}{1}[/BUILD_DESC]", groupsNameList, branchInfo); - - foreach (var buildGroup in groupsToBuild) { - Information ("Building {0} with Targets {1}", buildGroup.Name, string.Join (",", buildGroup.BuildTargets)); - - BuildSingleGroup (buildGroup); - } - - } else { - Information ("No changed files affected any of the paths from the manifest.yaml! {0}", "Skipping Builds"); - } - - var artifacts = GetFiles ("./**/output/**/*"); - - Information ("Found Artifacts ({0})", artifacts.Count ()); - foreach (var a in artifacts) - Information ("{0}", a); - - var dlls = GetFiles ("./**/*.dll"); - - Information ("Found DLL's ({0})", dlls.Count ()); - foreach (var d in dlls) - Information ("{0}", d); -} - - -public class BuildInfo -{ - public List ManifestGroups { get; set; } - public List BuiltGroups { get; set; } -} - -public class BuildGroup -{ - public BuildGroup () - { - Name = string.Empty; - TriggerPaths = new List (); - TriggerFiles = new List (); - WindowsBuildTargets = new List (); - MacBuildTargets = new List (); - IgnoreTriggersOnMac = false; - IgnoreTriggersOnWindows = false; - } - - public string Name { get; set; } - public string BuildScript { get; set; } - public List TriggerPaths { get; set; } - public List TriggerFiles { get; set; } - public bool IgnoreTriggersOnMac { get; set; } - public bool IgnoreTriggersOnWindows { get; set; } - public List WindowsBuildTargets { get; set; } - public List MacBuildTargets { get; set; } - - public bool BuildOnWindows { get { return WindowsBuildTargets != null && WindowsBuildTargets.Any (); } } - public bool BuildOnMac { get { return MacBuildTargets != null && MacBuildTargets.Any (); } } - - public List BuildTargets { - get { - return CakeStealer.CakeContext.IsRunningOnWindows () ? WindowsBuildTargets : MacBuildTargets; - } - } - - public override string ToString () - { - return Name; - } -} - -Task ("build").Does (() => -{ - var buildTargets = new List (); - if (BUILD_TARGETS != null && BUILD_TARGETS.Any ()) - buildTargets.AddRange (BUILD_TARGETS); - - if (FileExists ("./output/buildinfo.json") && FORCE_BUILD) { - Information ("Found {0} from Upstream project, overriding build group names...", "./output/buildinfo.json"); - - GIT_PREVIOUS_COMMIT = ""; - GIT_COMMIT = ""; - - var buildInfo = DeserializeJsonFromFile ("./output/buildinfo.json"); - BUILD_NAMES = (from bg in buildInfo.BuiltGroups select bg.Name).ToArray (); - - Information ("Overriding build group names to: {0}", string.Join (", ", BUILD_NAMES)); - } - - BuildGroups (BUILD_GROUPS, BUILD_NAMES.ToList (), buildTargets, GIT_PATH, GIT_BRANCH, GIT_PREVIOUS_COMMIT, GIT_COMMIT, FORCE_BUILD); -}); - -RunTarget (TARGET); diff --git a/build.ps1 b/build.ps1 index e411bef..f896d4b 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,234 +1,83 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## +$ErrorActionPreference = "Stop" -<# +if (!$env:BUILD_NUMBER) { + $betaPrefix = "beta" +} else { + $betaPrefix = "beta-$env:BUILD_NUMBER" +} -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. +if ($IsMacOS) { + $msbuild = "msbuild" +} else { + $vswhere = 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' + $msbuild = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath + $msbuild = join-path $msbuild 'MSBuild\15.0\Bin\MSBuild.exe' +} -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER Experimental -Tells Cake to use the latest Roslyn release. -.PARAMETER WhatIf -Performs a dry run of the build script. -No tasks will be executed. -.PARAMETER Mono -Tells Cake to use the Mono scripting engine. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -http://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "build.cake", - [string]$Target = "Default", - [ValidateSet("Release", "Debug")] - [string]$Configuration = "Release", - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity = "Verbose", - [switch]$Experimental, - [Alias("DryRun","Noop")] - [switch]$WhatIf, - [switch]$Mono, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) +function Build { - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null + Param ([string] $solution, [string] $output) + + if ($IsMacOS) { + $extraProperties = "/p:Platform=iPhoneSimulator" } - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } + & $msbuild $solution /m /t:restore /p:Configuration=Release $extraProperties + if ($lastexitcode -ne 0) { exit $lastexitcode } + + & $msbuild $solution /m /t:build /p:Configuration=Release $extraProperties + if ($lastexitcode -ne 0) { exit $lastexitcode } } -Write-Host "Preparing to run build script..." +function Pack +{ + Param ([string] $project, [string] $output) -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent + & $msbuild $project /m /t:pack /p:Configuration=Release + if ($lastexitcode -ne 0) { exit $lastexitcode } + + & $msbuild $project /m /t:pack /p:Configuration=Release /p:VersionSuffix="$betaPrefix" + if ($lastexitcode -ne 0) { exit $lastexitcode } + + $dir = [System.IO.Path]::GetDirectoryName($project) + New-Item -Path "./output/$output" -ItemType Directory -Force | Out-Null + Copy-Item -Path "$dir/bin/Release" -Destination "./output/$output" -Recurse -Force } -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" -$CAKE_PACKAGES_CONFIG = Join-Path $PSScriptRoot "cake.packages.config" +function Test +{ + Param ([string] $project, [string] $output) -# Should we use mono? -$UseMono = ""; -if($Mono.IsPresent) { - Write-Verbose -Message "Using the Mono based scripting engine." - $UseMono = "-mono" + & $msbuild $project /m /t:test /p:Configuration=Release + if ($lastexitcode -ne 0) { exit $lastexitcode } + + $dir = [System.IO.Path]::GetDirectoryName($project) + New-Item -Path "./output/$output" -ItemType Directory -Force | Out-Null + Copy-Item -Path "$dir/bin/Release/net47/TestResult.xml" -Destination "./output/$output" -Force } -# Should we use the new Roslyn? -$UseExperimental = ""; -if($Experimental.IsPresent -and !($Mono.IsPresent)) { - Write-Verbose -Message "Using experimental version of Roslyn." - $UseExperimental = "-experimental" -} +Write-Output "MSBuild path: '$msbuild'" -# Is this a dry run? -$UseDryRun = ""; -if($WhatIf.IsPresent) { - $UseDryRun = "-dryrun" -} +Write-Output "Building SkiaSharp.Extended..." +Build "./SkiaSharp.Extended/SkiaSharp.Extended.sln" "SkiaSharp.Extended" +Pack "./SkiaSharp.Extended/source/SkiaSharp.Extended.csproj" "SkiaSharp.Extended" +Test "./SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj" "SkiaSharp.Extended" -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type directory | out-null -} +Write-Output "Building SkiaSharp.Extended.Iconify..." +Build "./SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj" "SkiaSharp.Extended.Iconify" +Pack "./SkiaSharp.Extended.Iconify/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj" "SkiaSharp.Extended.Iconify" -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - if (!(Test-Path $CAKE_PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch { - Throw "Could not download packages.config." - } - } else { - Write-Verbose -Message "using local cake.packages.config..." - Copy-Item $CAKE_PACKAGES_CONFIG $PACKAGES_CONFIG - } -} +Write-Output "Building SkiaSharp.Extended.Svg..." +Build "./SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln" "SkiaSharp.Extended.Svg" +Pack "./SkiaSharp.Extended.Svg/source/SkiaSharp.Extended.Svg.csproj" "SkiaSharp.Extended.Svg" +Test "./SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj" "SkiaSharp.Extended.Svg" -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG) - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,nuget.exe - } - - Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE \ No newline at end of file +exit $lastexitcode; \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100755 index 770ca6d..0000000 --- a/build.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env bash - -########################################################################## -# This is the Cake bootstrapper script for Linux and OS X. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -# Define directories. -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools -ADDINS_DIR=$TOOLS_DIR/addins -MODULES_DIR=$TOOLS_DIR/modules -NUGET_EXE=$TOOLS_DIR/nuget.exe -CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe -PACKAGES_CONFIG=$TOOLS_DIR/packages.config -PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum -ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config -MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config -CAKE_PACKAGES_CONFIG=$SCRIPT_DIR/cake.packages.config - -# Define md5sum or md5 depending on Linux/OSX -MD5_EXE= -if [[ "$(uname -s)" == "Darwin" ]]; then - MD5_EXE="md5 -r" -else - MD5_EXE="md5sum" -fi - -# Define default arguments. -SCRIPT="build.cake" -TARGET="Default" -CONFIGURATION="Release" -VERBOSITY="verbose" -DRYRUN= -SHOW_VERSION=false -SCRIPT_ARGUMENTS=() - -# Parse arguments. -for i in "$@"; do - case $1 in - -s|--script) SCRIPT="$2"; shift ;; - -t|--target) TARGET="$2"; shift ;; - -c|--configuration) CONFIGURATION="$2"; shift ;; - -v|--verbosity) VERBOSITY="$2"; shift ;; - -d|--dryrun) DRYRUN="-dryrun" ;; - --version) SHOW_VERSION=true ;; - --) shift; SCRIPT_ARGUMENTS+=("$@"); break ;; - *) SCRIPT_ARGUMENTS+=("$1") ;; - esac - shift -done - -# Make sure the tools folder exist. -if [ ! -d "$TOOLS_DIR" ]; then - mkdir "$TOOLS_DIR" -fi - -# Make sure that packages.config exist. -if [ ! -f "$PACKAGES_CONFIG" ]; then - if [ ! -f "$CAKE_PACKAGES_CONFIG" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$PACKAGES_CONFIG" http://cakebuild.net/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occured while downloading packages.config." - exit 1 - fi - else - echo "using local cake.packages.config..." - cp "$CAKE_PACKAGES_CONFIG" "$PACKAGES_CONFIG" - fi -fi - -# Download NuGet if it does not exist. -if [ ! -f "$NUGET_EXE" ]; then - echo "Downloading NuGet..." - curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - if [ $? -ne 0 ]; then - echo "An error occured while downloading nuget.exe." - exit 1 - fi -fi - -# Save nuget.exe path to environment to be available to child processed -export NUGET_EXE=$NUGET_EXE - -# Restore tools from NuGet. -pushd "$TOOLS_DIR" >/dev/null -if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then - find . -type d ! -name . | xargs rm -rf -fi - -mono "$NUGET_EXE" install -ExcludeVersion -if [ $? -ne 0 ]; then - echo "Could not restore NuGet tools." - exit 1 -fi - -$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5" - -popd >/dev/null - -# Restore addins from NuGet. -if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then - pushd "$ADDINS_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet addins." - exit 1 - fi - - popd >/dev/null -fi - -# Restore modules from NuGet. -if [ -f "$MODULES_PACKAGES_CONFIG" ]; then - pushd "$MODULES_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet modules." - exit 1 - fi - - popd >/dev/null -fi - -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -# Start Cake -if $SHOW_VERSION; then - exec mono "$CAKE_EXE" -version -else - exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" -fi \ No newline at end of file diff --git a/cake.packages.config b/cake.packages.config deleted file mode 100644 index 22b8e0c..0000000 --- a/cake.packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/common.cake b/common.cake deleted file mode 100644 index 2afbaec..0000000 --- a/common.cake +++ /dev/null @@ -1,115 +0,0 @@ -#addin nuget:?package=Cake.XCode&version=2.0.13 -#addin nuget:?package=Cake.FileHelpers&version=1.0.4 -#addin nuget:?package=Cake.Xamarin&version=1.3.0.15 -#addin nuget:?package=Cake.Xamarin.Build&version=1.1.14 - -#tool nuget:?package=XamarinComponent&version=1.1.0.60 -#tool nuget:?package=NUnit.ConsoleRunner&version=3.6.1 -#tool nuget:?package=NUnit.Extension.NUnitV2ResultWriter&version=3.5.0 - -using System.Runtime.InteropServices; - -internal static class MacPlatformDetector -{ - internal static readonly Lazy IsMac = new Lazy(IsRunningOnMac); - - [DllImport("libc")] - static extern int uname(IntPtr buf); - - static bool IsRunningOnMac() - { - IntPtr buf = IntPtr.Zero; - try { - buf = Marshal.AllocHGlobal(8192); - // This is a hacktastic way of getting sysname from uname() - if (uname(buf) == 0) { - string os = Marshal.PtrToStringAnsi(buf); - if (os == "Darwin") - return true; - } - } catch { - } finally { - if (buf != IntPtr.Zero) - Marshal.FreeHGlobal(buf); - } - return false; - } -} - -bool IsRunningOnMac() -{ - return System.Environment.OSVersion.Platform == PlatformID.MacOSX || MacPlatformDetector.IsMac.Value; -} - -bool IsRunningOnLinux() -{ - return IsRunningOnUnix() && !IsRunningOnMac(); -} - -var RunProcess = new Action((process, settings) => -{ - var result = StartProcess(process, settings); - if (result != 0) { - throw new Exception("Process '" + process + "' failed with error: " + result); - } -}); - -var GetSNToolPath = new Func((possible) => -{ - if (string.IsNullOrEmpty(possible)) { - if (IsRunningOnLinux()) { - possible = "/usr/lib/mono/4.5/sn.exe"; - } else if (IsRunningOnMac()) { - possible = "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/sn.exe"; - } else if (IsRunningOnWindows()) { - // search through all the SDKs to find the latest - var snExes = new List(); - var arch = Environment.Is64BitOperatingSystem ? "x64" : ""; - var progFiles = (DirectoryPath)Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86); - var dirPath = progFiles.Combine("Microsoft SDKs/Windows").FullPath + "/v*A"; - var dirs = GetDirectories(dirPath).OrderBy(d => { - var version = d.GetDirectoryName(); - return double.Parse(version.Substring(1, version.Length - 2)); - }); - foreach (var dir in dirs) { - var path = dir.FullPath + "/bin/*/" + arch + "/sn.exe"; - var files = GetFiles(path).Select(p => p.FullPath).ToList(); - files.Sort(); - snExes.AddRange(files); - } - - possible = snExes.LastOrDefault(); - } - } - return possible; -}); - -var SNToolPath = GetSNToolPath(EnvironmentVariable("SN_EXE")); - -var RunSNVerify = new Action((assembly) => -{ - RunProcess(SNToolPath, new ProcessSettings { - Arguments = string.Format("-vf \"{0}\"", MakeAbsolute(assembly)), - }); -}); - -var RunSNReSign = new Action((assembly, key) => -{ - RunProcess(SNToolPath, new ProcessSettings { - Arguments = string.Format("-R \"{0}\" \"{1}\"", MakeAbsolute(assembly), MakeAbsolute(key)), - }); -}); - -var SignAssembly = new Action((file, key) => -{ - Information("Making sure that '{0}' is signed.", file); - RunSNReSign(MakeAbsolute(file), MakeAbsolute(key)); - RunSNVerify(MakeAbsolute(file)); -}); - -var SignAssemblies = new Action((files, key) => -{ - foreach (var f in GetFiles(files)) { - SignAssembly(f, key); - } -}); diff --git a/keys/UWP_App_Key.pfx b/keys/UWP_App_Key.pfx new file mode 100644 index 0000000000000000000000000000000000000000..6a5c17229b59999e768cb021c5f1486ca479cea7 GIT binary patch literal 2520 zcmZXVc|6ox8^C{NhB2nbHp2}yN=%Y#EXkUh78==_>}4m4tjQ?b*hM4UY+0fyV|No} zUn&V16vjR%`!aEBV&eUEKks|r&--~l=ksje^E~G~|D5OGDTt2{9w?rINajNvjWLM% zzLy8ilTSfJz$l0i5R>r~-mU-H;$4DKc;`So1Ii>H^50c^1b86%6xa@)0^7n%@d^9~ zgNLJF{0+N%UphS@3PT`p28;q5ek;o$-X&I}sJ-z-te4DPfugplp999b!&?#DXy&A+ zL6z*uT9)n@$E%+6*_#bCG8||F79FT$>3U9YH+?Nh$2f}~a2_MZKoHELZc;3TMZKlP z6Qdw|2UCb~*^1or+GLxY{_9nvS$~C@$wOQf!l&A6EP>@lRxe5uOVvotiKyf zy6egGkosQ#CeV*<>zlZuQraT=N`^7}`**?618YsohbBn=mHv?6xt&+BEFfA-5ou?V zp;vgj4nA*B7UCG9#57C%iq{A^nj5(Mi}ml`rq2KopEkq{5@*V6nm57>EWFI1LSy60 zVG5q#9AU@y>^N80)kj-(>U2O-7hA@Mtojt$R01umeYA%pVFR_kTwA$5<1RB|V7=nE z(iDrzi$ChZY1>35sp_=xn@E@02!x=*Q@k2aliI@Yfzo*gJ&J}BTd$YLMrrB|m_OVX zH@y-$dO78S8hqr1N@wp}yf$;qHkQBGCI0ZI3K8YlZJY0WTkyi2zC}FZV#~T&`q#8b zTI5@AZPf$^DW1_+BA6i++5xSmq^WpJ}*vm^|w%|6XkW z`44tcxz|ND)~;q*>EasLNoAc_2iOdAzK^~<>6)$Rv@dlf=vQYEt zuY?JFik9z>tz^VF%R@4Pjx0dDI1$rw1;NOcp+`Zi6b0Uj-fw@psxna`+I}Zl%d@^} zQ&3#ph|}LFzg`X#ndd*LmRjg?csaDp^vjLNg-0*7jKi&WsnD<2j4LEsE&C5)KIa+I z?KSt|=R&RIUI%8bE@h=n*2+-?PHk7uYZQBNgD$81DTu)YrP7jY6I0!$BMvShw%?!g z*22gE)giP*2t8D={`gtLt_|C#H?_8)1F^JDbzjQzX&%yeV@?C<2c3X>tiyu}9kP=y zQ)m{O=x}lllc}A6>L0$fDO2~XN9AxFRWtk3Dv~;{Ove@hm0YC#^tF5b41XiZg>KrF z_qZ+2)I*4LuLTD!BE=tNnnVy0)I2 zdSAR@Nosh*qQ?3N@hM~Dr#{*>SvAdpOJz6J$b`xkrv+;_ioMEs1+Bv9QpQ04K6C!10LxOj zwVX>YZ?Zd$UGYq)WXNmTqo|%CldC7f4}ai;dhUuD}sHI{msAs#G1WW0->i>VkNvV)AnTY zy^c3TRZ}S+w-zg>;`9i#+7}aqs3*F5n*3XWm8FZr)b+Egl)YUQdK1>eZ&z^ph2~9% z$S_sC)~`dp?#dB8c+r2xB?6<&2ZQkd0D!mrFGMR74;TP0fHU97%&1n zz#>1u8}J9k4F~|F0TQTxk(ewH$_%-swDNwxZ90n_iM-ADS_m*x}UJvu+Aed*(YF3suPb=&8JEvL`zRKAFdinEkZuvn%!$&@=j(#`L_jHD)Bq@PX2?c#zQS3=Oj^O@ zN!2{X<&~ebiZNf}x}?tZm`awH(vihfzg}_63?K9irVsA<7)x|8gp#GI88`#jkbW8jhEB+nF6S_oIQ z93#XVP_R9+HqB(AXth7F-G`8lok<9b8Fx1xeP1D#FDppbeSb{-Ze>^f1w!0g+`@6# zA-?9KH~FOQrBk!Ti#~!aY+DDFz&r^-tkhH067OfYXGtTgcE!s%-fn2pqnSjlLY|xD z=0|Od-5&B*e6A`fn@EB1)%{_Y$*Q(Nwg-!Bp1eBPZzg15X)_-ScJ7=f_sgp1dfN%8WXbJ~-2r0zt>6BYX2qb=M8gCW5 zt5>u%J~}-1(yC(C;npm1CTP^X9e!C1J)-36sZ@xR**R@zYs;O!C#d$E^jo=Vq6svi zJ7ZA#+N+jcC1x~dVB%>AHSQ_Bwf-4n^2}Y8Tm>j5rF}bj!9`EC`pDG*A;JTnj6ItT zScjDlsRg|03M8?#n#(i5#6Kc%tdfUswd5OZ9Ena=i^mCK_L<_G DumpGlobPatterns = (string[] globPatterns) => { - - foreach (var gp in globPatterns) { - - Information ("Matching: {0}", gp ?? ""); - - var files = GetFiles (gp); - - if (files == null || !files.Any ()) - continue; - - foreach (var f in files) - Information ("Matched: {0}", f); - - Information ("GLOBBER_FILE_PATTERNS={0}", string.Join (",", files)); - } -}; - -Task ("MyGet").Does (() => -{ - var globPatterns = (GLOB_PATTERNS ?? "./output/*.nupkg").Split (new [] { ',', ';', ' ' }); - - DumpGlobPatterns (globPatterns); - if (PREVIEW_ONLY) - return; - - var settings = new PublishNuGetsSettings { - MaxAttempts = MYGET_MAX_ATTEMPTS, - ForcePush = MYGET_FORCE_PUSH - }; - - PublishNuGets (MYGET_SOURCE, MYGET_PUSH_SOURCE, MYGET_API_KEY, settings, globPatterns); -}); - -Task ("NuGet").Does (() => -{ - var globPatterns = (GLOB_PATTERNS ?? "./output/*.nupkg").Split (new [] { ',', ';', ' ' }); - - DumpGlobPatterns (globPatterns); - if (PREVIEW_ONLY) - return; - - var settings = new PublishNuGetsSettings { - MaxAttempts = NUGET_MAX_ATTEMPTS, - ForcePush = NUGET_FORCE_PUSH - }; - - PublishNuGets (NUGET_SOURCE, NUGET_PUSH_SOURCE, NUGET_API_KEY, settings, globPatterns); -}); - -Task ("Component").Does (() => -{ - var globPatterns = (GLOB_PATTERNS ?? "./output/*.xam").Split (new [] { ',', ';', ' ' }); - - DumpGlobPatterns (globPatterns); - if (PREVIEW_ONLY) - return; - - var settings = new XamarinComponentUploadSettings { - Email = XAM_ACCT_EMAIL, - Password = XAM_ACCT_PWD, - MaxAttempts = COMP_MAX_ATTEMPTS, - }; - - UploadComponents (settings, globPatterns); -}); - -RunTarget (TARGET); \ No newline at end of file