Skip to content

Commit 2bce803

Browse files
Merge pull request #98 from SixLabors/js/apache
Update license, docs, config, and refs
2 parents fac01cc + 9f39359 commit 2bce803

File tree

90 files changed

+496
-863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+496
-863
lines changed

.github/ISSUE_TEMPLATE/ask-question.md

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: "Commercial License : Bug Report"
3+
about: |
4+
Create a report to help us improve the project. For Commercial License holders only.
5+
Please contact [email protected] for issues requiring private support.
6+
labels: commercial, needs triage
7+
8+
---
9+
10+
11+
### Prerequisites
12+
13+
- [ ] I have written a descriptive issue title
14+
- [ ] I have verified that I am running the latest version of ImageSharp.Web
15+
- [ ] I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
16+
- [ ] I have searched [open](https://github.com/SixLabors/ImageSharp.Web/issues) and [closed](https://github.com/SixLabors/ImageSharp.Web/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
17+
18+
### Description
19+
<!-- A description of the bug or feature -->
20+
21+
### Steps to Reproduce
22+
<!-- List of steps, sample code, failing test or link to a project that reproduces the behavior -->
23+
24+
### System Configuration
25+
<!-- Tell us about the environment where you are experiencing the bug -->
26+
27+
- ImageSharp.Web version:
28+
- Other Six Labors packages and versions:
29+
- Environment (Operating system, version and so on):
30+
- .NET Framework version:
31+
- Additional information:
32+
33+
<!-- Thanks for reporting the issue to ImageSharp.Web! -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Ask a Question
4+
url: https://github.com/SixLabors/ImageSharp/discussions/new?category_id=6331980
5+
about: Ask a question about this project.
6+
- name: Feature Request
7+
url: https://github.com/SixLabors/ImageSharp/discussions/new?category_id=6331981
8+
about: Share ideas for new features for this project.

.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
name: Bug report
3-
about: Create a report to help us improve
2+
name: "OSS : Bug Report"
3+
about: Create a report to help us improve the project.
4+
labels: needs triage
45

56
---
67

@@ -21,9 +22,9 @@ about: Create a report to help us improve
2122
<!-- Tell us about the environment where you are experiencing the bug -->
2223

2324
- ImageSharp.Web version:
24-
- Other ImageSharp packages and versions:
25+
- Other Six Labors packages and versions:
2526
- Environment (Operating system, version and so on):
2627
- .NET Framework version:
2728
- Additional information:
2829

29-
<!-- Thanks for reporting the issue to ImageSharp! -->
30+
<!-- Thanks for reporting the issue to ImageSharp.Web! -->

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,9 @@ jobs:
9595
XUNIT_PATH: .\tests\ImageSharp.Web.Tests # Required for xunit
9696

9797
- name: Update Codecov
98-
uses: iansu/codecov-action-node@v1.0.0
99-
if: matrix.options.codecov == true
98+
uses: codecov/[email protected].7
99+
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
100100
with:
101-
token: ${{secrets.CODECOV_TOKEN}}
102101
flags: unittests
103102

104103
Publish:

Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<NeutralLanguage>en</NeutralLanguage>
7777
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
7878
<PackageIcon>sixlabors.imagesharp.web.128.png</PackageIcon>
79-
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
79+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8080
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
8181
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
8282
<RepositoryType>git</RepositoryType>
@@ -97,7 +97,6 @@
9797
<AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
9898
<!--NuGet package icon source-->
9999
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
100-
<None Include="$(MSBuildThisFileDirectory)shared-infrastructure\NUGETLICENSE.md" Pack="true" PackagePath="LICENSE.md" />
101100
</ItemGroup>
102101

103102
</Project>

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
2323

2424
<!--Src Dependencies-->
25-
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-rc0001" />
25+
<PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
2626
<PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
2727
</ItemGroup>
2828

ImageSharp.Web.sln

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,20 @@ EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Web.Providers.Azure", "src\ImageSharp.Web.Providers.Azure\ImageSharp.Web.Providers.Azure.csproj", "{E2A545EC-B909-4EAD-B95F-397F68588BE3}"
4141
EndProject
4242
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B8152C86-B657-4967-B297-42F89A10D23A}"
43+
EndProject
44+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
45+
EndProject
46+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{04955CD1-F249-4899-9F61-6C7487BEECE1}"
4347
ProjectSection(SolutionItems) = preProject
44-
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
48+
.github\ISSUE_TEMPLATE\commercial-bug-report.md = .github\ISSUE_TEMPLATE\commercial-bug-report.md
49+
.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
50+
.github\ISSUE_TEMPLATE\oss-bug-report.md = .github\ISSUE_TEMPLATE\oss-bug-report.md
4551
EndProjectSection
4652
EndProject
47-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
53+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{2A5EF4AC-E228-42C1-970B-35630A9AF250}"
54+
ProjectSection(SolutionItems) = preProject
55+
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
56+
EndProjectSection
4857
EndProject
4958
Global
5059
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -120,6 +129,8 @@ Global
120129
{E2A545EC-B909-4EAD-B95F-397F68588BE3} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
121130
{B8152C86-B657-4967-B297-42F89A10D23A} = {C317F1B1-D75E-4C6D-83EB-80367343E0D7}
122131
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
132+
{04955CD1-F249-4899-9F61-6C7487BEECE1} = {B8152C86-B657-4967-B297-42F89A10D23A}
133+
{2A5EF4AC-E228-42C1-970B-35630A9AF250} = {B8152C86-B657-4967-B297-42F89A10D23A}
123134
EndGlobalSection
124135
GlobalSection(ExtensibilityGlobals) = postSolution
125136
SolutionGuid = {C5B38B65-A19E-4359-859C-5B2205429BD1}

0 commit comments

Comments
 (0)