Merge pull request #29 from SixLabors/dl/fix-build

Fix the build.
SixLabors · Jun 8, 2022 · 77cec7d · 77cec7d
2 parents f004f7c + 3230b7d
commit 77cec7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -40,10 +40,6 @@ jobs:
                       framework: netcoreapp2.1
                       runtime: -x64
                       codecov: false
-                    - os: windows-latest
-                      framework: netcoreapp2.0
-                      runtime: -x64
-                      codecov: false
                     - os: windows-latest
                       framework: net472
                       runtime: -x64
@@ -52,14 +48,6 @@ jobs:
                       framework: net472
                       runtime: -x86
                       codecov: false
-                    - os: windows-latest
-                      framework: net46
-                      runtime: -x64
-                      codecov: false
-                    - os: windows-latest
-                      framework: net46
-                      runtime: -x86
-                      codecov: false
 
         runs-on: ${{matrix.options.os}}
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
@@ -86,6 +74,15 @@ jobs:
                   key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
                   restore-keys: ${{ runner.os }}-nuget-
 
+            - name: DotNet Setup
+              uses: actions/setup-dotnet@v1
+              with:
+                dotnet-version: |
+                  6.0.x
+                  5.0.x
+                  3.1.x
+                  2.1.x
+
             - name: Build
               shell: pwsh
               run: ./ci-build.ps1 "${{matrix.options.framework}}"

diff --git a/tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj b/tests/SharedInfrastructure.Tests/SharedInfrastructure.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netcoreapp2.0;net472;net46</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
     <AssemblyName>SharedInfrastructure.Tests</AssemblyName>
     <RootNamespace>SharedInfrastructure.Tests</RootNamespace>
   </PropertyGroup>