Skip to content

Commit 1cbeee8

Browse files
authored
Merge pull request #432 from AArnott/NoNuSpec
Replace checked in .nuspec file with generated one
2 parents b8abd2b + 8936397 commit 1cbeee8

File tree

4 files changed

+11
-32
lines changed

4 files changed

+11
-32
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ bld/
2424
[Bb]in/
2525
[Oo]bj/
2626
[Ll]og/
27-
[Bb]uild/
2827
msbuild.binlog
2928

3029
# Visual Studio 2015 cache/options directory
@@ -297,4 +296,4 @@ __pycache__/
297296
.vscode
298297

299298
# OSX
300-
.DS_Store
299+
.DS_Store

src/coverlet.collector/coverlet.collector.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
<RepositoryType>git</RepositoryType>
1616
<RepositoryUrl>https://github.com/tonerdo/coverlet</RepositoryUrl>
1717
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
18-
<NuspecFile>coverlet.collector.nuspec</NuspecFile>
18+
<IncludeBuildOutput>false</IncludeBuildOutput>
19+
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
20+
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
1921
</PropertyGroup>
2022

2123
<ItemGroup>
2224
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.1.0" />
2325
</ItemGroup>
2426

2527
<ItemGroup>
26-
<Content Include="coverlet.collector.targets" />
28+
<None Update="build\**" Pack="true" PackagePath="" />
2729
</ItemGroup>
2830

2931
<ItemGroup>
@@ -61,12 +63,11 @@
6163
<ItemGroup>
6264
<ProjectReference Include="$(MSBuildThisFileDirectory)..\coverlet.core\coverlet.core.csproj" PrivateAssets="All" />
6365
</ItemGroup>
64-
65-
<Target Name="SetNuspecPackageVersion" DependsOnTargets="GetBuildVersion" BeforeTargets="GenerateNuspec">
66-
<PropertyGroup>
67-
<NuspecProperties>$(NuspecProperties);version=$(NuGetPackageVersion);configuration=$(Configuration)
68-
</NuspecProperties>
69-
</PropertyGroup>
70-
</Target>
7166

67+
<Target Name="PackBuildOutputs">
68+
<ItemGroup>
69+
<TfmSpecificPackageFile Include="$(TargetDir)\*.dll" PackagePath="build\netstandard1.0\" />
70+
<TfmSpecificPackageFile Include="$(TargetDir)\*.deps.json" PackagePath="build\netstandard1.0\" />
71+
</ItemGroup>
72+
</Target>
7273
</Project>

src/coverlet.collector/coverlet.collector.nuspec

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)