docs: update package metadata and release notes (#324)

Author: natemcmaster

CHANGELOG.md

@@ -1,17 +1,22 @@
 # Changelog
 
-[Unreleased changes](https://github.com/natemcmaster/CommandLineUtils/compare/v2.4.2...HEAD):
+[Unreleased changes](https://github.com/natemcmaster/CommandLineUtils/compare/v2.5.0...HEAD):
+
+## [v2.5.0](https://github.com/natemcmaster/CommandLineUtils/compare/v2.4.4...v2.5.0)
 
 * Fix [#92] by [@kbilsted] - Show enum names in help text for Options and Arguments stored as enum
 * Fix [#287] by [@Alxandr] - Add support for private base type options
 * Fix [#303] by [@AndreGleichner] - Update generated help to display [command] first then [options]
+* Fix [#307] by [@daveMueller] - Update help text generator to display HelpOption correctly
 
 [@kbilsted]: https://github.com/kbilsted
 [@Alxandr]: https://github.com/Alxandr
 [@AndreGleichner]: https://github.com/AndreGleichner
+[@daveMueller]: https://github.com/daveMueller
 [#92]: https://github.com/natemcmaster/CommandLineUtils/issues/92
 [#287]: https://github.com/natemcmaster/CommandLineUtils/issues/287
 [#303]: https://github.com/natemcmaster/CommandLineUtils/issues/303
+[#307]: https://github.com/natemcmaster/CommandLineUtils/issues/307
 
 ## [v2.4.4](https://github.com/natemcmaster/CommandLineUtils/compare/v2.4.3...v2.4.4)
 

Directory.Build.props

@@ -5,6 +5,7 @@
     <Product>CommandLineUtils</Product>
     <Copyright>Copyright © Nate McMaster</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/natemcmaster/CommandLineUtils</PackageProjectUrl>
     <RepositoryUrl>https://github.com/natemcmaster/CommandLineUtils.git</RepositoryUrl>
@@ -15,7 +16,18 @@
     <IncludeSymbols>true</IncludeSymbols>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PackageIconUrl>https://natemcmaster.github.io/CommandLineUtils/logo.png</PackageIconUrl>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <PackageIcon>icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(IsPackable)' == 'true' ">
+    <None Include="$(MSBuildThisFileDirectory)docs\logo.png">
+      <Pack>true</Pack>
+      <PackagePath>/$(PackageIcon)</PackagePath>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+
+  <PropertyGroup>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>
     <LangVersion>8.0</LangVersion>
@@ -35,7 +47,7 @@
 
    <PropertyGroup>
     <VersionPrefix>2.5.0</VersionPrefix>
-    <VersionSuffix>beta</VersionSuffix>
+    <VersionSuffix>rc</VersionSuffix>
     <IncludePreReleaseLabelInPackageVersion Condition="'$(IsStableBuild)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(BUILD_NUMBER)</BuildNumber>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>

src/CommandLineUtils/releasenotes.props

@@ -6,6 +6,7 @@ Features and bug fixes:
 * @kbilsted: Show enum names in help text for Options and Arguments stored as enum
 * @Alxandr: Add support for private base type options
 * @AndreGleichner: Update generated help to display [command] first then [options]
+* @daveMueller: Fix generated help to display the help options correctly
     </PackageReleaseNotes>
     <PackageReleaseNotes Condition="$(VersionPrefix.StartsWith('2.4.'))">
 Features and bug fixes by some awesome contributors: