Skip to content

Commit 5ca9a8d

Browse files
Added conditional target frameworks
1 parent 8209575 commit 5ca9a8d

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,57 +17,46 @@ jobs:
1717
options:
1818
- os: ubuntu-latest
1919
framework: net6.0
20-
sdk: 6.0.x
2120
runtime: -x64
2221
codecov: false
2322
- os: macos-latest
2423
framework: net6.0
25-
sdk: 6.0.x
2624
runtime: -x64
2725
codecov: false
2826
- os: windows-latest
2927
framework: net6.0
30-
sdk: 6.0.x
3128
runtime: -x64
3229
codecov: true
3330
- os: ubuntu-latest
3431
framework: net5.0
35-
sdk: 5.0.x
3632
runtime: -x64
3733
codecov: false
3834
- os: macos-latest
3935
framework: net5.0
40-
sdk: 5.0.x
4136
runtime: -x64
4237
codecov: false
4338
- os: windows-latest
4439
framework: net5.0
45-
sdk: 5.0.x
4640
runtime: -x64
4741
codecov: false
4842
- os: ubuntu-latest
4943
framework: netcoreapp3.1
50-
sdk: 3.1.x
5144
runtime: -x64
5245
codecov: false
5346
- os: macos-latest
5447
framework: netcoreapp3.1
55-
sdk: 3.1.x
5648
runtime: -x64
5749
codecov: false
5850
- os: windows-latest
5951
framework: netcoreapp3.1
60-
sdk: 3.1.x
6152
runtime: -x64
6253
codecov: false
6354
- os: windows-latest
6455
framework: netcoreapp2.1
65-
sdk: 2.1.x
6656
runtime: -x64
6757
codecov: false
6858

6959
runs-on: ${{matrix.options.os}}
70-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
7160

7261
steps:
7362
- name: Git Config
@@ -83,7 +72,7 @@ jobs:
8372
submodules: recursive
8473

8574
# See https://github.com/actions/checkout/issues/165#issuecomment-657673315
86-
- name: Git Create LFS file list
75+
- name: Git Create LFS FileList
8776
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
8877

8978
- name: Git Setup LFS Cache
@@ -96,7 +85,7 @@ jobs:
9685
- name: Git Pull LFS
9786
run: git lfs pull
9887

99-
- name: Install NuGet
88+
- name: NuGet Install
10089
uses: NuGet/setup-nuget@v1
10190

10291
- name: NuGet Setup Cache
@@ -136,10 +125,13 @@ jobs:
136125
s3rver -d . &
137126
138127
- name: DotNet Setup
139-
if: ${{matrix.options.sdk}}
140128
uses: actions/setup-dotnet@v1
141129
with:
142-
dotnet-version: ${{matrix.options.sdk}}
130+
dotnet-version: |
131+
6.0.x
132+
5.0.x
133+
3.1.x
134+
2.1.x
143135
144136
- name: DotNet Build
145137
shell: pwsh

src/ImageSharp.Web/ImageSharp.Web.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@
1717
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
1818
</PropertyGroup>
1919

20+
<Choose>
21+
<When Condition="$(SIXLABORS_TESTING) == true">
22+
<PropertyGroup>
23+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
24+
</PropertyGroup>
25+
</When>
26+
<Otherwise>
27+
<PropertyGroup>
28+
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
29+
</PropertyGroup>
30+
</Otherwise>
31+
</Choose>
32+
2033
<ItemGroup>
2134
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
2235
</ItemGroup>

0 commit comments

Comments
 (0)