From 3b326c14acc6affb4d77f03f3e22c8d2ee8fdd06 Mon Sep 17 00:00:00 2001
From: Adam Ralph <adam@adamralph.com>
Date: Thu, 26 May 2022 13:14:56 +0300
Subject: [PATCH] add net6.0 target to MinVer package

---
 MinVer/MinVer.csproj        | 4 ++--
 MinVer/build/MinVer.targets | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/MinVer/MinVer.csproj b/MinVer/MinVer.csproj
index 7bd1e0f2..d00f6d4b 100644
--- a/MinVer/MinVer.csproj
+++ b/MinVer/MinVer.csproj
@@ -18,7 +18,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
@@ -48,7 +48,7 @@
 
   <Target Name="AddMinVerOutput" BeforeTargets="_GetPackageFiles">
     <ItemGroup>
-      <None Include="$(OutputPath)\**\*" Exclude="$(OutputPath)\**\*.dev.json" Pack="true" PackagePath="minver" />
+      <None Include="$(OutputPath)\**\*" Exclude="$(OutputPath)\**\*.dev.json;$(OutputPath)\**\*.nupkg" Pack="true" PackagePath="minver" />
     </ItemGroup>
   </Target>
 
diff --git a/MinVer/build/MinVer.targets b/MinVer/build/MinVer.targets
index 8a5efa55..c1f002fd 100644
--- a/MinVer/build/MinVer.targets
+++ b/MinVer/build/MinVer.targets
@@ -9,6 +9,8 @@
   <PropertyGroup>
     <MinVerDetailed>low</MinVerDetailed>
     <MinVerDetailed Condition="'$(MinVerVerbosity)' == 'detailed' Or '$(MinVerVerbosity)' == 'd' Or '$(MinVerVerbosity)' == 'diagnostic' Or '$(MinVerVerbosity)' == 'diag'">high</MinVerDetailed>
+    <MinVerTargetFramework>netcoreapp3.1</MinVerTargetFramework>
+    <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.0'">net6.0</MinVerTargetFramework>
     <NoWarn>$(NoWarn);NU5105</NoWarn>
   </PropertyGroup>
 
@@ -41,7 +43,7 @@
       <MinVerInputs Include="--verbosity &quot;$(MinVerVerbosity)&quot;" />
       <MinVerInputs Include="--version-override &quot;$(MinVerVersionOverride)&quot;" />
     </ItemGroup>
-    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../minver/MinVer.dll&quot; @(MinVerInputs->'%(Identity)', ' ')" ConsoleToMSBuild="true" StandardOutputImportance="Low" >
+    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../minver/$(MinVerTargetFramework)/MinVer.dll&quot; @(MinVerInputs->'%(Identity)', ' ')" ConsoleToMSBuild="true" StandardOutputImportance="Low" >
       <Output TaskParameter="ConsoleOutput" ItemName="MinVerConsoleOutput" />
     </Exec>
     <ItemGroup>