Merge branch 'vnext' into safia/trimmable

MaggieKimani1 · web-flow · commit 3f597ba4e532 · 2024-07-22T12:31:34.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -121,3 +121,14 @@ csharp_preserve_single_line_blocks = true
 [*.vb]
 # Modifier preferences
 visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
+
+
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,6 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# VerifyTests
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.1.0
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,13 +30,13 @@ jobs:
         id: getversion
       - name: Push to GitHub Packages - Nightly
         if: ${{ github.ref == 'refs/heads/vnext' }}
-        uses: docker/build-push-action@v6.2.0
+        uses: docker/build-push-action@v6.4.0
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
       - name: Push to GitHub Packages - Release
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v6.2.0
+        uses: docker/build-push-action@v6.4.0
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}
diff --git a/README.md b/README.md
@@ -113,12 +113,6 @@ In order to test the validity of an OpenApi document, we avail the following too
     
     5. Copy and paste your OpenAPI descriptions in the **Input Content** window or paste the path to the descriptions file in the **Input File** textbox and click on `Convert` to render the results.
 
-# Build Status
-
-|**master**|
-|--|
-|[![Build status](https://ci.appveyor.com/api/projects/status/9l6hly3vjeu0tmtx/branch/master?svg=true)](https://ci.appveyor.com/project/MicrosoftOpenAPINETAdmin/openapi-net-54e7i/branch/master)|
-
 # Contributing
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
diff --git a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.7" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Themes\Metro\HowToApplyTheme.txt" />
diff --git a/src/Microsoft.OpenApi/Any/OpenApiArray.cs b/src/Microsoft.OpenApi/Any/OpenApiArray.cs
@@ -27,6 +27,10 @@ public OpenApiArray() { }
         public OpenApiArray(OpenApiArray array)
         {
             AnyType = array.AnyType;
+            foreach (var item in array)
+            {
+                Add(OpenApiAnyCloneHelper.CloneFromCopyConstructor(item));
+            }
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Any/OpenApiObject.cs b/src/Microsoft.OpenApi/Any/OpenApiObject.cs
@@ -27,6 +27,10 @@ public OpenApiObject() { }
         public OpenApiObject(OpenApiObject obj)
         {
             AnyType = obj.AnyType;
+            foreach (var key in obj.Keys)
+            {
+                this[key] = OpenApiAnyCloneHelper.CloneFromCopyConstructor(obj[key]);
+            }
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
@@ -61,6 +61,10 @@ public static class OpenApiFilterService
         public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Func<string, OperationType?, OpenApiOperation, bool> predicate)
         {
             // Fetch and copy title, graphVersion and server info from OpenApiDoc
+            var components = source.Components is null 
+                ? null 
+                : new OpenApiComponents() { SecuritySchemes = source.Components.SecuritySchemes };
+
             var subset = new OpenApiDocument
             {
                 Info = new()
@@ -74,7 +78,7 @@ public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Fun
                     Extensions = source.Info.Extensions
                 },
 
-                Components = new() { SecuritySchemes = source.Components.SecuritySchemes },
+                Components = components,
                 SecurityRequirements = source.SecurityRequirements,
                 Servers = source.Servers
             };
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Microsoft.OpenApi.Hidi.Tests.csproj b/test/Microsoft.OpenApi.Hidi.Tests/Microsoft.OpenApi.Hidi.Tests.csproj
@@ -14,8 +14,8 @@
     <PackageReference Include="coverlet.msbuild" Version="6.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" PrivateAssets="all" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
@@ -65,6 +65,46 @@ public async Task ReturnFilteredOpenApiDocBasedOnOperationIdsAndInputCsdlDocumen
             Assert.Equal(expectedPathCount, subsetOpenApiDocument.Paths.Count);
         }
 
+        [Fact]
+        public void CreateFilteredDocumentOnMinimalOpenApi()
+        {
+            // Arrange
+
+            // We create a minimal OpenApiDocument with a single path and operation.
+            var openApiDoc = new OpenApiDocument
+            {
+                Info = new()
+                {
+                    Title = "Test",
+                    Version = "1.0.0"
+                },
+                Paths = new()
+                {
+                    ["/test"] = new OpenApiPathItem()
+                    {
+                        Operations = new Dictionary<OperationType, OpenApiOperation>
+                        {
+                            [OperationType.Get] = new OpenApiOperation()
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var requestUrls = new Dictionary<string, List<string>>()
+            {
+                { "/test", ["GET"] }
+            };
+            var filterPredicate = OpenApiFilterService.CreatePredicate(null, null, requestUrls, openApiDoc);
+            var filteredDocument = OpenApiFilterService.CreateFilteredDocument(openApiDoc, filterPredicate);
+
+            // Assert
+            Assert.NotNull(filteredDocument);
+            Assert.NotNull(filteredDocument.Paths);
+            Assert.Single(filteredDocument.Paths);
+        }
+
+
         [Theory]
         [InlineData("UtilityFiles/appsettingstest.json")]
         [InlineData(null)]
diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
@@ -21,8 +21,8 @@
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="SharpYaml" Version="2.1.1" />
-        <PackageReference Include="xunit" Version="2.8.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" PrivateAssets="all" />
+        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="coverlet.msbuild" Version="6.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" PrivateAssets="all" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj
@@ -15,9 +15,9 @@
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SharpYaml" Version="2.1.1" />
-    <PackageReference Include="Verify.Xunit" Version="25.2.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" PrivateAssets="all" />
+    <PackageReference Include="Verify.Xunit" Version="25.3.2" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
   </ItemGroup>
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs
@@ -1,11 +1,9 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.OpenApi.Any;
@@ -485,6 +483,45 @@ public void OpenApiSchemaCopyConstructorSucceeds()
             Assert.True(actualSchema.Nullable);
         }
 
+        public static TheoryData<IOpenApiAny> SchemaExamples()
+        {
+            return new()
+            {
+                new OpenApiArray() { new OpenApiString("example") },
+                new OpenApiBinary([0, 1, 2]),
+                new OpenApiBoolean(true),
+                new OpenApiByte(42),
+                new OpenApiDate(new(2024, 07, 19, 12, 34, 56)),
+                new OpenApiDateTime(new(2024, 07, 19, 12, 34, 56, new(01, 00, 00))),
+                new OpenApiDouble(42.37),
+                new OpenApiFloat(42.37f),
+                new OpenApiInteger(42),
+                new OpenApiLong(42),
+                new OpenApiNull(),
+                new OpenApiObject() { ["prop"] = new OpenApiString("example") },
+                new OpenApiPassword("secret"),
+                new OpenApiString("example"),
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(SchemaExamples))]
+        public void CloningSchemaExamplesWorks(IOpenApiAny example)
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Example = example
+            };
+
+            // Act && Assert
+            var schemaCopy = new OpenApiSchema(schema);
+            Assert.NotNull(schemaCopy.Example);
+
+            // Act && Assert
+            Assert.Equivalent(schema.Example, schemaCopy.Example);
+        }
+
         [Fact]
         public void CloningSchemaExtensionsWorks()
         {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public OpenApiArray() { }`
`27`	`27`	`public OpenApiArray(OpenApiArray array)`
`28`	`28`	`{`
`29`	`29`	`AnyType = array.AnyType;`
	`30`	`+ foreach (var item in array)`
	`31`	`+ {`
	`32`	`+ Add(OpenApiAnyCloneHelper.CloneFromCopyConstructor(item));`
	`33`	`+ }`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public OpenApiObject() { }`
`27`	`27`	`public OpenApiObject(OpenApiObject obj)`
`28`	`28`	`{`
`29`	`29`	`AnyType = obj.AnyType;`
	`30`	`+ foreach (var key in obj.Keys)`
	`31`	`+ {`
	`32`	`+ this[key] = OpenApiAnyCloneHelper.CloneFromCopyConstructor(obj[key]);`
	`33`	`+ }`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`/// <summary>`