Merge branch 'master' into js/buffered-read

Author: JimBobSquarePants

.gitattributes

@@ -107,6 +107,7 @@
 *.tga               binary
 *.ttc               binary
 *.ttf               binary
+*.webp              binary
 *.woff              binary
 *.woff2             binary
 *.xls               binary

.github/ISSUE_TEMPLATE/ask-question.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 ImageSharp
+- [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
+- [ ] I have searched [open](https://github.com/SixLabors/ImageSharp/issues) and [closed](https://github.com/SixLabors/ImageSharp/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
+
+### Description
+<!-- A description of the bug or feature -->
+
+### Steps to Reproduce
+<!-- List of steps, sample code, failing test or link to a project that reproduces the behavior -->
+
+### System Configuration
+<!-- Tell us about the environment where you are experiencing the bug -->
+
+- ImageSharp version:
+- Other ImageSharp packages and versions:
+- Environment (Operating system, version and so on):
+- .NET Framework version:
+- Additional information:
+
+<!-- Thanks for reporting the issue to ImageSharp! -->

.github/ISSUE_TEMPLATE/commercial-bug-report.md

@@ -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.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,7 @@
 ---
-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
 
 ---
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -52,31 +52,14 @@ jobs:
                   git fetch --prune --unshallow
                   git submodule -q update --init --recursive
 
-            - name: Fetch Tags for GitVersion
-              run: |
-                  git fetch --tags
-
-            - name: Fetch master for GitVersion
-              if: github.ref != 'refs/heads/master'
-              run: git branch --create-reflog master origin/master
-
-            - name: Install GitVersion
-              uses: gittools/actions/setup-gitversion@v0.3
-              with:
-                  versionSpec: "5.1.x"
-
-            - name: Use GitVersion
-              id: gitversion # step id used as reference for output values
-              uses: gittools/actions/execute-gitversion@v0.3
-
             - name: Setup DotNet SDK
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: "3.1.101"
+                  dotnet-version: "3.1.x"
 
             - name: Build
               shell: pwsh
-              run: ./ci-build.ps1 "${{steps.gitversion.outputs.nuGetVersion}}" "${{matrix.options.framework}}"
+              run: ./ci-build.ps1 "${{matrix.options.framework}}"
 
             - name: Test
               shell: pwsh
@@ -85,14 +68,10 @@ jobs:
                   CI: True
                   XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
 
-            # Avoid "Please provide the repository token to upload reports via `-t :repository-token`"
-            # https://community.codecov.io/t/whitelist-github-action-servers-to-upload-without-a-token/491/10
-            # https://github.blesdmm.dns-dynamic.netmunity/t5/GitHub-Actions/Make-secrets-available-to-builds-of-forks/m-p/42814/highlight/true#M5129
             - name: Update Codecov
-              uses: iansu/codecov-action-node@v1.0.0
+              uses: codecov/codecov-action@v1.0.7
               if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
               with:
-                  token: 0ef021c7-2679-4012-b42f-4bed33d99450
                   flags: unittests
 
     Publish:
@@ -116,33 +95,18 @@ jobs:
                   git fetch --prune --unshallow
                   git submodule -q update --init --recursive
 
-            - name: Fetch Tags for GitVersion
-              run: |
-                  git fetch --tags
-
-            - name: Fetch master for GitVersion
-              if: github.ref != 'refs/heads/master'
-              run: git branch --create-reflog master origin/master
-
-            - name: Install GitVersion
-              uses: gittools/actions/setup-gitversion@v0.3
-              with:
-                  versionSpec: "5.1.x"
-
-            - name: Use GitVersion
-              id: gitversion # step id used as reference for output values
-              uses: gittools/actions/execute-gitversion@v0.3
-
             - name: Setup DotNet SDK
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: "3.1.101"
+                  dotnet-version: "3.1.x"
 
             - name: Pack
               shell: pwsh
-              run: ./ci-pack.ps1 "${{steps.gitversion.outputs.nuGetVersion}}"
+              run: ./ci-pack.ps1
 
             - name: Publish to MyGet
               shell: pwsh
-              run: nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
+              run: |
+                  nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
+                  nuget.exe push .\artifacts\*.snupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v3/index.json
               # TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org

.github/ISSUE_TEMPLATE/bug-report.md .github/ISSUE_TEMPLATE/oss-bug-report.md.github/ISSUE_TEMPLATE/bug-report.md renamed to .github/ISSUE_TEMPLATE/oss-bug-report.md

@@ -13,7 +13,7 @@
   <!-- Default settings that are used by other settings -->
   <PropertyGroup>
     <BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
-    <BaseArtifactsPathSuffix>$(ImageSharpProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
+    <BaseArtifactsPathSuffix>$(SixLaborsProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp/</RepositoryUrl>
   </PropertyGroup>
 
@@ -25,7 +25,6 @@
     <DebugType Condition="'$(codecov)' != ''">full</DebugType>
     <NullableContextOptions>disable</NullableContextOptions>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <SignAssembly>false</SignAssembly>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
@@ -45,22 +44,40 @@
     -->
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_RUNTIME_INTRINSICS;SUPPORTS_CODECOVERAGE;SUPPORTS_HOTPATH</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_RUNTIME_INTRINSICS</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_HOTPATH</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_CODECOVERAGE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_SPAN_STREAM</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_CODECOVERAGE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
 
   <!-- Default settings that explicitly differ from the Sdk.targets defaults-->
@@ -75,16 +92,21 @@
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 
+  <!--MinVer Properties for versioning-->
+  <PropertyGroup>
+    <MinVerTagPrefix>v</MinVerTagPrefix>
+    <MinVerVerbosity>normal</MinVerVerbosity>
+  </PropertyGroup>
+
   <!-- Default settings that are otherwise undefined -->
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
-    <Copyright>Copyright © Six Labors and Contributors</Copyright>
+    <Copyright>Copyright © Six Labors</Copyright>
     <Features>strict;IOperation</Features>
     <HighEntropyVA>true</HighEntropyVA>
     <LangVersion>8.0</LangVersion>
     <NeutralLanguage>en</NeutralLanguage>
     <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
-    <PackageIcon>icon.png</PackageIcon>
+    <PackageIcon>sixlabors.imagesharp.128.png</PackageIcon>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
@@ -95,9 +117,10 @@
       <!-- Contains RemoteExecutor. Taken from: https://github.com/dotnet/runtime/blob/master/NuGet.config -->
       https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
     </RestoreSources>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
     <SixLaborsPublicKey>00240000048000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
     <UseSharedCompilation>true</UseSharedCompilation>
-    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <!-- Package references and additional files which are consumed by all projects -->
@@ -107,7 +130,7 @@
     <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
     <!--NuGet package icon source-->
-    <None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="\icon.png" />
+    <None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>

.github/workflows/build-and-test.yml

@@ -23,6 +23,8 @@
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
 
     <!--Src Dependencies-->
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
     <PackageReference Update="System.Buffers" Version="4.5.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />