Simplify the inclusion of .props and .targets

coverlet-coverage · Jan 17, 2019 · e4b29b4 · e4b29b4
1 parent 77288fb
commit e4b29b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/build.proj b/build.proj
@@ -18,8 +18,8 @@
 
   <Target Name="CopyMSBuildScripts" AfterTargets="PublishMSBuildTaskProject">
     <ItemGroup>
-      <BuildScript Include="$(MSBuildThisFileDirectory)src\coverlet.msbuild\coverlet.msbuild.props" />
-      <BuildScript Include="$(MSBuildThisFileDirectory)src\coverlet.msbuild\coverlet.msbuild.targets" />
+      <BuildScript Include="$(MSBuildThisFileDirectory)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
+      <BuildScript Include="$(MSBuildThisFileDirectory)src\coverlet.msbuild.tasks\coverlet.msbuild.targets" />
     </ItemGroup>
     <Copy SourceFiles="@(BuildScript)" DestinationFolder="$(OutputPath)" />
   </Target>

diff --git a/src/coverlet.msbuild/coverlet.msbuild.props → ...rlet.msbuild.tasks/coverlet.msbuild.props b/src/coverlet.msbuild/coverlet.msbuild.props → ...rlet.msbuild.tasks/coverlet.msbuild.props
diff --git a/...coverlet.msbuild/coverlet.msbuild.targets → ...et.msbuild.tasks/coverlet.msbuild.targets b/...coverlet.msbuild/coverlet.msbuild.targets → ...et.msbuild.tasks/coverlet.msbuild.targets
diff --git a/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj b/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj
@@ -17,6 +17,8 @@
     <Description>Coverlet is a cross platform code coverage library for .NET Core, with support for line, branch and method coverage.</Description>
     <PackageTags>coverage testing unit-test lcov opencover quality</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+
+    <!-- Items in the Content group are placed in this folder in the NuGet package. -->
     <ContentTargetFolders>build</ContentTargetFolders>
 
     <!-- Build tasks should not be added to the lib folder. -->
@@ -38,13 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\coverlet.msbuild\coverlet.msbuild.props">
-      <Link>build\coverlet.msbuild.props</Link>
-      <Pack>true</Pack>
-    </None>
-    <Content Include="..\coverlet.msbuild\coverlet.msbuild.targets">
-      <Link>build\coverlet.msbuild.targets</Link>
-    </Content>
+    <Content Include="coverlet.msbuild.props" />
+    <Content Include="coverlet.msbuild.targets" />
   </ItemGroup>
 
   <Target Name="PackBuildOutputs" DependsOnTargets="ResolveProjectReferences;SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup;SatelliteDllsProjectOutputGroupDependencies;ResolveAssemblyReferences">