Merge pull request #814 from RSuter/master

Release v9.12.2
RicoSuter · Nov 13, 2018 · 5cd46f9 · 5cd46f9
2 parents 27e5802 + a0d077a
commit 5cd46f9
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 23 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.12.1</Version>
+    <Version>9.12.2</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.12.1</Version>
+    <Version>9.12.2</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.12.1</Version>
+    <Version>9.12.2</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj b/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.12.1</Version>
+    <Version>9.12.2</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema/Generation/JsonSchemaGenerator.cs b/src/NJsonSchema/Generation/JsonSchemaGenerator.cs
@@ -350,8 +350,7 @@ protected virtual async Task GenerateObjectAsync(Type type,
 
             GenerateInheritanceDiscriminator(type, rootSchema);
 
-            if (Settings.GenerateKnownTypes)
-                await GenerateKnownTypesAsync(type, schemaResolver).ConfigureAwait(false);
+            await GenerateKnownTypesAsync(type, schemaResolver).ConfigureAwait(false);
 
             if (Settings.GenerateXmlObjects)
                 schema.GenerateXmlObjectForType(type);
@@ -644,30 +643,48 @@ protected virtual string[] GetTypeProperties(Type type)
 
         private async Task GenerateKnownTypesAsync(Type type, JsonSchemaResolver schemaResolver)
         {
-            var knownTypeAttributes = type.GetTypeInfo()
-                .GetCustomAttributes(Settings.GetActualFlattenInheritanceHierarchy(type)) // Known types of inherited classes will be generated later (in GenerateInheritanceAsync)
-                .Where(a => a.GetType().Name == "KnownTypeAttribute")
-                .OfType<Attribute>();
+            var attributes = type.GetTypeInfo()
+                .GetCustomAttributes(Settings.GetActualFlattenInheritanceHierarchy(type));
 
-            foreach (dynamic attribute in knownTypeAttributes)
+            if (Settings.GenerateKnownTypes)
             {
-                if (attribute.Type != null)
-                    await AddKnownTypeAsync(attribute.Type, schemaResolver).ConfigureAwait(false);
-                else if (attribute.MethodName != null)
+                var knownTypeAttributes = attributes
+                   // Known types of inherited classes will be generated later (in GenerateInheritanceAsync)
+                   .Where(a => a.GetType().IsAssignableTo("KnownTypeAttribute", TypeNameStyle.Name))
+                   .OfType<Attribute>();
+
+                foreach (dynamic attribute in knownTypeAttributes)
                 {
-                    var methodInfo = type.GetRuntimeMethod((string)attribute.MethodName, new Type[0]);
-                    if (methodInfo != null)
+                    if (attribute.Type != null)
+                        await AddKnownTypeAsync(attribute.Type, schemaResolver).ConfigureAwait(false);
+                    else if (attribute.MethodName != null)
                     {
-                        var knownTypes = methodInfo.Invoke(null, null) as IEnumerable<Type>;
-                        if (knownTypes != null)
+                        var methodInfo = type.GetRuntimeMethod((string)attribute.MethodName, new Type[0]);
+                        if (methodInfo != null)
                         {
-                            foreach (var knownType in knownTypes)
-                                await AddKnownTypeAsync(knownType, schemaResolver).ConfigureAwait(false);
+                            var knownTypes = methodInfo.Invoke(null, null) as IEnumerable<Type>;
+                            if (knownTypes != null)
+                            {
+                                foreach (var knownType in knownTypes)
+                                    await AddKnownTypeAsync(knownType, schemaResolver).ConfigureAwait(false);
+                            }
                         }
                     }
+                    else
+                        throw new ArgumentException($"A KnownType attribute on {type.FullName} does not specify a type or a method name.", nameof(type));
+                }
+            }
+
+            foreach (var jsonConverterAttribute in attributes
+                .Where(a => a.GetType().IsAssignableTo("JsonInheritanceAttribute", TypeNameStyle.Name)))
+            {
+                var knownType = ReflectionExtensions.TryGetPropertyValue<Type>(
+                    jsonConverterAttribute, "Type", null);
+
+                if (knownType != null)
+                {
+                    await AddKnownTypeAsync(knownType, schemaResolver).ConfigureAwait(false);
                 }
-                else
-                    throw new ArgumentException($"A KnownType attribute on {type.FullName} does not specify a type or a method name.", nameof(type));
             }
         }
 

diff --git a/src/NJsonSchema/NJsonSchema.csproj b/src/NJsonSchema/NJsonSchema.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;net40;net45</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>9.12.1</Version>
+    <Version>9.12.2</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>