Use MsBuild for packing .nupkg files #1404

ngbrown · 2017-10-25T06:36:51Z

Use dotnet msbuild tasks to pack NuGet .nupkg files. Done as part of the primary build in the current NAnt scripts.

The README.md file isn't transformed to .html for the .nupkg file, but is copied as is. I doubt many people need it there when they should refer to the most recent version on github.
~~Removed the unused and broken NHibernate.Setup WiX project.~~

hazzik · 2017-10-25T08:50:19Z

src/NHibernate/NHibernate.csproj

  <PropertyGroup>
-    <Description>An object persistence library for relational databases.</Description>
+    <Description>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.</Description>
+    <PackageTags>ORM; O/RM; DataBase; DAL; ObjectRelationalMapping; NHibernate; ADO.Net; Core</PackageTags>


Tags are space separated

https://docs.microsoft.com/en-us/dotnet/core/tools/csproj#packagetags In the resulting .nuspec file, they are space separated.

hazzik · 2017-10-25T08:51:25Z

src/NHibernate/NHibernate.csproj

-    <PackageReference Include="iesi.collections" Version="4.0.2" />
-    <PackageReference Include="Remotion.Linq" Version="2.1.2" />
-    <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.1.0" />
+    <PackageReference Include="Antlr3.Runtime" Version="[3.5.1, 4.0)" />


I doubt there will be v4 of Antlr3

Excluding v4 was how the previous .nuspec had it. It doesn't hurt to keep it.

hazzik · 2017-10-25T08:54:22Z

Can you please drop d55ffdf out of this PR?

ngbrown · 2017-10-25T08:56:22Z

Can you please drop d55ffdf out of this PR?

Do you want it as a separate pull request? Is there a reason for leaving it?

hazzik · 2017-10-25T09:07:25Z

src/NHibernate/NHibernate.csproj

  <PropertyGroup>
-    <Description>An object persistence library for relational databases.</Description>
+    <Description>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed, fully featured and used in thousands of successful projects.</Description>


Please put this into <PackageDescription>

@hazzik what are you referencing? <Description> is what Visual Studio fills out based on the project package property page, and what is documented here: https://docs.microsoft.com/en-us/dotnet/core/tools/csproj#description

I don't care about this documentation. I'm talking about this one: https://github.com/NuGet/NuGet.Client/blob/dev/src/NuGet.Core/NuGet.Build.Tasks.Pack/Pack.targets#L28 (it was hard to find this file)

I agree that the naming of properties intended to be set in .csproj for generating .nuget packages are not altogether consistent, but they do work as documented.

If you set the description in <PackageDescription>, it may override that pack.targets property, but it no longer shows up in Visual Studio's project property page for the Package description, so <PackageDescription> clearly is not the property that is intended to be set in the .csproj file. The line you reference is by default set by $(Description), which we were already setting in the .csproj. I just adjusted the text so the output .nuspec matches the old templated one.

If you compile and compare the extracted .nuget packages, it all works fine.

The problem that Description also meant to set AssemblyDescriptionAttribute. The PackageDescription is what transferred into the PackTask (L211). So, it is a correct way to set the separate descriptions for a package and an assembly.

ok... but where does that ever show up in normal use? It doesn't show up in the NHibernate.dll file Properties dialog (from File Explorer).

Is there a problem if the text on AssemblyDescriptionAttribute does match the NuGet package description?

NuGet/NuGet.Client#1648

I'm not saying that they don't collide; obviously they do. I was asking why it matters? Also, the NuGet/NuGet.Client#1648 pull request was only 2 months ago, so it wasn't included in the .net core sdk 2.0.0 release. On my computer, the file at: C:\Program Files\dotnet\sdk\2.0.0\Sdks\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets doesn't have <PackageDescription> and instead relies on <Description>:

<Description Condition="'$(Description)'==''">Package Description</Description>

It's in 2.0.2 / VS 2017.4

hazzik · 2017-10-25T09:12:59Z

Is there a reason for leaving it?

There are a lot of changes not related to the topic of the PR

hazzik · 2017-10-25T09:13:59Z

build-common/NHibernate.props

@@ -12,5 +12,17 @@
    <Product>NHibernate</Product>
    <Company>NHibernate.info</Company>
    <Copyright>Licensed under LGPL.</Copyright>
+    <Authors>NHibernate community, Hibernate community</Authors>
+    <Company>NHibernate.info</Company>


Already here

Removed duplicate property.

ngbrown · 2017-10-25T09:45:38Z

I've separated out the d55ffdf commit into #1405 and fixed the errors and pushed a replacement commit.

hazzik · 2017-10-25T11:05:54Z

I've removed unrelated changes

ngbrown · 2017-10-25T11:32:38Z

I think my changes were better. Now with the <GeneratePackageOnBuild>true</GeneratePackageOnBuild> in the project instead set at build time, the NHibernate.5.0.0.nupkg and NHibernate.5.0.0.symbols.nupkg are going to be built every time you build in Visual Studio. That means zipping up some 2,000 source files every time.

hazzik · 2017-10-25T11:35:44Z

But this is only in release configuration. Do you often build that?

ngbrown · 2017-10-25T11:43:52Z

No, I suppose I don't build release in visual studio often.

Too many common items such as PackageProjectUrl, PackageIconUrl, PackageRequireLicenseAcceptance, and PackageLicenseUrl moved out of the common NHibernate.props and into the .csproj. There's no reason they would change between packages released from this repository.

ngbrown · 2017-10-25T12:01:08Z

After force pushing on top of each other... the current version (e7a5979) is probably the best it's been. Thanks for the feedback.

hazzik · 2017-10-25T21:40:00Z

Thanks

ngbrown mentioned this pull request Oct 25, 2017

NH-3807 - Support for .NET Core 2.0 #633

Closed

29 tasks

hazzik reviewed Oct 25, 2017

View reviewed changes

hazzik added this to the 5.0.1 milestone Oct 25, 2017

ngbrown force-pushed the feature/msbuild-pack branch from c66adc2 to 8e49199 Compare October 25, 2017 09:04

hazzik reviewed Oct 25, 2017

View reviewed changes

ngbrown force-pushed the feature/msbuild-pack branch from 8e49199 to 9233b60 Compare October 25, 2017 09:43

hazzik added t: Improvement c: Toolset and removed c: Toolset labels Oct 25, 2017

hazzik force-pushed the feature/msbuild-pack branch 2 times, most recently from b68ecf7 to a18c2e5 Compare October 25, 2017 11:05

hazzik previously approved these changes Oct 25, 2017

View reviewed changes

ngbrown dismissed hazzik’s stale review via 8393a3c October 25, 2017 11:50

hazzik force-pushed the feature/msbuild-pack branch from 8393a3c to 25642d3 Compare October 25, 2017 11:51

Use MsBuild/dotnet pack NuGet package

e7a5979

hazzik force-pushed the feature/msbuild-pack branch from 25642d3 to e7a5979 Compare October 25, 2017 11:54

hazzik approved these changes Oct 25, 2017

View reviewed changes

hazzik merged commit 0157daf into nhibernate:master Oct 25, 2017

hazzik added the r: Fixed label Oct 25, 2017

ngbrown deleted the feature/msbuild-pack branch October 26, 2017 01:34

hazzik mentioned this pull request Nov 6, 2017

Iesi.Collections package dependency range causes warning #1430

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use MsBuild for packing .nupkg files #1404

Use MsBuild for packing .nupkg files #1404

ngbrown commented Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017

ngbrown Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017

ngbrown Oct 25, 2017

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017

hazzik Oct 25, 2017

ngbrown Oct 25, 2017

hazzik Oct 25, 2017 •

edited

Loading

ngbrown Oct 25, 2017

hazzik Oct 25, 2017

ngbrown Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017

ngbrown Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017 •

edited

Loading

hazzik commented Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017

ngbrown Oct 25, 2017

ngbrown commented Oct 25, 2017

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017

ngbrown commented Oct 25, 2017

hazzik commented Oct 25, 2017

Use MsBuild for packing .nupkg files #1404

Use MsBuild for packing .nupkg files #1404

Conversation

ngbrown commented Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

ngbrown Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hazzik Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ngbrown Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ngbrown Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

hazzik Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

hazzik commented Oct 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ngbrown commented Oct 25, 2017

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017

ngbrown commented Oct 25, 2017

hazzik commented Oct 25, 2017

ngbrown commented Oct 25, 2017 •

edited

Loading

ngbrown Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017 •

edited

Loading

ngbrown Oct 25, 2017 •

edited

Loading

ngbrown Oct 25, 2017 •

edited

Loading

hazzik Oct 25, 2017 •

edited

Loading

hazzik commented Oct 25, 2017 •

edited

Loading