Skip to content

Commit 94d9db6

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #51 from SixLabors/netcore-2
Add netstandard target framework
2 parents 02639aa + 81642b0 commit 94d9db6

2 files changed

Lines changed: 49 additions & 53 deletions

File tree

‎src/SixLabors.Fonts/GlyphInstance.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public void RenderTo(IGlyphRenderer surface, float pointSize, Vector2 location,
104104
// (lineHeight * dpi.Y)
105105
if (surface.BeginGlyph(box, hash))
106106
{
107-
108107
int startOfContor = 0;
109108
int endOfContor = -1;
110109
for (int i = 0; i < this.endPoints.Length; i++)
@@ -188,9 +187,7 @@ private Vector2 GetPoint(ref Vector2 scaledPoint, int pointIndex)
188187

189188
private static void AlignToGrid(ref Vector2 point)
190189
{
191-
Vector2 floorPoint = new Vector2(
192-
(float)Math.Floor(point.X),
193-
(float)Math.Floor(point.Y));
190+
Vector2 floorPoint = new Vector2(MathF.Floor(point.X), MathF.Floor(point.Y));
194191
Vector2 decimalPart = point - floorPoint;
195192

196193
if (decimalPart.X < 0.5)

‎src/SixLabors.Fonts/SixLabors.Fonts.csproj‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Description>A cross-platform library for loading and laying out for processing and measuring; written in C#</Description>
5-
<AssemblyTitle>SixLabors.Fonts</AssemblyTitle>
6-
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
7-
<VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
8-
<Authors>Six Labors and contributors</Authors>
9-
<TargetFrameworks>netstandard1.3;netstandard1.1</TargetFrameworks>
10-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12-
<AssemblyName>SixLabors.Fonts</AssemblyName>
13-
<PackageId>SixLabors.Fonts</PackageId>
14-
<PackageTags>font;truetype;opentype;woff</PackageTags>
15-
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Fonts/master/icons/icon.png</PackageIconUrl>
16-
<PackageProjectUrl>https://github.com/SixLabors/Fonts</PackageProjectUrl>
17-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
18-
<RepositoryType>git</RepositoryType>
19-
<RepositoryUrl>https://github.com/SixLabors/Fonts</RepositoryUrl>
20-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
21-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
22-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
23-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
24-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
25-
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
26-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
27-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
28-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
29-
<DebugType Condition="$(codecov) != ''">full</DebugType>
30-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Description>A cross-platform library for loading and laying out for processing and measuring; written in C#</Description>
5+
<AssemblyTitle>SixLabors.Fonts</AssemblyTitle>
6+
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
7+
<VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
8+
<Authors>Six Labors and contributors</Authors>
9+
<TargetFrameworks>netstandard2.0;netstandard1.3;netstandard1.1</TargetFrameworks>
10+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<AssemblyName>SixLabors.Fonts</AssemblyName>
13+
<PackageId>SixLabors.Fonts</PackageId>
14+
<PackageTags>font;truetype;opentype;woff</PackageTags>
15+
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Fonts/master/icons/icon.png</PackageIconUrl>
16+
<PackageProjectUrl>https://github.com/SixLabors/Fonts</PackageProjectUrl>
17+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
18+
<RepositoryType>git</RepositoryType>
19+
<RepositoryUrl>https://github.com/SixLabors/Fonts</RepositoryUrl>
20+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
21+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
22+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
23+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
24+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
25+
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
26+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
27+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
28+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
29+
<DebugType Condition="$(codecov) != ''">full</DebugType>
30+
</PropertyGroup>
3131

32-
<ItemGroup>
33-
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
34-
</ItemGroup>
35-
36-
<PropertyGroup>
37-
<CodeAnalysisRuleSet>..\SixLabors.ruleset</CodeAnalysisRuleSet>
38-
</PropertyGroup>
32+
<ItemGroup>
33+
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
34+
</ItemGroup>
3935

40-
<ItemGroup>
41-
<AdditionalFiles Include="..\..\stylecop.json" />
42-
</ItemGroup>
43-
44-
<ItemGroup>
45-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
46-
<PrivateAssets>All</PrivateAssets>
47-
</PackageReference>
48-
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
49-
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0003" />
50-
</ItemGroup>
36+
<PropertyGroup>
37+
<CodeAnalysisRuleSet>..\SixLabors.ruleset</CodeAnalysisRuleSet>
38+
</PropertyGroup>
5139

52-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
53-
<DefineConstants>$(DefineConstants);FILESYSTEM</DefineConstants>
54-
</PropertyGroup>
40+
<ItemGroup>
41+
<AdditionalFiles Include="..\..\stylecop.json" />
42+
</ItemGroup>
43+
44+
<ItemGroup>
45+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
46+
<PrivateAssets>All</PrivateAssets>
47+
</PackageReference>
48+
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
49+
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0004" />
50+
</ItemGroup>
51+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard2.0'">
52+
<DefineConstants>$(DefineConstants);FILESYSTEM</DefineConstants>
53+
</PropertyGroup>
5554
</Project>

0 commit comments

Comments
 (0)