require MSBuild 16 or greater, bump version

Author: saucecontrol

src/InheritDoc/InheritDoc.csproj

@@ -1,35 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 <PropertyGroup>
-<VersionPrefix>1.4.0</VersionPrefix>
-<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+<VersionPrefix>2.0.0</VersionPrefix>
+<TargetFrameworks>netstandard2.0</TargetFrameworks>
 </PropertyGroup>
 
 <PropertyGroup>
+<MinClientVersion>5.0</MinClientVersion>
 <DevelopmentDependency>true</DevelopmentDependency>
 <BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
 </PropertyGroup>
 
 <ItemGroup>
-<None Include="package\build\*" Pack="true" PackagePath="build;buildMultiTargeting" />
+<None Include="package\build\*" Pack="true" PackagePath="build" />
 <None Include="package\*" Pack="true" PackagePath="tools" />
 <None Include="$(OutputPath)\*\Mono.Cecil.dll" Pack="true" PackagePath="tools" />
-<None Include="$(OutputPath)\*\System.ValueTuple.dll" Pack="true" PackagePath="tools" />
 </ItemGroup>
 
 <ItemGroup>
-<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" />
+<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
 <PackageReference Include="Mono.Cecil" Version="0.11.5" PrivateAssets="all" />
-<PackageReference Condition="$(DefineConstants.Contains('NETFRAMEWORK'))" Include="System.ValueTuple" Version="4.5.0" />
 <!-- these are for use in the test project, downloaded here to avoid version conflicts when building tests -->
 <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[7.0.0]" />
 <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="[1.0.0]" />
 </ItemGroup>
 
 <Target Name="VerifyPackDependencies" BeforeTargets="GenerateNuspec">
-<Error Condition="@(None->WithMetadataValue('Pack', 'true')->WithMetadataValue('Filename', 'Mono.Cecil')->Count()) != 2" Text="Dependencies were not present for pack. Start build again." />
+<Error Condition="@(None->WithMetadataValue('Pack', 'true')->WithMetadataValue('Filename', 'Mono.Cecil')->Count()) != 1" Text="Dependencies were not present for pack. Start build again." />
 </Target>
 
 </Project>

src/InheritDoc/package/build/SauceControl.InheritDoc.props

@@ -2,9 +2,7 @@
 <Project>
 
 <PropertyGroup>
-<_InheritDocTaskTfm Condition="'$(MSBuildRuntimeType)'!='Core'">net46</_InheritDocTaskTfm>
-<_InheritDocTaskTfm Condition="'$(MSBuildRuntimeType)'=='Core'">netstandard2.0</_InheritDocTaskTfm>
-<_InheritDocTaskLib>$(MSBuildThisFileDirectory)..\tools\$(_InheritDocTaskTfm)\SauceControl.InheritDoc.dll</_InheritDocTaskLib>
+<_InheritDocTaskLib>$(MSBuildThisFileDirectory)..\tools\netstandard2.0\SauceControl.InheritDoc.dll</_InheritDocTaskLib>
 <_InheritDocNetStandardFallback>$(MSBuildThisFileDirectory)..\tools\netstandard.xml.gz</_InheritDocNetStandardFallback>
 </PropertyGroup>
 

src/InheritDoc/package/build/SauceControl.InheritDoc.targets

@@ -19,6 +19,7 @@
 <CopyDocumentationFileToOutputDirectory>false</CopyDocumentationFileToOutputDirectory>
 </PropertyGroup>
 
+<Warning Condition="'$(MSBuildVersion)'=='' or '$(MSBuildVersion)'&lt;'16.0'" Code="IDT900" Text="InheritDoc is not compatible with this MSBuild version. Use a 1.x version of the package if you need VS 2017 support." />
 <Warning Condition="'$(_InheritDocCopyFile)'!='true'" Code="IDT901" Text="CopyDocumentationFileToOutputDirectory is set to false, so InheritDoc will not write to the output directory. You should either set InheritDocEnabled to false or CopyDocumentationFileToOutputDirectory to true." />
 <Message Condition="'$(_InheritDocCopyFile)'=='true'" Importance="normal" Text="InheritDoc processing file: @(DocFileItem->'%(Filename)%(Extension)')" />