microsoft · baywet · May 11, 2022 · Apr 13, 2022 · Apr 13, 2022 · Apr 13, 2022
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Initialize CodeQL
         id: init_codeql
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           queries: security-and-quality
 
@@ -43,6 +43,6 @@ jobs:
 
       - name: Perform CodeQL Analysis
         id: analyze_codeql
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
 
 # Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)
diff --git a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
@@ -15,14 +15,14 @@
     <PackageId>Microsoft.OpenApi.Hidi</PackageId>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.0.0-preview1</Version>
+    <Version>1.0.0-preview2</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>OpenAPI .NET</PackageTags>
     <RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
     <PackageReleaseNotes>
-- Upgrades Microsoft.OpenApi.OData to 1.0.10-preview1
-- Fixes an issue where hidi would not process async operations
+- Upgrades Microsoft.OpenApi.OData to 1.0.10
+- Upgrades Microsoft.OData.Edm to 7.11.0
     </PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.Hidi</AssemblyName>
     <RootNamespace>Microsoft.OpenApi.Hidi</RootNamespace>
@@ -45,8 +45,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
-    <PackageReference Include="Microsoft.OData.Edm" Version="7.10.0" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.10-preview3" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="7.11.0" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.10" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
@@ -44,6 +44,7 @@ public static async Task<int> TransformOpenApiDocument(
             bool cleanoutput,
             string? version,
             OpenApiFormat? format,
+            bool terseOutput,
             LogLevel loglevel,
             bool inlineLocal,
             bool inlineExternal,
@@ -196,7 +197,7 @@ CancellationToken cancellationToken
 
                     IOpenApiWriter writer = openApiFormat switch
                     {
-                        OpenApiFormat.Json => new OpenApiJsonWriter(textWriter, settings),
+                        OpenApiFormat.Json => terseOutput ? new OpenApiJsonWriter(textWriter, settings, terseOutput) : new OpenApiJsonWriter(textWriter, settings, false),
                         OpenApiFormat.Yaml => new OpenApiYamlWriter(textWriter, settings),
                         _ => throw new ArgumentException("Unknown format"),
                     };

diff --git a/src/Microsoft.OpenApi.Hidi/Program.cs b/src/Microsoft.OpenApi.Hidi/Program.cs
@@ -39,6 +39,9 @@ static async Task Main(string[] args)
             var formatOption = new Option<OpenApiFormat?>("--format", "File format");
             formatOption.AddAlias("-f");
 
+            var terseOutputOption = new Option<bool>("--terse-output", "Produce terse json output");
+            terseOutputOption.AddAlias("-to");
+
             var logLevelOption = new Option<LogLevel>("--loglevel", () => LogLevel.Information, "The log level to use when logging messages to the main output.");
             logLevelOption.AddAlias("-ll");
 
@@ -74,6 +77,7 @@ static async Task Main(string[] args)
                 cleanOutputOption,
                 versionOption,
                 formatOption,
+                terseOutputOption,
                 logLevelOption,               
                 filterByOperationIdsOption,
                 filterByTagsOption,
@@ -82,8 +86,8 @@ static async Task Main(string[] args)
                 inlineExternalOption
             };
 
-            transformCommand.SetHandler<string, string, string, FileInfo, bool, string?, OpenApiFormat?, LogLevel, bool, bool, string, string, string, CancellationToken> (
-                OpenApiService.TransformOpenApiDocument, descriptionOption, csdlOption, csdlFilterOption, outputOption, cleanOutputOption, versionOption, formatOption, logLevelOption, inlineLocalOption, inlineExternalOption, filterByOperationIdsOption, filterByTagsOption, filterByCollectionOption);
+            transformCommand.SetHandler<string, string, string, FileInfo, bool, string?, OpenApiFormat?, bool, LogLevel, bool, bool, string, string, string, CancellationToken> (
+                OpenApiService.TransformOpenApiDocument, descriptionOption, csdlOption, csdlFilterOption, outputOption, cleanOutputOption, versionOption, formatOption, terseOutputOption, logLevelOption, inlineLocalOption, inlineExternalOption, filterByOperationIdsOption, filterByTagsOption, filterByCollectionOption);
 
             rootCommand.Add(transformCommand);
             rootCommand.Add(validateCommand);

diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
@@ -40,7 +40,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SharpYaml" Version="1.9.0" />
+        <PackageReference Include="SharpYaml" Version="1.9.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs
@@ -83,20 +83,14 @@ public static void Serialize<T>(
                 throw Error.ArgumentNull(nameof(stream));
             }
 
-            IOpenApiWriter writer;
             var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
-            switch (format)
-            {
-                case OpenApiFormat.Json:
-                    writer = new OpenApiJsonWriter(streamWriter,settings);
-                    break;
-                case OpenApiFormat.Yaml:
-                    writer = new OpenApiYamlWriter(streamWriter, settings);
-                    break;
-                default:
-                    throw new OpenApiException(string.Format(SRResource.OpenApiFormatNotSupported, format));
-            }
 
+            IOpenApiWriter writer = format switch
+            {
+                OpenApiFormat.Json => new OpenApiJsonWriter(streamWriter, settings, false),
+                OpenApiFormat.Yaml => new OpenApiYamlWriter(streamWriter, settings),
+                _ => throw new OpenApiException(string.Format(SRResource.OpenApiFormatNotSupported, format)),
+            };
             element.Serialize(writer, specVersion);
         }
 

diff --git a/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs
@@ -33,8 +33,10 @@ public OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settin
         /// </summary>
         /// <param name="textWriter">The text writer.</param>
         /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
-        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings settings) : base(textWriter, settings)
+        /// <param name="terseOutput"> Setting for allowing the JSON emitted to be in terse format.</param>
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings settings, bool terseOutput = false) : base(textWriter, settings)
         {
+            _produceTerseOutput = terseOutput;
         }
 
         /// <summary>

diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs
@@ -69,7 +69,6 @@ public ReferenceInlineSetting ReferenceInline {
         /// </summary>
         public bool InlineExternalReferences { get; set; } = false;
 
-
         internal bool ShouldInlineReference(OpenApiReference reference)
         {
             return (reference.IsLocal && InlineLocalReferences)

diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
@@ -247,11 +247,11 @@
         </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
         </PackageReference>
-        <PackageReference Include="SharpYaml" Version="1.9.0">
+        <PackageReference Include="SharpYaml" Version="1.9.1">
         </PackageReference>
         <PackageReference Include="xunit" Version="2.4.1">
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj
@@ -19,11 +19,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.17.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SharpYaml" Version="1.9.0" />
-    <PackageReference Include="Verify" Version="16.5.4" />
-    <PackageReference Include="Verify.Xunit" Version="16.5.4" />
+    <PackageReference Include="SharpYaml" Version="1.9.1" />
+    <PackageReference Include="Verify" Version="16.7.0" />
+    <PackageReference Include="Verify.Xunit" Version="16.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
@@ -1281,7 +1281,7 @@ namespace Microsoft.OpenApi.Writers
     {
         public OpenApiJsonWriter(System.IO.TextWriter textWriter) { }
         public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.Writers.OpenApiJsonWriterSettings settings) { }
-        public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.Writers.OpenApiWriterSettings settings) { }
+        public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.Writers.OpenApiWriterSettings settings, bool terseOutput = false) { }
         protected override int BaseIndentation { get; }
         public override void WriteEndArray() { }
         public override void WriteEndObject() { }