Skip to content

Commit 69fb758

Browse files
committed
Fix non-standard packaging to avoid errors when running dotnet pack on projects that depend on this library
1 parent 73f01f4 commit 69fb758

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<PropertyGroup>
19-
<VersionPrefix>1.4.5</VersionPrefix>
19+
<VersionPrefix>1.4.6</VersionPrefix>
2020
<VersionSuffix></VersionSuffix>
2121
<Authors>Jeikabu, James Freiwirth</Authors>
2222
<PackageLicenseExpression>MIT</PackageLicenseExpression>

nng.NET.Shared/nng.NET.Shared.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<Import Project="../common.targets" />
44

55
<PropertyGroup>
6-
<OutputPath>..\packer\bin\$(Configuration)\lib\</OutputPath>
76
<!-- To enable code coverage -->
87
<DebugType>full</DebugType>
98
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
109
</PropertyGroup>
1110

1211
<PropertyGroup>
13-
<PackageId>nng.NET.Shared</PackageId>
12+
<PackageId>nng.NET.Shared-LL</PackageId>
1413
<PackageOutputPath>../bin/$(Configuration)</PackageOutputPath>
1514
</PropertyGroup>
1615

nng.NET/nng.NET.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@
33
<Import Project="../common.targets" />
44

55
<PropertyGroup>
6-
<OutputPath>runtimes\any\lib\</OutputPath>
76
<DebugType>full</DebugType>
87
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
<PackageOutputPath>../bin/$(Configuration)</PackageOutputPath>
10-
<!-- Including assembly as part of runtimes/ so don't want it placed in lib/ -->
11-
<IncludeBuildOutput>false</IncludeBuildOutput>
12-
<PackageId>nng.NET</PackageId>
8+
<PackageId>nng.NET-LL</PackageId>
139
<!-- Needed to avoid `error NU5128` when running `dotnet pack`.
1410
Assemblies for targetted frameworks are in runtimes/ instead of lib/ or ref/
1511
See: https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5128#scenario-2
1612
-->
17-
<NoWarn>$(NoWarn);NU5128</NoWarn>
1813
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
1914
</PropertyGroup>
2015

@@ -31,9 +26,6 @@
3126
<PackagePath>runtimes</PackagePath>
3227
<Visible>false</Visible>
3328
</Content>
34-
<Content Include="build\**">
35-
<PackagePath>build</PackagePath>
36-
</Content>
3729
</ItemGroup>
3830
</Target>
3931
</Project>

0 commit comments

Comments
 (0)