Skip to content

Commit 2e13b2f

Browse files
ronaldbarendseronaldbarendse
committed
Merge branch 'master' into feature/net5-net6-builds
2 parents 4e0d69d + 40a5075 commit 2e13b2f

37 files changed

Lines changed: 1641 additions & 269 deletions

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# How to contribute to ImageSharp.Web
1+
# How to contribute to SixLabors.ImageSharp.Web
22

33
#### **Did you find a bug?**
44

@@ -16,20 +16,18 @@
1616

1717
#### **Do you intend to add a new feature or change an existing one?**
1818

19-
* Suggest your change in the [ImageSharp Gitter Chat Room](https://gitter.im/ImageSharp/General) and start writing code.
19+
* Suggest your change in the [Ideas Discussions Channel](https://github.com/SixLabors/ImageSharp.Web/discussions?discussions_q=category%3AIdeas) and start writing code.
2020

2121
* Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
2222

2323
#### **Do you have questions about consuming the library or the source code?**
2424

25-
* Ask any question about how to use ImageSharp in the [ImageSharp Gitter Chat Room](https://gitter.im/ImageSharp/General).
25+
* Ask any question about how to use SixLabors.ImageSharp.Web in the [Help Discussions Channel](https://github.com/SixLabors/ImageSharp.Web/discussions?discussions_q=category%3AHelp).
2626

27-
#### Code of Conduct
27+
#### Code of Conduct
2828
This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org/) to clarify expected behavior in our community.
2929
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
3030

31-
And please remember. ImageSharp.Web is the work of a very, very, small number of developers who struggle balancing time to contribute to the project with family time and work commitments. We encourage you to pitch in and help make our vision of simple accessible imageprocessing available to all. Open Source can only exist with your help.
31+
And please remember. SixLabors.ImageSharp.Web is the work of a very, very, small number of developers who struggle balancing time to contribute to the project with family time and work commitments. We encourage you to pitch in and help make our vision of simple accessible image processing available to all. Open Source can only exist with your help.
3232

3333
Thanks for reading!
34-
35-
James Jackson-South :heart:

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

Lines changed: 163 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,172 @@
11
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- master
7-
tags:
8-
- "v*"
9-
pull_request:
10-
branches:
11-
- master
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- "v*"
9+
pull_request:
10+
branches:
11+
- master
1212

1313
jobs:
14-
Build:
15-
strategy:
16-
matrix:
17-
options:
18-
- os: macos-latest
19-
framework: net6.0
20-
runtime: -x64
21-
codecov: false
22-
- os: ubuntu-latest
23-
framework: net6.0
24-
runtime: -x64
25-
codecov: false
26-
- os: windows-latest
27-
framework: net6.0
28-
runtime: -x64
29-
codecov: true
30-
- os: windows-latest
31-
framework: net5.0
32-
runtime: -x64
33-
codecov: false
34-
- os: windows-latest
35-
framework: netcoreapp3.1
36-
runtime: -x64
37-
codecov: false
38-
- os: windows-latest
39-
framework: netcoreapp2.1
40-
runtime: -x64
41-
codecov: false
42-
43-
runs-on: ${{matrix.options.os}}
44-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
45-
46-
steps:
47-
- uses: actions/checkout@v2
48-
49-
# See https://github.com/actions/checkout/issues/165#issuecomment-657673315
50-
- name: Create LFS file list
51-
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
52-
53-
- name: Restore LFS cache
54-
uses: actions/cache@v2
55-
id: lfs-cache
56-
with:
57-
path: .git/lfs
58-
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1
59-
60-
- name: Git LFS Pull
61-
run: git lfs pull
62-
63-
- name: Setup .NET SDKs
64-
uses: actions/setup-dotnet@v1
65-
with:
66-
dotnet-version: |
67-
6.0.x
68-
5.0.x
69-
3.1.x
70-
2.1.x
14+
Build:
15+
strategy:
16+
matrix:
17+
options:
18+
- os: macos-latest
19+
framework: netcoreapp3.1
20+
runtime: -x64
21+
codecov: false
22+
- os: ubuntu-latest
23+
framework: netcoreapp3.1
24+
runtime: -x64
25+
codecov: false
26+
- os: windows-latest
27+
framework: netcoreapp3.1
28+
runtime: -x64
29+
codecov: true
30+
- os: windows-latest
31+
framework: netcoreapp2.1
32+
runtime: -x64
33+
codecov: false
34+
35+
runs-on: ${{matrix.options.os}}
36+
if: "!contains(github.event.head_commit.message, '[skip ci]')"
37+
38+
steps:
39+
- name: Git Config
40+
shell: bash
41+
run: |
42+
git config --global core.autocrlf false
43+
git config --global core.longpaths true
44+
45+
- name: Git Checkout
46+
uses: actions/checkout@v2
47+
with:
48+
fetch-depth: 0
49+
submodules: recursive
50+
51+
# See https://github.com/actions/checkout/issues/165#issuecomment-657673315
52+
- name: Git Create LFS file list
53+
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
54+
55+
- name: Git Setup LFS Cache
56+
uses: actions/cache@v2
57+
id: lfs-cache
58+
with:
59+
path: .git/lfs
60+
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1
61+
62+
- name: Git Pull LFS
63+
run: git lfs pull
7164

7265
- name: Install NuGet
7366
uses: NuGet/setup-nuget@v1
7467

75-
- name: Setup Git
76-
shell: bash
77-
run: |
78-
git config --global core.autocrlf false
79-
git config --global core.longpaths true
80-
git fetch --prune --unshallow
81-
git submodule -q update --init --recursive
82-
83-
- name: Setup Azurite
84-
if: matrix.options.os != 'windows-latest'
85-
shell: bash
86-
run: |
87-
sudo npm install -g azurite
88-
sudo azurite --loose &
89-
90-
- name: Setup Azurite Windows
91-
if: matrix.options.os == 'windows-latest'
92-
shell: bash
93-
run: |
94-
npm install -g azurite
95-
azurite --loose &
96-
97-
- name: Setup s3rver
98-
if: matrix.options.os != 'windows-latest'
99-
shell: bash
100-
run: |
101-
sudo npm install -g s3rver
102-
sudo s3rver -d . &
103-
104-
- name: Setup s3rver Windows
105-
if: matrix.options.os == 'windows-latest'
106-
shell: bash
107-
run: |
108-
npm install -g s3rver
109-
s3rver -d . &
110-
111-
- name: Setup NuGet Cache
112-
uses: actions/cache@v2
113-
id: nuget-cache
114-
with:
115-
path: ~/.nuget
116-
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
117-
restore-keys: ${{ runner.os }}-nuget-
118-
119-
- name: Build
120-
shell: pwsh
121-
run: ./ci-build.ps1 "${{matrix.options.framework}}"
122-
env:
123-
SIXLABORS_TESTING: True
124-
125-
- name: Test
126-
shell: pwsh
127-
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
128-
env:
129-
SIXLABORS_TESTING: True
130-
XUNIT_PATH: .\tests\ImageSharp.Web.Tests # Required for xunit
131-
132-
- name: Update Codecov
133-
uses: codecov/codecov-action@v1
134-
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
135-
with:
136-
flags: unittests
137-
138-
Publish:
139-
needs: [Build]
140-
141-
runs-on: windows-latest
142-
143-
if: (github.event_name == 'push')
144-
145-
steps:
146-
- uses: actions/checkout@v2
147-
148-
- name: Install NuGet
149-
uses: NuGet/setup-nuget@v1
150-
151-
- name: Setup Git
152-
shell: bash
153-
run: |
154-
git config --global core.autocrlf false
155-
git config --global core.longpaths true
156-
git fetch --prune --unshallow
157-
git submodule -q update --init --recursive
158-
159-
- name: Pack
160-
shell: pwsh
161-
run: ./ci-pack.ps1
162-
163-
- name: Publish to MyGet
164-
shell: pwsh
165-
run: |
166-
nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
167-
nuget.exe push .\artifacts\*.snupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v3/index.json
168-
# TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org
68+
- name: NuGet Setup Cache
69+
uses: actions/cache@v2
70+
id: nuget-cache
71+
with:
72+
path: ~/.nuget
73+
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
74+
restore-keys: ${{ runner.os }}-nuget-
75+
76+
- name: Azurite Setup
77+
if: matrix.options.os != 'windows-latest'
78+
shell: bash
79+
run: |
80+
sudo npm install -g azurite
81+
sudo azurite --loose &
82+
83+
- name: Azurite Setup Windows
84+
if: matrix.options.os == 'windows-latest'
85+
shell: bash
86+
run: |
87+
npm install -g azurite
88+
azurite --loose &
89+
90+
- name: S3rver Setup
91+
if: matrix.options.os != 'windows-latest'
92+
shell: bash
93+
run: |
94+
sudo npm install -g s3rver
95+
sudo s3rver -d . &
96+
97+
- name: S3rver Setup Windows
98+
if: matrix.options.os == 'windows-latest'
99+
shell: bash
100+
run: |
101+
npm install -g s3rver
102+
s3rver -d . &
103+
104+
- name: DotNet Setup
105+
uses: actions/setup-dotnet@v1
106+
with:
107+
dotnet-version: |
108+
6.0.x
109+
5.0.x
110+
3.1.x
111+
2.1.x
112+
113+
- name: DotNet Build
114+
shell: pwsh
115+
run: ./ci-build.ps1 "${{matrix.options.framework}}"
116+
env:
117+
SIXLABORS_TESTING: True
118+
119+
- name: DotNet Test
120+
shell: pwsh
121+
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
122+
env:
123+
SIXLABORS_TESTING: True
124+
XUNIT_PATH: .\tests\ImageSharp.Web.Tests # Required for xunit
125+
126+
- name: Codecov Update
127+
uses: codecov/codecov-action@v1
128+
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
129+
with:
130+
flags: unittests
131+
132+
Publish:
133+
needs: [Build]
134+
135+
runs-on: ubuntu-latest
136+
137+
if: (github.event_name == 'push')
138+
139+
steps:
140+
- name: Git Config
141+
shell: bash
142+
run: |
143+
git config --global core.autocrlf false
144+
git config --global core.longpaths true
145+
146+
- name: Git Checkout
147+
uses: actions/checkout@v2
148+
with:
149+
fetch-depth: 0
150+
submodules: recursive
151+
152+
- name: NuGet Install
153+
uses: NuGet/setup-nuget@v1
154+
155+
- name: NuGet Setup Cache
156+
uses: actions/cache@v2
157+
id: nuget-cache
158+
with:
159+
path: ~/.nuget
160+
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
161+
restore-keys: ${{ runner.os }}-nuget-
162+
163+
- name: DotNet Pack
164+
shell: pwsh
165+
run: ./ci-pack.ps1
166+
167+
- name: MyGet Publish
168+
shell: pwsh
169+
run: |
170+
dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.MYGET_TOKEN}} -s https://www.myget.org/F/sixlabors/api/v2/package
171+
dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.MYGET_TOKEN}} -s https://www.myget.org/F/sixlabors/api/v3/index.json
172+
# TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org

‎samples/ImageSharp.Web.Sample/Startup.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using SixLabors.ImageSharp.Web.Caching;
1313
using SixLabors.ImageSharp.Web.Commands;
1414
using SixLabors.ImageSharp.Web.DependencyInjection;
15-
using SixLabors.ImageSharp.Web.Middleware;
1615
using SixLabors.ImageSharp.Web.Processors;
1716
using SixLabors.ImageSharp.Web.Providers;
1817

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_0.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_1.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_2.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_3.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_4.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_5.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_6.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)