未验证 提交 c71d4879 编写于 作者: B Brandon Ording 提交者: GitHub

Merge pull request #1958 from libgit2/remove-net-5.0

Stop testing .NET 5
...@@ -37,7 +37,7 @@ jobs: ...@@ -37,7 +37,7 @@ jobs:
matrix: matrix:
arch: [ amd64 ] arch: [ amd64 ]
os: [windows-2019, macos-10.15] os: [windows-2019, macos-10.15]
tfm: [ net472, netcoreapp3.1, net5.0, net6.0 ] tfm: [ net472, netcoreapp3.1, net6.0 ]
exclude: exclude:
- os: macos-10.15 - os: macos-10.15
tfm: net472 tfm: net472
...@@ -51,11 +51,6 @@ jobs: ...@@ -51,11 +51,6 @@ jobs:
uses: actions/setup-dotnet@v1.8.1 uses: actions/setup-dotnet@v1.8.1
with: with:
dotnet-version: 6.0.x dotnet-version: 6.0.x
- name: Install .NET 5 runtime
if: matrix.tfm == 'net5.0'
uses: actions/setup-dotnet@v1.8.1
with:
dotnet-version: 5.0.x
- name: Install .NET Core 3.1 runtime - name: Install .NET Core 3.1 runtime
if: matrix.tfm == 'netcoreapp3.1' if: matrix.tfm == 'netcoreapp3.1'
uses: actions/setup-dotnet@v1.8.1 uses: actions/setup-dotnet@v1.8.1
...@@ -71,7 +66,7 @@ jobs: ...@@ -71,7 +66,7 @@ jobs:
arch: [ amd64 ] arch: [ amd64 ]
# arch: [ amd64, arm64 ] # arch: [ amd64, arm64 ]
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ] distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
sdk: [ '6.0', '5.0', '3.1' ] sdk: [ '6.0', '3.1' ]
exclude: exclude:
- arch: arm64 - arch: arm64
distro: alpine.3.12 distro: alpine.3.12
...@@ -86,8 +81,6 @@ jobs: ...@@ -86,8 +81,6 @@ jobs:
include: include:
- sdk: '6.0' - sdk: '6.0'
tfm: net6.0 tfm: net6.0
- sdk: '5.0'
tfm: net5.0
- sdk: '3.1' - sdk: '3.1'
tfm: netcoreapp3.1 tfm: netcoreapp3.1
fail-fast: false fail-fast: false
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks> <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;netcoreapp3.1;net6.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册