.drone.yml

@@ -941,8 +941,7 @@ steps:
     image: plugins/hugo:latest
     pull: always
     commands:
-      # https://github.com/drone-plugins/drone-hugo/issues/36
+      - apk add --no-cache make bash curl
-      - apk upgrade --no-cache libcurl && apk add --no-cache make bash curl
       - cd docs
       - make trans-copy clean build
 

modules/packages/nuget/metadata.go

@@ -6,10 +6,8 @@ package nuget
 
 import (
 	"archive/zip"
-	"bytes"
 	"encoding/xml"
 	"errors"
-	"fmt"
 	"io"
 	"path/filepath"
 	"regexp"
@@ -185,23 +183,7 @@ func ParseNuspecMetaData(r io.Reader) (*Package, error) {
 	return &Package{
 		PackageType: packageType,
 		ID:          p.Metadata.ID,
-		Version:     toNormalizedVersion(v),
+		Version:     v.String(),
 		Metadata:    m,
 	}, nil
 }
-
-// https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#normalized-version-numbers
-// https://github.com/NuGet/NuGet.Client/blob/dccbd304b11103e08b97abf4cf4bcc1499d9235a/src/NuGet.Core/NuGet.Versioning/VersionFormatter.cs#L121
-func toNormalizedVersion(v *version.Version) string {
-	var buf bytes.Buffer
-	segments := v.Segments64()
-	fmt.Fprintf(&buf, "%d.%d.%d", segments[0], segments[1], segments[2])
-	if len(segments) > 3 && segments[3] > 0 {
-		fmt.Fprintf(&buf, ".%d", segments[3])
-	}
-	pre := v.Prerelease()
-	if pre != "" {
-		fmt.Fprint(&buf, "-", pre)
-	}
-	return buf.String()
-}

modules/packages/nuget/metadata_test.go

@@ -147,19 +147,6 @@ func TestParseNuspecMetaData(t *testing.T) {
 		assert.Len(t, deps, 1)
 		assert.Equal(t, dependencyID, deps[0].ID)
 		assert.Equal(t, dependencyVersion, deps[0].Version)
-
-		t.Run("NormalizedVersion", func(t *testing.T) {
-			np, err := ParseNuspecMetaData(strings.NewReader(`<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-	<id>test</id>
-	<version>1.04.5.2.5-rc.1+metadata</version>
-  </metadata>
-</package>`))
-			assert.NoError(t, err)
-			assert.NotNil(t, np)
-			assert.Equal(t, "1.4.5.2-rc.1", np.Version)
-		})
 	})
 
 	t.Run("Symbols Package", func(t *testing.T) {

routers/api/packages/nuget/api_v2.go

@@ -345,7 +345,7 @@ func createEntry(l *linkBuilder, pd *packages_model.PackageDescriptor, withNames
 		Content: content,
 		Properties: &FeedEntryProperties{
 			Version:                  pd.Version.Version,
-			NormalizedVersion:        pd.Version.Version,
+			NormalizedVersion:        normalizeVersion(pd.SemVer),
 			Authors:                  metadata.Authors,
 			Dependencies:             buildDependencyString(metadata),
 			Description:              metadata.Description,

routers/api/packages/nuget/api_v3.go

@@ -5,11 +5,15 @@
 package nuget
 
 import (
+	"bytes"
+	"fmt"
 	"sort"
 	"time"
 
 	packages_model "code.gitea.io/gitea/models/packages"
 	nuget_module "code.gitea.io/gitea/modules/packages/nuget"
+
+	"github.com/hashicorp/go-version"
 )
 
 // https://docs.microsoft.com/en-us/nuget/api/service-index#resources
@@ -92,8 +96,8 @@ func createRegistrationIndexResponse(l *linkBuilder, pds []*packages_model.Packa
 			{
 				RegistrationPageURL: l.GetRegistrationIndexURL(pds[0].Package.Name),
 				Count:               len(pds),
-				Lower:               pds[0].Version.Version,
+				Lower:               normalizeVersion(pds[0].SemVer),
-				Upper:               pds[len(pds)-1].Version.Version,
+				Upper:               normalizeVersion(pds[len(pds)-1].SemVer),
 				Items:               items,
 			},
 		},
@@ -170,7 +174,7 @@ type PackageVersionsResponse struct {
 func createPackageVersionsResponse(pds []*packages_model.PackageDescriptor) *PackageVersionsResponse {
 	versions := make([]string, 0, len(pds))
 	for _, pd := range pds {
-		versions = append(versions, pd.Version.Version)
+		versions = append(versions, normalizeVersion(pd.SemVer))
 	}
 
 	return &PackageVersionsResponse{
@@ -245,3 +249,15 @@ func createSearchResult(l *linkBuilder, pds []*packages_model.PackageDescriptor)
 		RegistrationIndexURL: l.GetRegistrationIndexURL(latest.Package.Name),
 	}
 }
+
+// normalizeVersion removes the metadata
+func normalizeVersion(v *version.Version) string {
+	var buf bytes.Buffer
+	segments := v.Segments64()
+	fmt.Fprintf(&buf, "%d.%d.%d", segments[0], segments[1], segments[2])
+	pre := v.Prerelease()
+	if pre != "" {
+		fmt.Fprintf(&buf, "-%s", pre)
+	}
+	return buf.String()
+}