diff --git a/.github/ISSUE_TEMPLATE/ask-question.md b/.github/ISSUE_TEMPLATE/ask-question.md deleted file mode 100644 index c8313fb..0000000 --- a/.github/ISSUE_TEMPLATE/ask-question.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: Ask question -about: Ask a question about this project. - ---- - -You should not create an issue but use Gitter instead: https://gitter.im/ImageSharp/General - -You should not create an issue but use Gitter instead: https://gitter.im/ImageSharp/General - -You should not create an issue but use Gitter instead: https://gitter.im/ImageSharp/General - -You should not create an issue but use Gitter instead: https://gitter.im/ImageSharp/General \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/commercial-bug-report.md b/.github/ISSUE_TEMPLATE/commercial-bug-report.md new file mode 100644 index 0000000..7d3d1e2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/commercial-bug-report.md @@ -0,0 +1,33 @@ +--- +name: "Commercial License : Bug Report" +about: | + Create a report to help us improve the project. For Commercial License holders only. + Please contact help@sixlabors.com for issues requiring private support. +labels: commercial, needs triage + +--- + + +### Prerequisites + +- [ ] I have written a descriptive issue title +- [ ] I have verified that I am running the latest version of Fonts +- [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode +- [ ] I have searched [open](https://github.com/SixLabors/Fonts/issues) and [closed](https://github.com/SixLabors/Fonts/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported + +### Description + + +### Steps to Reproduce + + +### System Configuration + + +- Fonts version: +- Other Six Labors packages and versions: +- Environment (Operating system, version and so on): +- .NET Framework version: +- Additional information: + + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..5a9d1dd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: Ask a Question + url: https://github.com/SixLabors/ImageSharp/discussions/new?category_id=6331980 + about: Ask a question about this project. + - name: Feature Request + url: https://github.com/SixLabors/ImageSharp/discussions/new?category_id=6331981 + about: Share ideas for new features for this project. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md deleted file mode 100644 index be1e593..0000000 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- - -You should first discuss the feature on Gitter: https://gitter.im/ImageSharp/General - -You should first discuss the feature on Gitter: https://gitter.im/ImageSharp/General - -You should first discuss the feature on Gitter: https://gitter.im/ImageSharp/General - -You should first discuss the feature on Gitter: https://gitter.im/ImageSharp/General \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/oss-bug-report.md similarity index 72% rename from .github/ISSUE_TEMPLATE/bug-report.md rename to .github/ISSUE_TEMPLATE/oss-bug-report.md index ed2c4f0..fa4c3d1 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/oss-bug-report.md @@ -1,13 +1,14 @@ --- -name: Bug report -about: Create a report to help us improve +name: "OSS : Bug Report" +about: Create a report to help us improve the project. +labels: needs triage --- ### Prerequisites - [ ] I have written a descriptive issue title -- [ ] I have verified that I am running the latest version of SixLabors.Fonts +- [ ] I have verified that I am running the latest version of Fonts - [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode - [ ] I have searched [open](https://github.com/SixLabors/Fonts/issues) and [closed](https://github.com/SixLabors/Fonts/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported @@ -20,10 +21,10 @@ about: Create a report to help us improve ### System Configuration -- SixLabors.Fonts version: -- Other SixLabors packages and versions: +- Fonts version: +- Other Six Labors packages and versions: - Environment (Operating system, version and so on): - .NET Framework version: - Additional information: - + diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 1096458..3172073 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -138,8 +138,7 @@ jobs: XUNIT_PATH: .\tests\SixLabors.Fonts.Tests # Required for xunit - name: Update Codecov - uses: iansu/codecov-action-node@v1.0.0 - if: matrix.options.codecov == true + uses: codecov/codecov-action@v1.0.7 + if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors') with: - token: ${{secrets.CODECOV_TOKEN}} flags: unittests diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..b34bbb4 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +# Code of Conduct +This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org/) to clarify expected behavior in our community. +For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index d921a1c..43c9225 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -82,8 +82,8 @@ 8.0 en true - icon.png - LICENSE.md + sixlabors.fonts.128.png + Apache-2.0 $(RepositoryUrl) true git @@ -104,8 +104,7 @@ - - + diff --git a/README.md b/README.md index ab4ca5b..193c26c 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,8 @@ SixLabors.Fonts [![Build Status](https://img.shields.io/github/workflow/status/SixLabors/Fonts/Build/master)](https://github.com/SixLabors/Fonts/actions) [![codecov](https://codecov.io/gh/SixLabors/Fonts/branch/master/graph/badge.svg)](https://codecov.io/gh/SixLabors/Fonts) -[![License: AGPL v3](https://img.shields.io/badge/license-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) +[![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![Join the chat at https://gitter.im/SixLabors/Shapes](https://badges.gitter.im/SixLabors/Fonts.svg)](https://gitter.im/SixLabors/Fonts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![GitHub issues](https://img.shields.io/github/issues/SixLabors/Fonts.svg)](https://github.com/SixLabors/Fonts/issues) [![GitHub stars](https://img.shields.io/github/stars/SixLabors/Fonts.svg)](https://github.com/SixLabors/Fonts/stargazers) [![GitHub forks](https://img.shields.io/github/forks/SixLabors/Fonts.svg)](https://github.com/SixLabors/Fonts/network) @@ -20,25 +19,65 @@ SixLabors.Fonts **SixLabors.Fonts** is a new cross-platform font loadings and drawing library. -### Installation +## License + +- Fonts is licensed under the [Apache License, Version 2.0](https://opensource.org/licenses/Apache-2.0) +- An alternative Commercial License can be purchased for projects and applications requiring support. +Please visit https://sixlabors.com/pricing for details. -**Pre-release downloads** +## Documentation -At present the code is pre-release we have initial pre-releases availible on [nuget](https://www.nuget.org/packages/SixLabors.Fonts/). +- [Detailed documentation](https://sixlabors.github.io/docs/) for the Fonts API is available. This includes additional conceptual documentation to help you get started. +- Our [Samples Repository](https://github.com/SixLabors/Samples/tree/master/ImageSharp) is also available containing buildable code samples demonstrating common activities. -We also have a [MyGet package repository](https://www.myget.org/gallery/sixlabors) - for bleeding-edge / development NuGet releases. +## Questions -### Manual build +- Do you have questions? We are happy to help! Please [join our Discussions Forum](https://github.com/SixLabors/ImageSharp/discussions/category_choices). +- Please read our [Contribution Guide](https://github.com/SixLabors/Fonts/blob/master/.github/CONTRIBUTING.md) before opening issues or pull requests! -If you prefer, you can compile SixLabors.Shapes yourself (please do and help!), you'll need: +## Code of Conduct +This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org/) to clarify expected behavior in our community. +For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). -- [Visual Studio 2017](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-relnotes) -- The [.NET Core 1.0 SDK Installer](https://www.microsoft.com/net/core#windows) - Non VSCode link. +## Installation -To clone it locally click the "Clone in Windows" button above or run the following git commands. +Install stable releases via Nuget; development releases are available via MyGet. + +| Package Name | Release (NuGet) | Nightly (MyGet) | +|--------------------------------|-----------------|-----------------| +| `SixLabors.Fonts` | [![NuGet](https://img.shields.io/nuget/v/SixLabors.Fonts.svg)](https://www.nuget.org/packages/SixLabors.Fonts/) | [![MyGet](https://img.shields.io/myget/sixlabors/v/SixLabors.Fonts.svg)](https://www.myget.org/feed/sixlabors/package/nuget/SixLabors.Fonts) | + +## Manual build + +If you prefer, you can compile FOnts yourself (please do and help!) + +- Using [Visual Studio 2019](https://visualstudio.microsoft.com/vs/) + - Make sure you have the latest version installed + - Make sure you have [the .NET Core 3.1 SDK](https://www.microsoft.com/net/core#windows) installed + +Alternatively, you can work from command line and/or with a lightweight editor on **both Linux/Unix and Windows**: + +- [Visual Studio Code](https://code.visualstudio.com/) with [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) +- [.NET Core](https://www.microsoft.com/net/core#linuxubuntu) + +To clone Fonts locally, click the "Clone in [YOUR_OS]" button above or run the following git commands: ```bash -git clone https://github.com/SixLabors/Fonts.git +git clone https://github.com/SixLabors/Fonts +``` + +If working with Windows please ensure that you have enabled log file paths in git (run as Administrator). + +```bash +git config --system core.longpaths true +``` + +### Submodules + +This repository contains [git submodules](https://blog.github.com/2016-02-01-working-with-submodules/). To add the submodules to the project, navigate to the repository root and type: + +``` bash +git submodule update --init --recursive ``` ### Features @@ -64,7 +103,7 @@ string name = description.FontName; ``` -### Popluating a font collection +### Populating a font collection ```c# FontCollection fonts = new FontCollection(); @@ -83,11 +122,78 @@ Please... Spread the word, contribute algorithms, submit performance improvement ### The SixLabors.Fonts Team -Lead - [Scott Williams](https://github.com/tocsoft) - -Core Team - [Dirk Lemstra](https://github.com/dlemstra) - [Anton Firsov](https://github.com/antonfirsov) - [James Jackson-South](https://github.com/jimbobsquarepants) - [Brian Popow](https://github.com/brianpopow) + +### Backers + +Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/imagesharp#backer)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +### Sponsors + +Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/imagesharp#sponsor)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SixLabors.Fonts.sln b/SixLabors.Fonts.sln index af8d08a..726b664 100644 --- a/SixLabors.Fonts.sln +++ b/SixLabors.Fonts.sln @@ -5,7 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}" ProjectSection(SolutionItems) = preProject standards\.editorconfig = standards\.editorconfig - .github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml ci-build.ps1 = ci-build.ps1 ci-pack.ps1 = ci-pack.ps1 ci-test.ps1 = ci-test.ps1 @@ -37,6 +36,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawWithImageSharp", "sampl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ListFonts", "samples\ListFonts\ListFonts.csproj", "{6DF4C474-1FDF-4DE0-9CB2-9674D2CCE1BA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{7CDD4908-7CCD-4945-860C-D2F1732D3AE6}" + ProjectSection(SolutionItems) = preProject + .github\CONTRIBUTING.md = .github\CONTRIBUTING.md + .github\FUNDING.yml = .github\FUNDING.yml + .github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{EC0F1812-C6AF-48D8-882B-5637730D2DB1}" + ProjectSection(SolutionItems) = preProject + .github\ISSUE_TEMPLATE\commercial-bug-report.md = .github\ISSUE_TEMPLATE\commercial-bug-report.md + .github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml + .github\ISSUE_TEMPLATE\oss-bug-report.md = .github\ISSUE_TEMPLATE\oss-bug-report.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{CFCC940C-DEA3-42CC-9626-0B7D09289FF4}" + ProjectSection(SolutionItems) = preProject + .github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml + EndProjectSection +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{09e744ec-4852-4fc7-be78-c1b399f17967}*SharedItemsImports = 5 @@ -71,6 +89,8 @@ Global {F836E8E6-B4D9-4208-8346-140C74678B91} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC} {999EDFB3-9FE4-4E09-B669-CB02E597EC20} = {71A3911C-D6B9-4EBE-9691-2FE28BDF462E} {6DF4C474-1FDF-4DE0-9CB2-9674D2CCE1BA} = {71A3911C-D6B9-4EBE-9691-2FE28BDF462E} + {EC0F1812-C6AF-48D8-882B-5637730D2DB1} = {7CDD4908-7CCD-4945-860C-D2F1732D3AE6} + {CFCC940C-DEA3-42CC-9626-0B7D09289FF4} = {7CDD4908-7CCD-4945-860C-D2F1732D3AE6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {38F4B47F-4F74-40F5-8707-C0EF1D0BDF92} diff --git a/ci-test.ps1 b/ci-test.ps1 index c9cfc07..3915ae4 100644 --- a/ci-test.ps1 +++ b/ci-test.ps1 @@ -17,7 +17,7 @@ if ($codecov -eq 'true') { # Allow toggling of profile to workaround any potential JIT errors caused by code injection. dotnet clean -c $codecovProfile - dotnet test -c $codecovProfile -f $targetFramework /p:codecov=true + dotnet test --collect "XPlat Code Coverage" --settings .\tests\coverlet.runsettings -c $codecovProfile -f $targetFramework /p:CodeCov=true } elseif ($platform -eq '-x86' -and $targetFramework -match $netFxRegex) { diff --git a/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor.cs b/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor.cs index 0a9ebf3..952e1a5 100644 --- a/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor.cs +++ b/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors. // Licensed under the Apache License, Version 2.0. using System; diff --git a/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor{TPixel}.cs b/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor{TPixel}.cs index f039ecd..4b206ee 100644 --- a/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor{TPixel}.cs +++ b/samples/DrawWithImageSharp/ImageSharpDrawingCachingGlyphRenderer/DrawTextProcessor{TPixel}.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors. // Licensed under the Apache License, Version 2.0. using System; diff --git a/shared-infrastructure b/shared-infrastructure index 44686c6..93bd7d1 160000 --- a/shared-infrastructure +++ b/shared-infrastructure @@ -1 +1 @@ -Subproject commit 44686c6a116961f4a5163e19a0d6136e1b0b9f72 +Subproject commit 93bd7d17ebb029d995d7fa69d4b4e850ec861c1e diff --git a/src/SixLabors.Fonts/AppliedFontStyle.cs b/src/SixLabors.Fonts/AppliedFontStyle.cs index 93f8783..6284100 100644 --- a/src/SixLabors.Fonts/AppliedFontStyle.cs +++ b/src/SixLabors.Fonts/AppliedFontStyle.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/BinaryReader.cs b/src/SixLabors.Fonts/BinaryReader.cs index 3c6c810..8cf3b7d 100644 --- a/src/SixLabors.Fonts/BinaryReader.cs +++ b/src/SixLabors.Fonts/BinaryReader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Buffers.Binary; diff --git a/src/SixLabors.Fonts/Bounds.cs b/src/SixLabors.Fonts/Bounds.cs index 0a49d76..19cf99f 100644 --- a/src/SixLabors.Fonts/Bounds.cs +++ b/src/SixLabors.Fonts/Bounds.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/ColorFontSupport.cs b/src/SixLabors.Fonts/ColorFontSupport.cs index db4776c..9831c8b 100644 --- a/src/SixLabors.Fonts/ColorFontSupport.cs +++ b/src/SixLabors.Fonts/ColorFontSupport.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Exceptions/FontException.cs b/src/SixLabors.Fonts/Exceptions/FontException.cs index 0a2b554..9002131 100644 --- a/src/SixLabors.Fonts/Exceptions/FontException.cs +++ b/src/SixLabors.Fonts/Exceptions/FontException.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Exceptions/FontFamilyNotFoundException.cs b/src/SixLabors.Fonts/Exceptions/FontFamilyNotFoundException.cs index b6f055b..92b8362 100644 --- a/src/SixLabors.Fonts/Exceptions/FontFamilyNotFoundException.cs +++ b/src/SixLabors.Fonts/Exceptions/FontFamilyNotFoundException.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Exceptions { diff --git a/src/SixLabors.Fonts/Exceptions/FontsThrowHelper.cs b/src/SixLabors.Fonts/Exceptions/FontsThrowHelper.cs index dfc809e..02a0cd3 100644 --- a/src/SixLabors.Fonts/Exceptions/FontsThrowHelper.cs +++ b/src/SixLabors.Fonts/Exceptions/FontsThrowHelper.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Diagnostics; using System.Runtime.CompilerServices; diff --git a/src/SixLabors.Fonts/Exceptions/GlyphMissingException.cs b/src/SixLabors.Fonts/Exceptions/GlyphMissingException.cs index 91f45b3..6cabf5a 100644 --- a/src/SixLabors.Fonts/Exceptions/GlyphMissingException.cs +++ b/src/SixLabors.Fonts/Exceptions/GlyphMissingException.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Exceptions/InvalidFontFileException.cs b/src/SixLabors.Fonts/Exceptions/InvalidFontFileException.cs index 664a2e7..a3fcf24 100644 --- a/src/SixLabors.Fonts/Exceptions/InvalidFontFileException.cs +++ b/src/SixLabors.Fonts/Exceptions/InvalidFontFileException.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Exceptions/InvalidFontTableException.cs b/src/SixLabors.Fonts/Exceptions/InvalidFontTableException.cs index 6e52ffa..fe032c1 100644 --- a/src/SixLabors.Fonts/Exceptions/InvalidFontTableException.cs +++ b/src/SixLabors.Fonts/Exceptions/InvalidFontTableException.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Exceptions { diff --git a/src/SixLabors.Fonts/Exceptions/MissingFontTableException.cs b/src/SixLabors.Fonts/Exceptions/MissingFontTableException.cs index 362bf78..05dafc2 100644 --- a/src/SixLabors.Fonts/Exceptions/MissingFontTableException.cs +++ b/src/SixLabors.Fonts/Exceptions/MissingFontTableException.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Exceptions { diff --git a/src/SixLabors.Fonts/FileFontInstance.cs b/src/SixLabors.Fonts/FileFontInstance.cs index 397d33a..9d7e279 100644 --- a/src/SixLabors.Fonts/FileFontInstance.cs +++ b/src/SixLabors.Fonts/FileFontInstance.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Font.cs b/src/SixLabors.Fonts/Font.cs index 98abddb..60d3922 100644 --- a/src/SixLabors.Fonts/Font.cs +++ b/src/SixLabors.Fonts/Font.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using SixLabors.Fonts.Exceptions; diff --git a/src/SixLabors.Fonts/FontCollection.cs b/src/SixLabors.Fonts/FontCollection.cs index a77e103..37ceb02 100644 --- a/src/SixLabors.Fonts/FontCollection.cs +++ b/src/SixLabors.Fonts/FontCollection.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/FontDescription.cs b/src/SixLabors.Fonts/FontDescription.cs index c9b287d..57520c4 100644 --- a/src/SixLabors.Fonts/FontDescription.cs +++ b/src/SixLabors.Fonts/FontDescription.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using System.Globalization; diff --git a/src/SixLabors.Fonts/FontFamily.cs b/src/SixLabors.Fonts/FontFamily.cs index ce5d752..45e67b4 100644 --- a/src/SixLabors.Fonts/FontFamily.cs +++ b/src/SixLabors.Fonts/FontFamily.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/FontFamilyCollectionExtensions.cs b/src/SixLabors.Fonts/FontFamilyCollectionExtensions.cs index ec1e08d..73fd53e 100644 --- a/src/SixLabors.Fonts/FontFamilyCollectionExtensions.cs +++ b/src/SixLabors.Fonts/FontFamilyCollectionExtensions.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts { diff --git a/src/SixLabors.Fonts/FontInstance.cs b/src/SixLabors.Fonts/FontInstance.cs index 73cfa5e..3b28e16 100644 --- a/src/SixLabors.Fonts/FontInstance.cs +++ b/src/SixLabors.Fonts/FontInstance.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/FontReader.cs b/src/SixLabors.Fonts/FontReader.cs index 97b4ff7..26f0ddc 100644 --- a/src/SixLabors.Fonts/FontReader.cs +++ b/src/SixLabors.Fonts/FontReader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/FontRectangle.cs b/src/SixLabors.Fonts/FontRectangle.cs index 05168ac..ff8ee92 100644 --- a/src/SixLabors.Fonts/FontRectangle.cs +++ b/src/SixLabors.Fonts/FontRectangle.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/FontStyle.cs b/src/SixLabors.Fonts/FontStyle.cs index dde89c2..21d2b44 100644 --- a/src/SixLabors.Fonts/FontStyle.cs +++ b/src/SixLabors.Fonts/FontStyle.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/GlobalSuppressions.cs b/src/SixLabors.Fonts/GlobalSuppressions.cs index 50b21ec..8af4d73 100644 --- a/src/SixLabors.Fonts/GlobalSuppressions.cs +++ b/src/SixLabors.Fonts/GlobalSuppressions.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. // This file is used by Code Analysis to maintain SuppressMessage // attributes that are applied to this project. diff --git a/src/SixLabors.Fonts/Glyph.cs b/src/SixLabors.Fonts/Glyph.cs index c30ab12..81de38a 100644 --- a/src/SixLabors.Fonts/Glyph.cs +++ b/src/SixLabors.Fonts/Glyph.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/GlyphInstance.cs b/src/SixLabors.Fonts/GlyphInstance.cs index 09de56f..4ca520f 100644 --- a/src/SixLabors.Fonts/GlyphInstance.cs +++ b/src/SixLabors.Fonts/GlyphInstance.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Buffers; diff --git a/src/SixLabors.Fonts/GlyphLayout.cs b/src/SixLabors.Fonts/GlyphLayout.cs index d72b093..1fe5d0b 100644 --- a/src/SixLabors.Fonts/GlyphLayout.cs +++ b/src/SixLabors.Fonts/GlyphLayout.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; using System.Text; diff --git a/src/SixLabors.Fonts/GlyphMetric.cs b/src/SixLabors.Fonts/GlyphMetric.cs index c505eba..9265ea0 100644 --- a/src/SixLabors.Fonts/GlyphMetric.cs +++ b/src/SixLabors.Fonts/GlyphMetric.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/GlyphRendererParameters.cs b/src/SixLabors.Fonts/GlyphRendererParameters.cs index 2c88f3c..e72bf0b 100644 --- a/src/SixLabors.Fonts/GlyphRendererParameters.cs +++ b/src/SixLabors.Fonts/GlyphRendererParameters.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Numerics; diff --git a/src/SixLabors.Fonts/GlyphType.cs b/src/SixLabors.Fonts/GlyphType.cs index 1a83093..adb9ba4 100644 --- a/src/SixLabors.Fonts/GlyphType.cs +++ b/src/SixLabors.Fonts/GlyphType.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts { diff --git a/src/SixLabors.Fonts/HorizontalAlignment.cs b/src/SixLabors.Fonts/HorizontalAlignment.cs index 60332d2..cf1a6e3 100644 --- a/src/SixLabors.Fonts/HorizontalAlignment.cs +++ b/src/SixLabors.Fonts/HorizontalAlignment.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts { diff --git a/src/SixLabors.Fonts/IColorGlyphRenderer.cs b/src/SixLabors.Fonts/IColorGlyphRenderer.cs index 17a18f4..9199185 100644 --- a/src/SixLabors.Fonts/IColorGlyphRenderer.cs +++ b/src/SixLabors.Fonts/IColorGlyphRenderer.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/IFontCollection.cs b/src/SixLabors.Fonts/IFontCollection.cs index ba53c79..7c9bb8a 100644 --- a/src/SixLabors.Fonts/IFontCollection.cs +++ b/src/SixLabors.Fonts/IFontCollection.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.IO; diff --git a/src/SixLabors.Fonts/IFontInstance.cs b/src/SixLabors.Fonts/IFontInstance.cs index 2d97122..1f3bff0 100644 --- a/src/SixLabors.Fonts/IFontInstance.cs +++ b/src/SixLabors.Fonts/IFontInstance.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/IGlyphRenderer.cs b/src/SixLabors.Fonts/IGlyphRenderer.cs index c9c4fc6..4c840b1 100644 --- a/src/SixLabors.Fonts/IGlyphRenderer.cs +++ b/src/SixLabors.Fonts/IGlyphRenderer.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/IGlyphRendererExtensions.cs b/src/SixLabors.Fonts/IGlyphRendererExtensions.cs index fe2c591..adc2b46 100644 --- a/src/SixLabors.Fonts/IGlyphRendererExtensions.cs +++ b/src/SixLabors.Fonts/IGlyphRendererExtensions.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/IO/ZlibInflateStream.cs b/src/SixLabors.Fonts/IO/ZlibInflateStream.cs index 05dc336..dfe80b7 100644 --- a/src/SixLabors.Fonts/IO/ZlibInflateStream.cs +++ b/src/SixLabors.Fonts/IO/ZlibInflateStream.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.IO; diff --git a/src/SixLabors.Fonts/IReadonlyFontCollection.cs b/src/SixLabors.Fonts/IReadonlyFontCollection.cs index 4ea5f51..93ac0b4 100644 --- a/src/SixLabors.Fonts/IReadonlyFontCollection.cs +++ b/src/SixLabors.Fonts/IReadonlyFontCollection.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/src/SixLabors.Fonts/IReadonlyFontCollectionExtensions.cs b/src/SixLabors.Fonts/IReadonlyFontCollectionExtensions.cs index 8adae5d..80c4857 100644 --- a/src/SixLabors.Fonts/IReadonlyFontCollectionExtensions.cs +++ b/src/SixLabors.Fonts/IReadonlyFontCollectionExtensions.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Globalization; diff --git a/src/SixLabors.Fonts/RendererOptions.cs b/src/SixLabors.Fonts/RendererOptions.cs index 0279cb7..833e433 100644 --- a/src/SixLabors.Fonts/RendererOptions.cs +++ b/src/SixLabors.Fonts/RendererOptions.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/StringComparerHelpers.cs b/src/SixLabors.Fonts/StringComparerHelpers.cs index 7323a7e..16a830f 100644 --- a/src/SixLabors.Fonts/StringComparerHelpers.cs +++ b/src/SixLabors.Fonts/StringComparerHelpers.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/SystemFontCollection.cs b/src/SixLabors.Fonts/SystemFontCollection.cs index 2702d07..92d1e85 100644 --- a/src/SixLabors.Fonts/SystemFontCollection.cs +++ b/src/SixLabors.Fonts/SystemFontCollection.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/SystemFonts.cs b/src/SixLabors.Fonts/SystemFonts.cs index 6149c23..5ebb884 100644 --- a/src/SixLabors.Fonts/SystemFonts.cs +++ b/src/SixLabors.Fonts/SystemFonts.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Tables/General/CMap/CMapSubTable.cs b/src/SixLabors.Fonts/Tables/General/CMap/CMapSubTable.cs index 230520f..2a8da52 100644 --- a/src/SixLabors.Fonts/Tables/General/CMap/CMapSubTable.cs +++ b/src/SixLabors.Fonts/Tables/General/CMap/CMapSubTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using SixLabors.Fonts.WellKnownIds; diff --git a/src/SixLabors.Fonts/Tables/General/CMap/EncodingRecord.cs b/src/SixLabors.Fonts/Tables/General/CMap/EncodingRecord.cs index 7574912..a934fbe 100644 --- a/src/SixLabors.Fonts/Tables/General/CMap/EncodingRecord.cs +++ b/src/SixLabors.Fonts/Tables/General/CMap/EncodingRecord.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using SixLabors.Fonts.WellKnownIds; diff --git a/src/SixLabors.Fonts/Tables/General/CMap/Format0SubTable.cs b/src/SixLabors.Fonts/Tables/General/CMap/Format0SubTable.cs index d9c9a18..07bfd8b 100644 --- a/src/SixLabors.Fonts/Tables/General/CMap/Format0SubTable.cs +++ b/src/SixLabors.Fonts/Tables/General/CMap/Format0SubTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using SixLabors.Fonts.WellKnownIds; diff --git a/src/SixLabors.Fonts/Tables/General/CMap/Format12SubTable.cs b/src/SixLabors.Fonts/Tables/General/CMap/Format12SubTable.cs index 98e40f3..6f98fcc 100644 --- a/src/SixLabors.Fonts/Tables/General/CMap/Format12SubTable.cs +++ b/src/SixLabors.Fonts/Tables/General/CMap/Format12SubTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using SixLabors.Fonts.WellKnownIds; diff --git a/src/SixLabors.Fonts/Tables/General/CMap/Format4SubTable.cs b/src/SixLabors.Fonts/Tables/General/CMap/Format4SubTable.cs index 3d6865f..4705531 100644 --- a/src/SixLabors.Fonts/Tables/General/CMap/Format4SubTable.cs +++ b/src/SixLabors.Fonts/Tables/General/CMap/Format4SubTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using SixLabors.Fonts.WellKnownIds; diff --git a/src/SixLabors.Fonts/Tables/General/CMapTable.cs b/src/SixLabors.Fonts/Tables/General/CMapTable.cs index 7b864bd..25ae0ce 100644 --- a/src/SixLabors.Fonts/Tables/General/CMapTable.cs +++ b/src/SixLabors.Fonts/Tables/General/CMapTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using System.Linq; diff --git a/src/SixLabors.Fonts/Tables/General/Colr/BaseGlyphRecord.cs b/src/SixLabors.Fonts/Tables/General/Colr/BaseGlyphRecord.cs index 768a7fd..bc673cf 100644 --- a/src/SixLabors.Fonts/Tables/General/Colr/BaseGlyphRecord.cs +++ b/src/SixLabors.Fonts/Tables/General/Colr/BaseGlyphRecord.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Tables/General/ColrTable.cs b/src/SixLabors.Fonts/Tables/General/ColrTable.cs index 912dcec..6599426 100644 --- a/src/SixLabors.Fonts/Tables/General/ColrTable.cs +++ b/src/SixLabors.Fonts/Tables/General/ColrTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Linq; diff --git a/src/SixLabors.Fonts/Tables/General/CpalTable.cs b/src/SixLabors.Fonts/Tables/General/CpalTable.cs index 71dbb59..4c3b8a5 100644 --- a/src/SixLabors.Fonts/Tables/General/CpalTable.cs +++ b/src/SixLabors.Fonts/Tables/General/CpalTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Linq; diff --git a/src/SixLabors.Fonts/Tables/General/GlyphTable.cs b/src/SixLabors.Fonts/Tables/General/GlyphTable.cs index de9265d..231787d 100644 --- a/src/SixLabors.Fonts/Tables/General/GlyphTable.cs +++ b/src/SixLabors.Fonts/Tables/General/GlyphTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using SixLabors.Fonts.Tables.General.Glyphs; diff --git a/src/SixLabors.Fonts/Tables/General/Glyphs/CompositeGlyphLoader.cs b/src/SixLabors.Fonts/Tables/General/Glyphs/CompositeGlyphLoader.cs index 5e0c991..4e62c6a 100644 --- a/src/SixLabors.Fonts/Tables/General/Glyphs/CompositeGlyphLoader.cs +++ b/src/SixLabors.Fonts/Tables/General/Glyphs/CompositeGlyphLoader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Tables/General/Glyphs/EmptyGlyphLoader.cs b/src/SixLabors.Fonts/Tables/General/Glyphs/EmptyGlyphLoader.cs index a174776..3654ec5 100644 --- a/src/SixLabors.Fonts/Tables/General/Glyphs/EmptyGlyphLoader.cs +++ b/src/SixLabors.Fonts/Tables/General/Glyphs/EmptyGlyphLoader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphLoader.cs b/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphLoader.cs index 98e55cc..da6edb0 100644 --- a/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphLoader.cs +++ b/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphLoader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables.General.Glyphs { diff --git a/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphVector.cs b/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphVector.cs index 9fe406b..1aa1b48 100644 --- a/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphVector.cs +++ b/src/SixLabors.Fonts/Tables/General/Glyphs/GlyphVector.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/Tables/General/Glyphs/SimpleGlyphLoader.cs b/src/SixLabors.Fonts/Tables/General/Glyphs/SimpleGlyphLoader.cs index 7c336f6..b4413ae 100644 --- a/src/SixLabors.Fonts/Tables/General/Glyphs/SimpleGlyphLoader.cs +++ b/src/SixLabors.Fonts/Tables/General/Glyphs/SimpleGlyphLoader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Numerics; diff --git a/src/SixLabors.Fonts/Tables/General/HeadTable.cs b/src/SixLabors.Fonts/Tables/General/HeadTable.cs index 8022747..91bba4f 100644 --- a/src/SixLabors.Fonts/Tables/General/HeadTable.cs +++ b/src/SixLabors.Fonts/Tables/General/HeadTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Tables/General/HorizontalHeadTable.cs b/src/SixLabors.Fonts/Tables/General/HorizontalHeadTable.cs index 7722914..d881a2f 100644 --- a/src/SixLabors.Fonts/Tables/General/HorizontalHeadTable.cs +++ b/src/SixLabors.Fonts/Tables/General/HorizontalHeadTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using SixLabors.Fonts.Exceptions; diff --git a/src/SixLabors.Fonts/Tables/General/HorizontalMetricsTable.cs b/src/SixLabors.Fonts/Tables/General/HorizontalMetricsTable.cs index 025ed6e..91c9da9 100644 --- a/src/SixLabors.Fonts/Tables/General/HorizontalMetricsTable.cs +++ b/src/SixLabors.Fonts/Tables/General/HorizontalMetricsTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables.General { diff --git a/src/SixLabors.Fonts/Tables/General/IndexLocationTable.cs b/src/SixLabors.Fonts/Tables/General/IndexLocationTable.cs index 53e224f..8a818c0 100644 --- a/src/SixLabors.Fonts/Tables/General/IndexLocationTable.cs +++ b/src/SixLabors.Fonts/Tables/General/IndexLocationTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using SixLabors.Fonts.Exceptions; diff --git a/src/SixLabors.Fonts/Tables/General/Kern/Format0SubTable.cs b/src/SixLabors.Fonts/Tables/General/Kern/Format0SubTable.cs index 833fdf8..a9d60c1 100644 --- a/src/SixLabors.Fonts/Tables/General/Kern/Format0SubTable.cs +++ b/src/SixLabors.Fonts/Tables/General/Kern/Format0SubTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Tables/General/Kern/KearningPair.cs b/src/SixLabors.Fonts/Tables/General/Kern/KearningPair.cs index 966634d..275d92e 100644 --- a/src/SixLabors.Fonts/Tables/General/Kern/KearningPair.cs +++ b/src/SixLabors.Fonts/Tables/General/Kern/KearningPair.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Tables/General/Kern/KerningCoverage.cs b/src/SixLabors.Fonts/Tables/General/Kern/KerningCoverage.cs index 148472c..6abd67a 100644 --- a/src/SixLabors.Fonts/Tables/General/Kern/KerningCoverage.cs +++ b/src/SixLabors.Fonts/Tables/General/Kern/KerningCoverage.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables.General.Kern { diff --git a/src/SixLabors.Fonts/Tables/General/Kern/KerningSubTable.cs b/src/SixLabors.Fonts/Tables/General/Kern/KerningSubTable.cs index 3708d56..febc9c4 100644 --- a/src/SixLabors.Fonts/Tables/General/Kern/KerningSubTable.cs +++ b/src/SixLabors.Fonts/Tables/General/Kern/KerningSubTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Numerics; diff --git a/src/SixLabors.Fonts/Tables/General/KerningTable.cs b/src/SixLabors.Fonts/Tables/General/KerningTable.cs index c7f381f..3d1dbbe 100644 --- a/src/SixLabors.Fonts/Tables/General/KerningTable.cs +++ b/src/SixLabors.Fonts/Tables/General/KerningTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using System.Numerics; diff --git a/src/SixLabors.Fonts/Tables/General/MaximumProfileTable.cs b/src/SixLabors.Fonts/Tables/General/MaximumProfileTable.cs index 4bd701a..48088ed 100644 --- a/src/SixLabors.Fonts/Tables/General/MaximumProfileTable.cs +++ b/src/SixLabors.Fonts/Tables/General/MaximumProfileTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables.General { diff --git a/src/SixLabors.Fonts/Tables/General/Name/NameRecord.cs b/src/SixLabors.Fonts/Tables/General/Name/NameRecord.cs index 9b7d174..aad96f9 100644 --- a/src/SixLabors.Fonts/Tables/General/Name/NameRecord.cs +++ b/src/SixLabors.Fonts/Tables/General/Name/NameRecord.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Text; diff --git a/src/SixLabors.Fonts/Tables/General/NameTable.cs b/src/SixLabors.Fonts/Tables/General/NameTable.cs index 892399e..b04cf3b 100644 --- a/src/SixLabors.Fonts/Tables/General/NameTable.cs +++ b/src/SixLabors.Fonts/Tables/General/NameTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Collections.Generic; using System.Globalization; diff --git a/src/SixLabors.Fonts/Tables/General/OS2Table.cs b/src/SixLabors.Fonts/Tables/General/OS2Table.cs index 832abb3..f8db8ee 100644 --- a/src/SixLabors.Fonts/Tables/General/OS2Table.cs +++ b/src/SixLabors.Fonts/Tables/General/OS2Table.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables.General { diff --git a/src/SixLabors.Fonts/Tables/Table.cs b/src/SixLabors.Fonts/Tables/Table.cs index e0e885f..48b40c9 100644 --- a/src/SixLabors.Fonts/Tables/Table.cs +++ b/src/SixLabors.Fonts/Tables/Table.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables { diff --git a/src/SixLabors.Fonts/Tables/TableHeader.cs b/src/SixLabors.Fonts/Tables/TableHeader.cs index 77808a8..f8dceb3 100644 --- a/src/SixLabors.Fonts/Tables/TableHeader.cs +++ b/src/SixLabors.Fonts/Tables/TableHeader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.IO; diff --git a/src/SixLabors.Fonts/Tables/TableLoader.cs b/src/SixLabors.Fonts/Tables/TableLoader.cs index a782395..d08a20a 100644 --- a/src/SixLabors.Fonts/Tables/TableLoader.cs +++ b/src/SixLabors.Fonts/Tables/TableLoader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Tables/TableNameAttribute.cs b/src/SixLabors.Fonts/Tables/TableNameAttribute.cs index cd5b80d..c4e8bc8 100644 --- a/src/SixLabors.Fonts/Tables/TableNameAttribute.cs +++ b/src/SixLabors.Fonts/Tables/TableNameAttribute.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; diff --git a/src/SixLabors.Fonts/Tables/TtcHeader.cs b/src/SixLabors.Fonts/Tables/TtcHeader.cs index 078bc04..0e54256 100644 --- a/src/SixLabors.Fonts/Tables/TtcHeader.cs +++ b/src/SixLabors.Fonts/Tables/TtcHeader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Tables/UnknownTable.cs b/src/SixLabors.Fonts/Tables/UnknownTable.cs index 8dce524..f49c217 100644 --- a/src/SixLabors.Fonts/Tables/UnknownTable.cs +++ b/src/SixLabors.Fonts/Tables/UnknownTable.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.Tables { diff --git a/src/SixLabors.Fonts/Tables/WoffTableHeader.cs b/src/SixLabors.Fonts/Tables/WoffTableHeader.cs index dacdc8a..ffd3f03 100644 --- a/src/SixLabors.Fonts/Tables/WoffTableHeader.cs +++ b/src/SixLabors.Fonts/Tables/WoffTableHeader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.IO; diff --git a/src/SixLabors.Fonts/TextLayout.cs b/src/SixLabors.Fonts/TextLayout.cs index b021982..77d6a96 100644 --- a/src/SixLabors.Fonts/TextLayout.cs +++ b/src/SixLabors.Fonts/TextLayout.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/TextMeasurer.cs b/src/SixLabors.Fonts/TextMeasurer.cs index 2e4db46..3c683ff 100644 --- a/src/SixLabors.Fonts/TextMeasurer.cs +++ b/src/SixLabors.Fonts/TextMeasurer.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/TextRenderer.cs b/src/SixLabors.Fonts/TextRenderer.cs index 7342d4c..164a7eb 100644 --- a/src/SixLabors.Fonts/TextRenderer.cs +++ b/src/SixLabors.Fonts/TextRenderer.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System; using System.Collections.Generic; diff --git a/src/SixLabors.Fonts/Utilities/EncodingIDExtensions.cs b/src/SixLabors.Fonts/Utilities/EncodingIDExtensions.cs index cff6642..c1a2158 100644 --- a/src/SixLabors.Fonts/Utilities/EncodingIDExtensions.cs +++ b/src/SixLabors.Fonts/Utilities/EncodingIDExtensions.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Text; using SixLabors.Fonts.WellKnownIds; diff --git a/src/SixLabors.Fonts/Utilities/StringLoader.cs b/src/SixLabors.Fonts/Utilities/StringLoader.cs index 404d04f..5082811 100644 --- a/src/SixLabors.Fonts/Utilities/StringLoader.cs +++ b/src/SixLabors.Fonts/Utilities/StringLoader.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. using System.Text; diff --git a/src/SixLabors.Fonts/VerticalAlignment.cs b/src/SixLabors.Fonts/VerticalAlignment.cs index ca79207..ea68b8e 100644 --- a/src/SixLabors.Fonts/VerticalAlignment.cs +++ b/src/SixLabors.Fonts/VerticalAlignment.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts { diff --git a/src/SixLabors.Fonts/WellKnownIds/EncodingIDs.cs b/src/SixLabors.Fonts/WellKnownIds/EncodingIDs.cs index bf219c5..2b57ebb 100644 --- a/src/SixLabors.Fonts/WellKnownIds/EncodingIDs.cs +++ b/src/SixLabors.Fonts/WellKnownIds/EncodingIDs.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.WellKnownIds { diff --git a/src/SixLabors.Fonts/WellKnownIds/NameIds.cs b/src/SixLabors.Fonts/WellKnownIds/NameIds.cs index 3b6a35b..e25e96f 100644 --- a/src/SixLabors.Fonts/WellKnownIds/NameIds.cs +++ b/src/SixLabors.Fonts/WellKnownIds/NameIds.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.WellKnownIds { diff --git a/src/SixLabors.Fonts/WellKnownIds/PlatformIDs.cs b/src/SixLabors.Fonts/WellKnownIds/PlatformIDs.cs index 599727b..e5a336a 100644 --- a/src/SixLabors.Fonts/WellKnownIds/PlatformIDs.cs +++ b/src/SixLabors.Fonts/WellKnownIds/PlatformIDs.cs @@ -1,5 +1,5 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the GNU Affero General Public License, Version 3. +// Copyright (c) Six Labors. +// Licensed under the Apache License, Version 2.0. namespace SixLabors.Fonts.WellKnownIds { diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 81d3925..b940d08 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -24,13 +24,14 @@ - + - - + + + diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index acc11d5..2402425 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -17,37 +17,21 @@ - + - - - - - true - true - [SixLabors.*]* - lcov - - $(MSBuildThisFileDirectory)..\ - $(CoverletOutputPath)$(AssemblyName).$(TargetFramework).lcov - - - true - - + - + - - - + + diff --git a/tests/SixLabors.Fonts.Tests/SixLabors.Fonts.Tests.csproj b/tests/SixLabors.Fonts.Tests/SixLabors.Fonts.Tests.csproj index b642fd9..7b466bd 100644 --- a/tests/SixLabors.Fonts.Tests/SixLabors.Fonts.Tests.csproj +++ b/tests/SixLabors.Fonts.Tests/SixLabors.Fonts.Tests.csproj @@ -4,6 +4,8 @@ netcoreapp3.1;netcoreapp2.1;net472 True AnyCPU;x64;x86 + + true @@ -15,7 +17,7 @@ - + diff --git a/tests/coverlet.runsettings b/tests/coverlet.runsettings new file mode 100644 index 0000000..ee408a5 --- /dev/null +++ b/tests/coverlet.runsettings @@ -0,0 +1,14 @@ + + + + + + + lcov + [SixLabors.*]* + true + + + + +