Skip to content

Commit afda748

Browse files
BertkBertk
committed
improve nuget packaging
1 parent 31034d1 commit afda748

File tree

12 files changed

+39
-29
lines changed

12 files changed

+39
-29
lines changed

‎src/coverlet.collector/build/coverlet.collector.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
2727
<PropertyGroup>
2828
<_CoverletSdkNETCoreSdkVersion>$(NETCoreSdkVersion)</_CoverletSdkNETCoreSdkVersion>
2929
<_CoverletSdkNETCoreSdkVersion Condition="$(_CoverletSdkNETCoreSdkVersion.Contains('-'))">$(_CoverletSdkNETCoreSdkVersion.Split('-')[0])</_CoverletSdkNETCoreSdkVersion>
30-
<_CoverletSdkMinVersionWithDependencyTarget>6.0.100</_CoverletSdkMinVersionWithDependencyTarget>
30+
<_CoverletSdkMinVersionWithDependencyTarget>8.0.100</_CoverletSdkMinVersionWithDependencyTarget>
3131
<_CoverletSourceRootTargetName>CoverletGetPathMap</_CoverletSourceRootTargetName>
3232
<_CoverletSourceRootTargetName Condition="'$([System.Version]::Parse($(_CoverletSdkNETCoreSdkVersion)).CompareTo($([System.Version]::Parse($(_CoverletSdkMinVersionWithDependencyTarget)))))' &gt;= '0' ">InitializeSourceRootMappedPaths</_CoverletSourceRootTargetName>
3333
</PropertyGroup>

‎src/coverlet.collector/coverlet.collector.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
4545
</ItemGroup>
4646

47-
4847
<ItemGroup>
4948
<None Include="$(MSBuildThisFileDirectory)..\..\_assets\coverlet-icon.png" Pack="true" PackagePath="\" />
5049
<None Include="..\..\Documentation\VSTestIntegration.md" Link="VSTestIntegration.md" Pack="true" PackagePath="\">
@@ -56,20 +55,20 @@
5655
<ProjectReference Include="$(MSBuildThisFileDirectory)..\coverlet.core\coverlet.core.csproj" />
5756
</ItemGroup>
5857

58+
<!-- NuGet package layout -->
59+
<!-- NuGet folders https://learn.microsoft.com/nuget/create-packages/creating-a-package#from-a-convention-based-working-directory -->
5960
<ItemGroup>
60-
<None Include="build\coverlet.collector.targets">
61-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
62-
</None>
61+
<TfmSpecificPackageFile Include="build/**">
62+
<PackagePath>build/$(TargetFramework)</PackagePath>
63+
</TfmSpecificPackageFile>
6364
</ItemGroup>
6465

65-
<Target Name="PackBuildOutputs" DependsOnTargets="BuildOnlySettings;ResolveReferences">
66+
<Target Name="PackBuildOutputs" DependsOnTargets="ResolveReferences">
6667
<ItemGroup>
67-
<TfmSpecificPackageFile Include="build\coverlet.collector.targets" PackagePath="build\$(TargetFramework)" />
68-
<TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="build\$(TargetFramework)" />
69-
<TfmSpecificPackageFile Include="$(ProjectDepsFilePath)" PackagePath="build\$(TargetFramework)" />
70-
<TfmSpecificPackageFile Include="@(DebugSymbolsProjectOutputGroupOutput)" PackagePath="build\$(TargetFramework)" />
68+
<TfmSpecificPackageFile Include="$(TargetPath);$(ProjectDepsFilePath);@(DebugSymbolsProjectOutputGroupOutput)" PackagePath="build\$(TargetFramework)" />
7169
<TfmSpecificPackageFile Include="%(_ResolvedProjectReferencePaths.Identity)" PackagePath="build\$(TargetFramework)" />
7270
<TfmSpecificPackageFile Include="@(ReferenceCopyLocalPaths)" Exclude="@(_ResolvedProjectReferencePaths)" PackagePath="build\$(TargetFramework)\%(ReferenceCopyLocalPaths.DestinationSubPath)" />
7371
</ItemGroup>
7472
</Target>
73+
7574
</Project>

‎src/coverlet.msbuild.tasks/build/coverlet.msbuild.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildMultiTargeting\coverlet.msbuild.props" />
3+
</Project>

‎src/coverlet.msbuild.tasks/build/coverlet.msbuild.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\buildMultiTargeting\coverlet.msbuild.targets" />
3+
</Project>

‎src/coverlet.msbuild.tasks/coverlet.msbuild.props renamed to ‎src/coverlet.msbuild.tasks/buildMultiTargeting/coverlet.msbuild.props

File renamed without changes.

‎src/coverlet.msbuild.tasks/coverlet.msbuild.targets renamed to ‎src/coverlet.msbuild.tasks/buildMultiTargeting/coverlet.msbuild.targets

File renamed without changes.

‎src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,26 @@
4949
</ItemGroup>
5050

5151
<ItemGroup>
52-
<None Include="coverlet.msbuild.props" Pack="true" PackagePath="build\">
53-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
54-
</None>
55-
<None Include="buildMultiTargeting\coverlet.msbuild.props" Pack="true" PackagePath="buildMultiTargeting\">
56-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
57-
</None>
58-
<None Include="coverlet.msbuild.targets" Pack="true" PackagePath="build\">
59-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
60-
</None>
6152
<None Include="$(MSBuildThisFileDirectory)..\..\_assets\coverlet-icon.png" Pack="true" PackagePath="\" />
6253
<None Include="..\..\Documentation\MSBuildIntegration.md" Link="MSBuildIntegration.md" Pack="true" PackagePath="\">
6354
<PackageCopyToOutput>true</PackageCopyToOutput>
6455
</None>
6556
</ItemGroup>
6657

58+
<!-- NuGet package layout -->
59+
<!-- NuGet folders https://learn.microsoft.com/nuget/create-packages/creating-a-package#from-a-convention-based-working-directory -->
60+
<ItemGroup>
61+
<Content Include="buildMultiTargeting/**" Pack="true">
62+
<PackagePath>buildMultiTargeting</PackagePath>
63+
</Content>
64+
<TfmSpecificPackageFile Include="buildTransitive/**">
65+
<PackagePath>buildTransitive/$(TargetFramework)</PackagePath>
66+
</TfmSpecificPackageFile>
67+
<TfmSpecificPackageFile Include="build/**">
68+
<PackagePath>build/$(TargetFramework)</PackagePath>
69+
</TfmSpecificPackageFile>
70+
</ItemGroup>
71+
6772
<Target Name="PackBuildOutputs" DependsOnTargets="BuildOnlySettings;ResolveReferences">
6873
<ItemGroup>
6974
<TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="tasks\$(TargetFramework)" />

‎test/coverlet.collector.tests/coverlet.collector.tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
2+
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\buildMultiTargeting\coverlet.msbuild.props" />
33

44
<PropertyGroup>
55
<TargetFrameworks>net8.0</TargetFrameworks>
@@ -23,5 +23,5 @@
2323
<ProjectReference Include="$(RepoRoot)src\coverlet.collector\coverlet.collector.csproj" />
2424
</ItemGroup>
2525

26-
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.targets" />
26+
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\buildMultiTargeting\coverlet.msbuild.targets" />
2727
</Project>

‎test/coverlet.core.coverage.tests/coverlet.core.coverage.tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
2+
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\buildMultiTargeting\coverlet.msbuild.props" />
33

44
<PropertyGroup>
55
<TargetFramework>net8.0</TargetFramework>
@@ -37,5 +37,5 @@
3737
<ProjectReference Include="$(RepoRoot)test\coverlet.core.tests.samples.netstandard\coverlet.core.tests.samples.netstandard.csproj" />
3838
</ItemGroup>
3939

40-
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.targets" />
40+
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\buildMultiTargeting\coverlet.msbuild.targets" />
4141
</Project>

‎test/coverlet.core.performancetest/coverlet.core.performancetest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
2+
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\buildMultiTargeting\coverlet.msbuild.props" />
33

44
<PropertyGroup>
55
<TargetFramework>net8.0</TargetFramework>
@@ -20,5 +20,5 @@
2020
<ProjectReference Include="..\coverlet.testsubject\coverlet.testsubject.csproj" />
2121
</ItemGroup>
2222

23-
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.targets" />
23+
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\buildMultiTargeting\coverlet.msbuild.targets" />
2424
</Project>

0 commit comments

Comments
 (0)