Merge branch 'master' into feature/issue-1520

Author: asbjornu

src/Directory.Build.props

@@ -25,9 +25,9 @@
 
         <PackageVersion_MicrosoftTestSdk>16.4.0</PackageVersion_MicrosoftTestSdk>
         <PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>
-        <PackageVersion_CoverletMsBuild>2.7.0</PackageVersion_CoverletMsBuild>
+        <PackageVersion_CoverletMsBuild>2.8.0</PackageVersion_CoverletMsBuild>
         <PackageVersion_NUnit>3.12.0</PackageVersion_NUnit>
-        <PackageVersion_NUnit3TestAdapter>3.15.1</PackageVersion_NUnit3TestAdapter>
+        <PackageVersion_NUnit3TestAdapter>3.16.0</PackageVersion_NUnit3TestAdapter>
         <PackageVersion_NunitXmlTestLogger>2.1.41</PackageVersion_NunitXmlTestLogger>
         <PackageVersion_Shouldly>4.0.0-beta0002</PackageVersion_Shouldly>
 

src/GitVersionTask/GitVersionTask.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
@@ -11,10 +11,17 @@
         <DevelopmentDependency>true</DevelopmentDependency>
 
         <LangVersion>8.0</LangVersion>
-
     </PropertyGroup>
-    <ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" PrivateAssets="All" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
+    </ItemGroup>
+
+    <ItemGroup>
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
     </ItemGroup>