Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build against .NET 5 and .NET 6 #216

Merged
merged 8 commits into from
Mar 16, 2022
Merged

Build against .NET 5 and .NET 6 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d136a8e
Build against .NET 5 and .NET 6
ronaldbarendse Feb 3, 2022
62e4675
Build using .NET 5 on MacOS and Ubuntu
ronaldbarendse Feb 3, 2022
4e0d69d
Setup required .NET SDSs
ronaldbarendse Feb 3, 2022
2e13b2f
Merge branch 'master' into feature/net5-net6-builds
ronaldbarendse Feb 9, 2022
8209575
Update build matrix and dotnet SDK setup
ronaldbarendse Feb 9, 2022
5ca9a8d
Added conditional target frameworks
ronaldbarendse Feb 9, 2022
4e9e262
Updated target frameworks
ronaldbarendse Feb 9, 2022
616d943
Merge branch 'main' into feature/net5-net6-builds
JimBobSquarePants Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,48 @@ jobs:
strategy:
matrix:
options:
- os: ubuntu-latest
framework: net6.0
runtime: -x64
codecov: false
- os: macos-latest
framework: netcoreapp3.1
framework: net6.0
runtime: -x64
codecov: false
- os: windows-latest
framework: net6.0
runtime: -x64
codecov: true
- os: ubuntu-latest
framework: net5.0
runtime: -x64
codecov: false
- os: macos-latest
framework: net5.0
runtime: -x64
codecov: false
- os: windows-latest
framework: net5.0
runtime: -x64
codecov: false
- os: ubuntu-latest
framework: netcoreapp3.1
runtime: -x64
codecov: false
- os: macos-latest
framework: netcoreapp3.1
runtime: -x64
codecov: false
- os: windows-latest
framework: netcoreapp3.1
runtime: -x64
codecov: true
codecov: false
- os: windows-latest
framework: netcoreapp2.1
runtime: -x64
codecov: false

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

steps:
- name: Git Config
Expand All @@ -49,7 +72,7 @@ jobs:
submodules: recursive

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

- name: Git Setup LFS Cache
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Update="SixLabors.ImageSharp" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<FrameworkReference Update="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand Down
15 changes: 12 additions & 3 deletions src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@
<Description>A provider for resolving and caching images via AWS S3 Storage.</Description>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
<Choose>
<When Condition="$(SIXLABORS_TESTING) == true">
<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</Otherwise>
</Choose>

<ItemGroup>
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
Expand Down
19 changes: 14 additions & 5 deletions src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,25 @@
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
<PackageTags>Image Middleware Resize Crop Gif Jpg Jpeg Bitmap Png Azure</PackageTags>
<Description>A provider for resolving and caching images via Azure Blob Storage.</Description>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>

<Choose>
<When Condition="$(SIXLABORS_TESTING) == true">
<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</Otherwise>
</Choose>

<ItemGroup>
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" />
</ItemGroup>
Expand Down
18 changes: 13 additions & 5 deletions src/ImageSharp.Web/ImageSharp.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,24 @@
<Description>ImageSharp Middleware for serving images via a url based API.</Description>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
<Choose>
<When Condition="$(SIXLABORS_TESTING) == true">
<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>
</Otherwise>
</Choose>

<ItemGroup>
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp.web\sixlabors.imagesharp.web.128.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand All @@ -39,7 +48,6 @@
<PackageReference Include="SixLabors.ImageSharp" />
</ItemGroup>


<Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

</Project>
2 changes: 1 addition & 1 deletion tests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
<AssemblyName>ImageSharp.Web.Benchmarks</AssemblyName>
<RootNamespace>SixLabors.ImageSharp.Web.Benchmarks</RootNamespace>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
4 changes: 2 additions & 2 deletions tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<PropertyGroup>
<RootNamespace>SixLabors.ImageSharp.Web.Tests</RootNamespace>
<AssemblyName>SixLabors.ImageSharp.Web.Tests</AssemblyName>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
</ItemGroup>

Expand Down