Improve the MSBuild task building and packaging for full .NET

The full framework console app did not reference the NS2 MSBuild
task, instead having its own copy of the task class. This was unnecessary
since the task class already lives in a NS2 library.

Also, the .props file from the package was not referencing the MSBuild
assembly from the location of the desktop assemblies, instead loading
the netcore path version. This was risky since the wrong assemblies
could have been loaded inadvertently.

This commit improves that by conditionally importing the tasks
assembly from either the desktop or the netcore locations, which
would then cause any other dependencies in that folder to be resolved
for the right framework.

Author: kzu

src/Deployment/nuget/ReportGenerator.props

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <ReportGeneratorAssembly>$(MSBuildThisFileDirectory)..\..\tools\netcoreapp2.1\ReportGenerator.MSBuild.dll</ReportGeneratorAssembly>
+    <ReportGeneratorAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\..\tools\netcoreapp2.1\ReportGenerator.MSBuild.dll</ReportGeneratorAssembly>
+    <ReportGeneratorAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\..\tools\net47\ReportGenerator.MSBuild.dll</ReportGeneratorAssembly>
   </PropertyGroup>
   <UsingTask TaskName="ReportGenerator" AssemblyFile="$(ReportGeneratorAssembly)" />
 </Project>

src/ReportGenerator.Console/MSBuild/ReportGenerator.cs

@@ -65,7 +65,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MSBuild\ReportGenerator.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -77,6 +76,10 @@
       <Project>{8dbcf22a-18a3-4a50-899d-8af6ed9975d0}</Project>
       <Name>ReportGenerator.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\ReportGenerator.MSBuild\ReportGenerator.MSBuild.csproj">
+      <Project>{e0ac1ee8-82a3-41ee-bd42-44659cdbd333}</Project>
+      <Name>ReportGenerator.MSBuild</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\LICENSE.txt">

src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="ReportGenerator">
   <!-- Imported MSBuild tasks -->
-  <UsingTask TaskName="ReportGenerator" AssemblyFile="$(MSBuildThisFileDirectory)..\ReportGenerator.Console.NetCore\bin\$(Configuration)\netcoreapp3.0\ReportGenerator.MSBuild.dll" />
+  <UsingTask TaskName="ReportGenerator" AssemblyFile="$(MSBuildThisFileDirectory)..\ReportGenerator.Console\bin\$(Configuration)\ReportGenerator.MSBuild.dll" />
 
   <Target Name="ReportGenerator">
     <ItemGroup>