Browse Source

use CI environment variable to also build on .net5.0

pull/1554/head
Stefan Nikolei 5 years ago
parent
commit
e5f640182c
  1. 31
      .github/workflows/build-and-test.yml
  2. 7
      src/ImageSharp/ImageSharp.csproj

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

@ -15,48 +15,39 @@ jobs:
matrix:
options:
- os: ubuntu-latest
framework-build: netcoreapp3.1
framework-test: net5.0
framework: net5.0
runtime: -x64
codecov: false
- os: macos-latest
framework-build: netcoreapp3.1
framework-test: net5.0
framework: net5.0
runtime: -x64
codecov: false
- os: windows-latest
framework-build: netcoreapp3.1
framework-test: net5.0
framework: net5.0
runtime: -x64
codecov: false
- os: ubuntu-latest
framework-build: netcoreapp3.1
framework-test: netcoreapp3.1
framework: netcoreapp3.1
runtime: -x64
codecov: true
- os: macos-latest
framework-build: netcoreapp3.1
framework-test: netcoreapp3.1
framework: netcoreapp3.1
runtime: -x64
codecov: false
- os: windows-latest
framework-build: netcoreapp3.1
framework-test: netcoreapp3.1
framework: netcoreapp3.1
runtime: -x64
codecov: false
- os: windows-latest
framework-build: netcoreapp2.1
framework-test: netcoreapp2.1
framework: netcoreapp2.1
runtime: -x64
codecov: false
- os: windows-latest
framework-build: net472
framework-test: net472
framework: net472
runtime: -x64
codecov: false
- os: windows-latest
framework-build: net472
framework-test: net472
framework: net472
runtime: -x86
codecov: false
@ -87,11 +78,11 @@ jobs:
- name: Build
shell: pwsh
run: ./ci-build.ps1 "${{matrix.options.framework-build}}"
run: ./ci-build.ps1 "${{matrix.options.framework}}"
- name: Test
shell: pwsh
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework-test}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
env:
CI: True
XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit

7
src/ImageSharp/ImageSharp.csproj

@ -12,9 +12,16 @@
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
<PackageTags>Image Resize Crop Gif Jpg Jpeg Bitmap Png Tga NetCore</PackageTags>
<Description>A new, fully featured, fully managed, cross-platform, 2D graphics API for .NET</Description>
</PropertyGroup>
<PropertyGroup Condition="$(CI) == false" >
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="$(CI) == true">
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="" />
</ItemGroup>

Loading…
Cancel
Save