dev

.azure-pipelines/ci-build.yml

@@ -216,7 +216,7 @@ extends:
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
-                  packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Hidi.*.nupkg'
+                  packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
@@ -238,7 +238,7 @@ extends:
                 vmImage: ubuntu-latest
               steps:
               - powershell: |
-                  $fileNames = "$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Hidi.*.nupkg", "$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Readers.*.nupkg", "$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Workbench.*.nupkg"
+                  $fileNames = "$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg", "$(Pipeline.Workspace)/Microsoft.OpenApi.Readers.*.nupkg", "$(Pipeline.Workspace)/Microsoft.OpenApi.Workbench.*.nupkg"
                   foreach($fileName in $fileNames) {
                     if(Test-Path $fileName) {
                       rm $fileName -Verbose
@@ -248,7 +248,7 @@ extends:
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
-                  packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.*.nupkg'
+                  packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
@@ -272,7 +272,7 @@ extends:
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
-                  packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Readers.*.nupkg'
+                  packagesToPush: '$(Pipeline.Workspace)/Microsoft.OpenApi.Readers.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
@@ -294,22 +294,21 @@ extends:
                 vmImage: ubuntu-latest
               steps:
               - pwsh: |
-                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace)\Nugets -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
+                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace) -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
                   $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
                   #Set Variable $artifactName and $artifactVersion
-                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
+                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false;]$artifactVersion"
                   echo "$artifactVersion"
                 displayName: 'Fetch Artifact Name'
-                name: getTagVersion
               - task: GitHubRelease@1
                 displayName: 'GitHub release (edit)'
                 condition: succeededOrFailed()
                 inputs:
                   gitHubConnection: 'Github-MaggieKimani1'
                   action: create
                   tagSource: userSpecifiedTag
-                  tag: '$(getTagVersion.artifactVersion)'
-                  title: '$(getTagVersion.artifactVersion)'
+                  tag: '$(artifactVersion)'
+                  title: '$(artifactVersion)'
                   releaseNotesSource: inline
                   assets: '$(Pipeline.Workspace)\**\*.exe'
                   changeLogType: issueBased

src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtension.cs

@@ -11,6 +11,8 @@
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 using System.Text.Json.Nodes;
+using System.Text.Json;
+using System.Globalization;
 
 namespace Microsoft.OpenApi.MicrosoftExtensions;
 
@@ -97,7 +99,10 @@
     {
         if (source is null) throw new ArgumentNullException(nameof(source));
         if (source.TryGetPropertyValue(nameof(Value).ToFirstCharacterLowerCase(), out var rawValue) && rawValue is JsonNode value)
-            Value = value.GetValue<string>();
+            if (value.GetValueKind() == JsonValueKind.Number)
+                Value = value.GetValue<decimal>().ToString(CultureInfo.InvariantCulture);
+            else
+                Value = value.GetValue<string>();
         if (source.TryGetPropertyValue(nameof(Description).ToFirstCharacterLowerCase(), out var rawDescription) && rawDescription is JsonNode description)
             Description = description.GetValue<string>();
         if (source.TryGetPropertyValue(nameof(Name).ToFirstCharacterLowerCase(), out var rawName) && rawName is JsonNode name)

test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="SharpYaml" Version="2.1.1" />
-    <PackageReference Include="Verify.Xunit" Version="28.6.1" />
+    <PackageReference Include="Verify.Xunit" Version="28.7.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Text.Json.Nodes;
 using Microsoft.OpenApi.MicrosoftExtensions;
 using Microsoft.OpenApi.Writers;
 using Xunit;
@@ -22,7 +23,7 @@ public void WritesNothingWhenNoValues()
     {
         // Arrange
         OpenApiEnumValuesDescriptionExtension extension = new();
-        using TextWriter sWriter = new StringWriter();
+        using var sWriter = new StringWriter();
         OpenApiJsonWriter writer = new(sWriter);
 
         // Act
@@ -41,16 +42,16 @@ public void WritesEnumDescription()
         OpenApiEnumValuesDescriptionExtension extension = new()
         {
             EnumName = "TestEnum",
-            ValuesDescriptions = new()
-        {
+            ValuesDescriptions =
+        [
             new() {
                 Description = "TestDescription",
                 Value = "TestValue",
                 Name = "TestName"
             }
-        }
+        ]
         };
-        using TextWriter sWriter = new StringWriter();
+        using var sWriter = new StringWriter();
         OpenApiJsonWriter writer = new(sWriter);
 
         // Act
@@ -65,5 +66,49 @@ public void WritesEnumDescription()
         Assert.Contains("value\": \"TestValue", result);
         Assert.Contains("name\": \"TestName", result);
     }
+    [Fact]
+    public void ParsesEnumDescription()
+    {
+        var extensionValue =
+"""
+{
+    "value": "Standard_LRS",
+    "description": "Locally redundant storage.",
+    "name": "StandardLocalRedundancy"
+}
+""";
+        var source = JsonNode.Parse(extensionValue);
+        Assert.NotNull(source);
+        var sourceAsObject = source.AsObject();
+        Assert.NotNull(sourceAsObject);
+
+        var descriptionItem = new EnumDescription(sourceAsObject);
+        Assert.NotNull(descriptionItem);
+        Assert.Equal("Standard_LRS", descriptionItem.Value);
+        Assert.Equal("Locally redundant storage.", descriptionItem.Description);
+        Assert.Equal("StandardLocalRedundancy", descriptionItem.Name);
+    }
+       [Fact]
+    public void ParsesEnumDescriptionWithDecimalValue()
+    {
+        var extensionValue =
+"""
+{
+    "value": -1,
+    "description": "Locally redundant storage.",
+    "name": "StandardLocalRedundancy"
+}
+""";
+        var source = JsonNode.Parse(extensionValue);
+        Assert.NotNull(source);
+        var sourceAsObject = source.AsObject();
+        Assert.NotNull(sourceAsObject);
+
+        var descriptionItem = new EnumDescription(sourceAsObject);
+        Assert.NotNull(descriptionItem);
+        Assert.Equal("-1", descriptionItem.Value);
+        Assert.Equal("Locally redundant storage.", descriptionItem.Description);
+        Assert.Equal("StandardLocalRedundancy", descriptionItem.Name);
+    }
 }