From 0763f66d16e84c3fd0a6a96b86b50f1c84ed343c Mon Sep 17 00:00:00 2001 From: Toby Smith Date: Sun, 14 Jan 2024 18:13:41 +0000 Subject: [PATCH] Update source gen to use .NET 8 --- .github/workflows/publish-release.yml | 10 +++++----- Generator/CsprojGenerator.cs | 2 +- Generator/NuspecGenerator.cs | 2 +- LicenseIdentifiers/LicenseIdentifiers.nuspec | 7 ++++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index e526328..5cfe261 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -36,8 +36,8 @@ jobs: name: nuget-packages path: "**/*.nupkg" -# - name: Publish LicenseIdentifiers -# run: dotnet nuget push "**/*.nupkg" --skip-duplicate --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }} + # - name: Publish LicenseIdentifiers + # run: dotnet nuget push "**/*.nupkg" --skip-duplicate --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }} create-release: name: Create GitHub Release @@ -53,7 +53,7 @@ jobs: - name: Calculate Version id: calculate-version run: | - $rcVersion = ${{ github.ref }} -Replace "^refs/tags/release/" + $rcVersion = "${{ github.ref }}" -Replace "^refs/tags/release/" $releaseVersion = $rcVersion -Replace "-rc.*$" Write-Host "Release version: $releaseVersion" "version=$releaseVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Append @@ -84,8 +84,8 @@ jobs: - name: Debug Logs run: | - Write-Host "Tag name: ${{ github.ref }}" - Write-Host "Body: ${{ steps.create-release-body.outputs.body }}" + Write-Host "Tag name: ${{ github.ref }}" + Write-Host "Body: ${{ steps.create-release-body.outputs.body }}" # - name: Create Release # uses: softprops/action-gh-release@v1 diff --git a/Generator/CsprojGenerator.cs b/Generator/CsprojGenerator.cs index cdc49ab..247f8b2 100644 --- a/Generator/CsprojGenerator.cs +++ b/Generator/CsprojGenerator.cs @@ -13,7 +13,7 @@ public static string GenerateContent(string version) return @$" - net50 + net8.0 {version} "; diff --git a/Generator/NuspecGenerator.cs b/Generator/NuspecGenerator.cs index 4d2bcc9..d8f4009 100644 --- a/Generator/NuspecGenerator.cs +++ b/Generator/NuspecGenerator.cs @@ -24,7 +24,7 @@ public static string GenerateContent(string version, string releaseDescription) license,licence,SPDX,OSS,parse - + "; } diff --git a/LicenseIdentifiers/LicenseIdentifiers.nuspec b/LicenseIdentifiers/LicenseIdentifiers.nuspec index 49785ce..b0045d0 100644 --- a/LicenseIdentifiers/LicenseIdentifiers.nuspec +++ b/LicenseIdentifiers/LicenseIdentifiers.nuspec @@ -7,13 +7,14 @@ true ISC http://github.com/TobyAndToby/License-Identifiers - SPDX-compliant license enum class. Validate and parse all verified SPDX license identifiers from version SPDX 3.12. + SPDX-compliant license enum class. Validate and parse all verified SPDX license + identifiers from version SPDX 3.12. SPDX Data for the Version 3.12 of the license list -See https://github.com/spdx/license-list-XML/releases/tag/v3.12 for summary of changes + See https://github.com/spdx/license-list-XML/releases/tag/v3.12 for summary of changes license,licence,SPDX,OSS,parse - + \ No newline at end of file