Merge pull request #26 from akunzai/dotnet-sdk-5

Migrate to .NET 5.0 SDK

Author: akunzai

.github/workflows/cd.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up .NET SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 5.0.x
       - name: Build packages
         run: |
           dotnet --info

.github/workflows/ci.yml

@@ -20,10 +20,14 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 10
-      - name: Set up .NET SDK
+      - name: Set up .NET Core 3.1 SDK
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 3.1.x
+      - name: Set up .NET 5 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.x
       - name: Build
         run: |
           dotnet --info

test/Spring.Extensions.DependencyInjection.Tests/Spring.Extensions.DependencyInjection.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net472</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -17,7 +17,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) AND '$(OS)' != 'Windows_NT' ">
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.10.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>