Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SkiaSharp + MaterialDesignIcons #64

Merged
merged 8 commits into from
Feb 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
Expand Down Expand Up @@ -52,9 +51,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
</ItemGroup>

Expand Down
6 changes: 4 additions & 2 deletions SkiaSharp.Extended.Iconify/source/IconifyGenerator/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,10 @@ private static void ParseCodepoints(string codepointsPath, StringBuilder charact
continue;
}

var literal = Encoding.UTF8.GetBytes(pair[1]).Length > 1 ? "u" : "x";
var chars = CharacterTemplate
.Replace("{{inject-selector}}", pair[0])
.Replace("{{inject-value}}", "\\u" + pair[1]);
.Replace("{{inject-value}}", "\\" + literal + pair[1]);
characters.AppendLine(chars);
}
}
Expand Down Expand Up @@ -175,7 +176,8 @@ private static void ParseCssCodepoints(string cssPath, StringBuilder characters)
if (primTerm != null)
{
content = primTerm.Value?.ToString();
content = "\\u" + Char.ConvertToUtf32(content, 0).ToString("x");
var literal = Encoding.UTF8.GetBytes(content).Length > 1 ? "u" : "x";
content = "\\" + literal + Char.ConvertToUtf32(content, 0).ToString("x");
}
if (string.IsNullOrEmpty(content))
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
<AssemblyName>SkiaSharp.Extended.Iconify.FontAwesome</AssemblyName>
<RootNamespace>SkiaSharp.Extended.Iconify</RootNamespace>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<AssemblyFileVersion>4.7.0.0</AssemblyFileVersion>
<Version>5.0.0</Version>
<Version>6.0.0</Version>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<DefineConstants>$(DefineConstants);</DefineConstants>
Expand All @@ -20,28 +20,24 @@

<PropertyGroup>
<PackageId>SkiaSharp.Extended.Iconify.FontAwesome</PackageId>
<Title>Font Awesome for SkiaSharp.Extended.Iconify</Title>
<Title>Font Awesome (v$(FontAwesomeVersion)) for SkiaSharp.Extended.Iconify</Title>
<PackageVersion Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</PackageVersion>
<Authors>Xamarin Inc.</Authors>
<Owners>microsoft,Xamarin,XamarinNuGet</Owners>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Description>The Font Awesome font for SkiaSharp.Extended.Iconify.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<!-- <PackageIconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</PackageIconUrl> -->
<!-- <PackageIconUrl>https://go.microsoft.com/fwlink/?linkid=868516</PackageIconUrl> -->
<PackageTags>skiasharp iconify fontawesome xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform</PackageTags>
<PackageLicenseUrl>https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/mono/SkiaSharp.Extended</PackageProjectUrl>
<RepositoryUrl>https://github.com/mono/SkiaSharp.Extended</RepositoryUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2072003</PackageLicenseUrl>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2071915</PackageProjectUrl>
<RepositoryUrl>https://go.microsoft.com/fwlink/?linkid=2071915</RepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<DefineConstants>$(DefineConstants);NET_STANDARD;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('portable')) ">
<DefineConstants>$(DefineConstants);PORTABLE;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -52,7 +48,7 @@

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
<AssemblyName>SkiaSharp.Extended.Iconify.IonIcons</AssemblyName>
<RootNamespace>SkiaSharp.Extended.Iconify</RootNamespace>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<AssemblyFileVersion>2.0.1.0</AssemblyFileVersion>
<Version>3.0.0</Version>
<Version>4.0.0</Version>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<DefineConstants>$(DefineConstants);</DefineConstants>
Expand All @@ -20,28 +20,24 @@

<PropertyGroup>
<PackageId>SkiaSharp.Extended.Iconify.IonIcons</PackageId>
<Title>Ionicons for SkiaSharp.Extended.Iconify</Title>
<Title>Ionicons (v$(IonIconsVersion)) for SkiaSharp.Extended.Iconify</Title>
<PackageVersion Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</PackageVersion>
<Authors>Xamarin Inc.</Authors>
<Owners>microsoft,Xamarin,XamarinNuGet</Owners>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Description>The Ionicons font for SkiaSharp.Extended.Iconify.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<!-- <PackageIconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</PackageIconUrl> -->
<!-- <PackageIconUrl>https://go.microsoft.com/fwlink/?linkid=868516</PackageIconUrl> -->
<PackageTags>skiasharp iconify ionicons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform</PackageTags>
<PackageLicenseUrl>https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/mono/SkiaSharp.Extended</PackageProjectUrl>
<RepositoryUrl>https://github.com/mono/SkiaSharp.Extended</RepositoryUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2072003</PackageLicenseUrl>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2071915</PackageProjectUrl>
<RepositoryUrl>https://go.microsoft.com/fwlink/?linkid=2071915</RepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<DefineConstants>$(DefineConstants);NET_STANDARD;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('portable')) ">
<DefineConstants>$(DefineConstants);PORTABLE;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -52,7 +48,7 @@

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
<AssemblyName>SkiaSharp.Extended.Iconify.MaterialDesignIcons</AssemblyName>
<RootNamespace>SkiaSharp.Extended.Iconify</RootNamespace>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<AssemblyFileVersion>1.9.32.0</AssemblyFileVersion>
<Version>2.0.0</Version>
<AssemblyFileVersion>3.4.93.0</AssemblyFileVersion>
<Version>3.0.0</Version>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<DefineConstants>$(DefineConstants);</DefineConstants>
<MaterialDesignIconsVersion>1.9.32</MaterialDesignIconsVersion>
<MaterialDesignIconsVersion>3.4.93</MaterialDesignIconsVersion>
</PropertyGroup>

<ItemGroup>
<RemoteFontFile Include="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/$(MaterialDesignIconsVersion)/fonts/materialdesignicons-webfont.ttf" />
<RemoteStyleSheet Include="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/$(MaterialDesignIconsVersion)/css/materialdesignicons.min.css" />
<RemoteFontFile Include="https://raw.githubusercontent.com/Templarian/MaterialDesign-Webfont/v$(MaterialDesignIconsVersion)/fonts/materialdesignicons-webfont.ttf" />
<RemoteStyleSheet Include="https://raw.githubusercontent.com/Templarian/MaterialDesign-Webfont/v$(MaterialDesignIconsVersion)/css/materialdesignicons.min.css" />
</ItemGroup>

<PropertyGroup>
<PackageId>SkiaSharp.Extended.Iconify.MaterialDesignIcons</PackageId>
<Title>Material Design Icons for SkiaSharp.Extended.Iconify</Title>
<Title>Material Design Icons (v$(MaterialDesignIconsVersion)) for SkiaSharp.Extended.Iconify</Title>
<PackageVersion Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</PackageVersion>
<Authors>Xamarin Inc.</Authors>
<Owners>microsoft,Xamarin,XamarinNuGet</Owners>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Description>The Material Design Icons font for SkiaSharp.Extended.Iconify.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<!-- <PackageIconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</PackageIconUrl> -->
<!-- <PackageIconUrl>https://go.microsoft.com/fwlink/?linkid=868516</PackageIconUrl> -->
<PackageTags>skiasharp iconify materialdesignicons materialdesign xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform</PackageTags>
<PackageLicenseUrl>https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/mono/SkiaSharp.Extended</PackageProjectUrl>
<RepositoryUrl>https://github.com/mono/SkiaSharp.Extended</RepositoryUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2072003</PackageLicenseUrl>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2071915</PackageProjectUrl>
<RepositoryUrl>https://go.microsoft.com/fwlink/?linkid=2071915</RepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<DefineConstants>$(DefineConstants);NET_STANDARD;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('portable')) ">
<DefineConstants>$(DefineConstants);PORTABLE;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -52,7 +48,7 @@

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
<AssemblyName>SkiaSharp.Extended.Iconify.MaterialIcons</AssemblyName>
<RootNamespace>SkiaSharp.Extended.Iconify</RootNamespace>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<AssemblyFileVersion>3.0.1.0</AssemblyFileVersion>
<Version>4.0.0</Version>
<Version>5.0.0</Version>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<DefineConstants>$(DefineConstants);</DefineConstants>
Expand All @@ -21,28 +21,24 @@

<PropertyGroup>
<PackageId>SkiaSharp.Extended.Iconify.MaterialIcons</PackageId>
<Title>Material Icons for SkiaSharp.Extended.Iconify</Title>
<Title>Material Icons (v$(MaterialIconsVersion)) for SkiaSharp.Extended.Iconify</Title>
<PackageVersion Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</PackageVersion>
<Authors>Xamarin Inc.</Authors>
<Owners>microsoft,Xamarin,XamarinNuGet</Owners>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Description>The Material Icons font for SkiaSharp.Extended.Iconify.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<!-- <PackageIconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</PackageIconUrl> -->
<!-- <PackageIconUrl>https://go.microsoft.com/fwlink/?linkid=868516</PackageIconUrl> -->
<PackageTags>skiasharp iconify materialicons xamarin graphics ios android linux windows uwp tvos watchos macos cross-platform</PackageTags>
<PackageLicenseUrl>https://github.com/mono/SkiaSharp.Extended/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/mono/SkiaSharp.Extended</PackageProjectUrl>
<RepositoryUrl>https://github.com/mono/SkiaSharp.Extended</RepositoryUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2072003</PackageLicenseUrl>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2071915</PackageProjectUrl>
<RepositoryUrl>https://go.microsoft.com/fwlink/?linkid=2071915</RepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<DefineConstants>$(DefineConstants);NET_STANDARD;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('portable')) ">
<DefineConstants>$(DefineConstants);PORTABLE;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -53,7 +49,7 @@

<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp" Version="1.68.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading