Revert breaking change to SchemaRepository.Schemas signature

domaindrivendev · Feb 7, 2021 · 4331154 · 4331154
1 parent 0b9b82b
commit 4331154
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,7 +6,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <LicenseUrl>https://licenses.nuget.org/MIT</LicenseUrl>
-    <VersionPrefix>6.0.1</VersionPrefix>
+    <VersionPrefix>6.0.2</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/SchemaRepository.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/SchemaRepository.cs
@@ -16,7 +16,7 @@ public SchemaRepository(string documentName = null)
 
         public string DocumentName { get; }
 
-        public IDictionary<string, OpenApiSchema> Schemas { get; private set; } = new SortedDictionary<string, OpenApiSchema>();
+        public Dictionary<string, OpenApiSchema> Schemas { get; private set; } = new Dictionary<string, OpenApiSchema>();
 
         public void RegisterType(Type type, string schemaId)
         {

diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/SwaggerGenerator.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/SwaggerGenerator.cs
@@ -47,7 +47,7 @@ public OpenApiDocument GetSwagger(string documentName, string host = null, strin
                 Paths = GeneratePaths(applicableApiDescriptions, schemaRepository),
                 Components = new OpenApiComponents
                 {
-                    Schemas = schemaRepository.Schemas,
+                    Schemas = new SortedDictionary<string, OpenApiSchema>(schemaRepository.Schemas),
                     SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>(_options.SecuritySchemes)
                 },
                 SecurityRequirements = new List<OpenApiSecurityRequirement>(_options.SecurityRequirements)

diff --git a/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs b/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs
@@ -438,7 +438,7 @@ public void GenerateSchema_SupportsOption_SubTypesSelector()
 
             var schema = subject.GenerateSchema(typeof(BaseType), schemaRepository);
 
-            Assert.Equal(new[] { "BaseType", "SubType1" }, schemaRepository.Schemas.Keys);
+            Assert.Equal(new[] { "SubType1", "BaseType" }, schemaRepository.Schemas.Keys);
         }
 
         [Fact]

diff --git a/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs b/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs
@@ -434,7 +434,7 @@ public void GenerateSchema_SupportsOption_SubTypesSelector()
 
             var schema = subject.GenerateSchema(typeof(BaseType), schemaRepository);
 
-            Assert.Equal(new[] { "BaseType", "SubType1" }, schemaRepository.Schemas.Keys);
+            Assert.Equal(new[] { "SubType1", "BaseType" }, schemaRepository.Schemas.Keys);
         }
 
         [Fact]