From 140c7abadfa17668a973d8b913ab8a1afd586a4d Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 12 Dec 2023 08:38:34 +0100 Subject: [PATCH 1/3] calculate whether it's a prerelease or not and also include the readme in the output --- .github/workflows/release.yml | 2 +- README.md | 2 +- src/NuGetUtility/NuGetUtility.csproj | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1389f8fd..7a84e6c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 with: - prerelease: true + prerelease: ${{ steps.version.outputs.prerelease != '' }} files: | release.zip diff --git a/README.md b/README.md index 61568ed3..7926f228 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Usage: nuget-license [options] | `-t, --include-transitive` | When set, the analysis includes transitive packages (dependencies of packages that are directly installed to the project) | | `-a, --allowed-license-types` | File containing all allowed licenses in JSON format. If omitted, all licenses are considered to be allowed. | | `-ignore, --ignored-packages` | File containing a JSON formatted array containing package names, that should be ignored when validating licenses. Package names specified can contain simple Wildcard characters (*) which are used to match any number of characters. Note that even though a package is ignored, it's transitive dependencies are still validated. This Option is useful e.g. to exclude homegrown nuget packages from validation. | -| `-include-ignored, --include-ignored-packages` | This flag allows to explicitly include ignored packages in the output. licenses. | +| `-include-ignored, --include-ignored-packages` | This flag allows to explicitly include ignored packages in the output. | | `-mapping, --licenseurl-to-license-mappings` | When used, this option allows to override the url to license mapping built into the application (see [here](src/NuGetUtility/LicenseValidator/UrlToLicenseMapping.cs)) | | `-override, --override-package-information` | When used, this option allows to override the package information used for the validation. This makes sure that no attempt is made to get the associated information about the package from the available web resources. This is useful for packages that e.g. provide a license file as part of the nuget package which (at the time of writing) cannot be used for validation and thus requires the package's information to be provided by this option. | | `-d, --license-information-download-location` | When used, this option downloads the html content of the license URL to the specified folder. This is done for all NuGet packages that specify a license URL instead of providing the license expression. | diff --git a/src/NuGetUtility/NuGetUtility.csproj b/src/NuGetUtility/NuGetUtility.csproj index f95b7aff..423c6b5e 100644 --- a/src/NuGetUtility/NuGetUtility.csproj +++ b/src/NuGetUtility/NuGetUtility.csproj @@ -20,7 +20,8 @@ enable enable Debug;Release;TestWindows - AnyCPU + AnyCPU + README.md From 6196a037d3d680b83d200be2afa46c779a954e5e Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 12 Dec 2023 08:49:17 +0100 Subject: [PATCH 2/3] add nuget batch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7926f228..4aacd7ae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Nuget License Utility [![release](https://github.com/sensslen/nuget-license/actions/workflows/release.yml/badge.svg)](https://github.com/sensslen/nuget-license/actions/workflows/release.yml) [![Tests](https://github.com/sensslen/nuget-license/actions/workflows/action.yml/badge.svg)](https://github.com/sensslen/nuget-license/actions/workflows/action.yml) +# Nuget License Utility [![release](https://github.com/sensslen/nuget-license/actions/workflows/release.yml/badge.svg)](https://github.com/sensslen/nuget-license/actions/workflows/release.yml) [![Tests](https://github.com/sensslen/nuget-license/actions/workflows/action.yml/badge.svg)](https://github.com/sensslen/nuget-license/actions/workflows/action.yml) [![NuGet](https://img.shields.io/nuget/v/nuget-license.svg)](https://www.nuget.org/packages/nuget-license) A .net core tool to print and validate the licenses of a project. This tool supports .NET (Core), .NET Standard and .NET Framework Projects. From 60b76a584c07cacd35be1497b0275080069e14c2 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 12 Dec 2023 08:56:00 +0100 Subject: [PATCH 3/3] improve release generation --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a84e6c9..279ab3eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,6 +59,8 @@ jobs: uses: softprops/action-gh-release@v1 with: prerelease: ${{ steps.version.outputs.prerelease != '' }} + generate_release_notes: true + fail_on_unmatched_files: true files: | release.zip