Merged with vnext

Author: darrelmiller

.github/workflows/ci-cd.yml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Checkout repository
         id: checkout_repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0

.github/workflows/codeql-analysis.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout_repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v2

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

@@ -33,7 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
     <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" />

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -36,6 +36,7 @@ public static async Task<int> TransformOpenApiDocument(
             string openapi,
             string csdl,
             FileInfo output,
+            bool cleanoutput,
             string? version,
             OpenApiFormat? format,
             LogLevel loglevel,
@@ -59,6 +60,10 @@ CancellationToken cancellationToken
                 {
                     throw new ArgumentNullException(nameof(output));
                 }
+                if (cleanoutput && output.Exists)
+                {
+                    output.Delete();
+                }
                 if (output.Exists)
                 {
                     throw new IOException($"The file {output} already exists. Please input a new file path.");

src/Microsoft.OpenApi.Hidi/Program.cs

@@ -27,6 +27,9 @@ static async Task Main(string[] args)
             var outputOption = new Option<FileInfo>("--output", () => new FileInfo("./output"), "The output directory path for the generated file.") { Arity = ArgumentArity.ZeroOrOne };
             outputOption.AddAlias("-o");
 
+            var cleanOutputOption = new Option<bool>("--clean-output", "Overwrite an existing file");
+            cleanOutputOption.AddAlias("-co");
+
             var versionOption = new Option<string?>("--version", "OpenAPI specification version");
             versionOption.AddAlias("-v");
 
@@ -64,6 +67,7 @@ static async Task Main(string[] args)
                 descriptionOption,
                 csdlOption,
                 outputOption,
+                cleanOutputOption,
                 versionOption,
                 formatOption,
                 logLevelOption,               
@@ -74,7 +78,7 @@ static async Task Main(string[] args)
                 resolveExternalOption,
             };
 
-            transformCommand.SetHandler<string, string, FileInfo, string?, OpenApiFormat?, LogLevel, bool, bool, string, string, string, CancellationToken> (
+            transformCommand.SetHandler<string, string, FileInfo, bool, string?, OpenApiFormat?, LogLevel, bool, bool, string, string, string, CancellationToken> (
                 OpenApiService.TransformOpenApiDocument, descriptionOption, csdlOption, outputOption, versionOption, formatOption, logLevelOption, inlineOption, resolveExternalOption, filterByOperationIdsOption, filterByTagsOption, filterByCollectionOption);
 
             rootCommand.Add(transformCommand);

src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

@@ -40,7 +40,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SharpYaml" Version="1.8.0" />
+        <PackageReference Include="SharpYaml" Version="1.9.0" />
     </ItemGroup>
 
     <ItemGroup>
@@ -66,4 +66,4 @@
             <LastGenOutput>SRResource.Designer.cs</LastGenOutput>
         </EmbeddedResource>
     </ItemGroup>
-</Project>
+</Project>

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

@@ -247,7 +247,7 @@
         </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
         </PackageReference>
-        <PackageReference Include="SharpYaml" Version="1.8.0">
+        <PackageReference Include="SharpYaml" Version="1.9.0">
         </PackageReference>
         <PackageReference Include="xunit" Version="2.4.1">
         </PackageReference>

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

@@ -17,11 +17,11 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="Moq" Version="4.17.1" />
+    <PackageReference Include="Moq" Version="4.17.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SharpYaml" Version="1.8.0" />
-    <PackageReference Include="Verify" Version="16.3.2" />
-    <PackageReference Include="Verify.Xunit" Version="16.3.2" />
+    <PackageReference Include="SharpYaml" Version="1.9.0" />
+    <PackageReference Include="Verify" Version="16.3.5" />
+    <PackageReference Include="Verify.Xunit" Version="16.3.5" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
   </ItemGroup>
-    
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />