Merge branch 'master' of https://github.com/RicoSuter/NJsonSchema

src/NJsonSchema.CodeGeneration.CSharp.Tests/References/F.json

@@ -0,0 +1,9 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "$ref": "./G.json",
+            "description": "This is the type of G"
+        }
+    }
+}

src/NJsonSchema.CodeGeneration.CSharp.Tests/References/G.json

@@ -0,0 +1,4 @@
+{
+    "type": "string",
+    "nullable": true
+}

src/NJsonSchema.CodeGeneration.CSharp.Tests/ReferencesTest.cs

@@ -47,6 +47,27 @@ public async Task When_ref_is_file_no_types_are_duplicated()
             Assert.DoesNotContain("public enum C2", code);
         }
 
+        [Fact]
+        public async Task When_ref_is_file_and_it_contains_nullable_property_then_generated_property_is_also_nullable()
+        {
+            //// Arrange
+            var path = GetTestDirectory() + "/References/F.json";
+
+            //// Act
+            var schema = await JsonSchema.FromFileAsync(path);
+            var generatorSettings = new CSharpGeneratorSettings
+            {
+                GenerateNullableReferenceTypes = true
+            };
+            var generator = new CSharpGenerator(schema, generatorSettings);
+
+            //// Act
+            var code = generator.GenerateFile("MyClass");
+
+            //// Assert
+            Assert.Contains("public string? Name", code);
+        }
+
         private string GetTestDirectory()
         {
             var codeBase = Assembly.GetExecutingAssembly().CodeBase;

src/NJsonSchema/JsonSchema.cs

@@ -297,7 +297,7 @@ public JsonSchema InheritedTypeSchema
         {
             get
             {
-                if (ActualTypeSchema.IsDictionary || ActualTypeSchema.IsArray || ActualTypeSchema.IsTuple)
+                if (InheritedSchema == null && (ActualTypeSchema.IsDictionary || ActualTypeSchema.IsArray || ActualTypeSchema.IsTuple))
                 {
                     return ActualTypeSchema;
                 }
@@ -875,6 +875,14 @@ public virtual bool IsNullable(SchemaType schemaType)
                 return true;
             }
 
+            if (ExtensionData != null && ExtensionData.TryGetValue("nullable", out var value))
+            {
+                if (bool.TryParse(value.ToString(), out var boolValue))
+                {
+                    return boolValue;
+                }
+            }
+
             return false;
         }