Merge branch 'master' into dotnet-vnext

Author: martincostello

src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/JsonSerializerDataContractResolver.cs

@@ -60,7 +60,8 @@ public DataContract GetDataContractForType(Type type)
                 // This is a special case where we know the possible key values
                 var enumValuesAsJson = keyType.GetEnumValues()
                     .Cast<object>()
-                    .Select(value => JsonConverterFunc(value, keyType));
+                    .Select(value => JsonConverterFunc(value, keyType))
+                    .Distinct();
 
                 keys =
                     enumValuesAsJson.Any(json => json.StartsWith('\"'))

test/Swashbuckle.AspNetCore.IntegrationTests/Swashbuckle.AspNetCore.IntegrationTests.csproj

@@ -47,8 +47,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="10.0.4" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="10.0.4" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="10.0.5" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="10.0.5" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))">

test/Swashbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs

@@ -1275,6 +1275,20 @@ public void GenerateSchema_HonorsEnumDictionaryKeys_StringEnumConverter()
         Assert.Equal(typeof(IntEnum).GetEnumNames(), referenceSchema.Properties.Keys);
     }
 
+    [Fact]
+    public void GenerateSchema_GeneratesDictionarySchema_IfEnumKeyHasDuplicateValues()
+    {
+        // Regression test for https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2956
+        var subject = Subject(
+            configureSerializer: c => c.Converters.Add(new JsonStringEnumConverter()));
+        var schemaRepository = new SchemaRepository();
+
+        var schema = subject.GenerateSchema(typeof(Dictionary<IntEnumWithDuplicateValues, string>), schemaRepository);
+
+        Assert.Equal(JsonSchemaTypes.Object, schema.Type);
+        Assert.Equal(["Unknown", "PreferredName"], schema.Properties.Keys);
+    }
+
     [Fact]
     public void GenerateSchema_HonorsSerializerAttribute_StringEnumConverter()
     {

test/Swashbuckle.AspNetCore.TestSupport/Fixtures/Enums.cs

@@ -1,33 +1,40 @@
 namespace Swashbuckle.AspNetCore.TestSupport;
 
-public enum ByteEnum:byte
+public enum ByteEnum : byte
 {
     Value2 = 2,
     Value4 = 4,
     Value8 = 8,
 }
 
-public enum ShortEnum:short
+public enum ShortEnum : short
 {
     Value2 = 2,
     Value4 = 4,
     Value8 = 8,
 }
 
-public enum EmptyIntEnum:int
+public enum EmptyIntEnum : int
 {
 }
 
-public enum IntEnum:int
+public enum IntEnum : int
 {
     Value2 = 2,
     Value4 = 4,
     Value8 = 8,
 }
 
-public enum LongEnum:long
+public enum LongEnum : long
 {
     Value2 = 2,
     Value4 = 4,
     Value8 = 8,
 }
+
+public enum IntEnumWithDuplicateValues : int
+{
+    Unknown = 0,
+    PreferredName = 1,
+    OldNameForBackwardsCompatibility = PreferredName,
+}

test/WebSites/OAuth2Integration/OAuth2Integration.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="10.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="10.0.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">

test/WebSites/TodoApp/TodoApp.csproj

@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.SwaggerUI\Swashbuckle.AspNetCore.SwaggerUI.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" VersionOverride="10.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" VersionOverride="10.0.5" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" VersionOverride="11.0.0-preview.2.26159.112" />