Skip to content

Commit 77cec7d

Browse files
Merge pull request #29 from SixLabors/dl/fix-build
Fix the build.
2 parents f004f7c + 3230b7d commit 77cec7d

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

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

+9-12
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ jobs:
4040
framework: netcoreapp2.1
4141
runtime: -x64
4242
codecov: false
43-
- os: windows-latest
44-
framework: netcoreapp2.0
45-
runtime: -x64
46-
codecov: false
4743
- os: windows-latest
4844
framework: net472
4945
runtime: -x64
@@ -52,14 +48,6 @@ jobs:
5248
framework: net472
5349
runtime: -x86
5450
codecov: false
55-
- os: windows-latest
56-
framework: net46
57-
runtime: -x64
58-
codecov: false
59-
- os: windows-latest
60-
framework: net46
61-
runtime: -x86
62-
codecov: false
6351

6452
runs-on: ${{matrix.options.os}}
6553
if: "!contains(github.event.head_commit.message, '[skip ci]')"
@@ -86,6 +74,15 @@ jobs:
8674
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
8775
restore-keys: ${{ runner.os }}-nuget-
8876

77+
- name: DotNet Setup
78+
uses: actions/setup-dotnet@v1
79+
with:
80+
dotnet-version: |
81+
6.0.x
82+
5.0.x
83+
3.1.x
84+
2.1.x
85+
8986
- name: Build
9087
shell: pwsh
9188
run: ./ci-build.ps1 "${{matrix.options.framework}}"

tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netcoreapp2.0;net472;net46</TargetFrameworks>
4+
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
55
<AssemblyName>SharedInfrastructure.Tests</AssemblyName>
66
<RootNamespace>SharedInfrastructure.Tests</RootNamespace>
77
</PropertyGroup>

0 commit comments

Comments
 (0)