Merge pull request #118 from bdovaz/fix-IgnoreUnmatchedProperties-maps

Fix IgnoreUnmatchedProperties for map types

.github/workflows/ci.yml

@@ -20,10 +20,10 @@ jobs:
         submodules: true
         fetch-depth: 0
 
-    - name: Install .NET 6.0
+    - name: Install .NET 7.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
 
     - name: Build, Test, Pack, Publish
       shell: bash

src/SharpYaml.Tests/Serialization/SerializationTests.cs

@@ -182,7 +182,7 @@ public void DeserializeScalar()
         [Test]
         public void DeserializeUnsafeExplicitType()
         {
-            var settings = new SerializerSettings(){ UnsafeAllowDeserializeFromTagTypeName = true };
+            var settings = new SerializerSettings() { UnsafeAllowDeserializeFromTagTypeName = true };
             var serializer = new Serializer(settings);
             object result = serializer.Deserialize(YamlFile("explicitType.yaml"), typeof(object));
 
@@ -229,8 +229,8 @@ public void DeserializeUnregisterdExplicitDictionary()
         {
             var serializer = new Serializer();
             Assert.Throws<YamlException>(() => serializer.Deserialize(YamlFile("dictionaryExplicit.yaml")));
-        }
-        
+        }
+
         [Test]
         public void DeserializeListOfDictionaries()
         {
@@ -903,6 +903,24 @@ public void SerializeGenericDictionaryShouldNotThrowTargetException()
             });
         }
 
+        [Test]
+        public void DeserializeDoesNotThrowWithNonPrimitiveIgnoreUnmatchedProperties()
+        {
+            var serializer = new Serializer(new SerializerSettings { IgnoreUnmatchedProperties = true });
+            var yaml = @"---
+Mother:  
+  Name: Name1
+Father:
+  Name: Name2
+Dog:
+  Name: Name3
+...";
+
+            var family = serializer.Deserialize<Family>(yaml);
+            Assert.AreEqual("Name1", family.Mother.Name);
+            Assert.AreEqual("Name2", family.Father.Name);
+        }
+
         private class OnlyGenericDictionary : IDictionary<string, string>
         {
             private readonly Dictionary<string, string> _dictionary = new Dictionary<string, string>();

src/SharpYaml.Tests/SharpYaml.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

src/SharpYaml/Serialization/Serializers/ObjectSerializer.cs

@@ -197,7 +197,9 @@ protected virtual void ReadMember(ref ObjectContext objectContext)
             if (!TryReadMember(ref objectContext, out var memberScalar, out var memberName))
             {
                 if (!objectContext.Settings.IgnoreUnmatchedProperties)
-                    throw new YamlException(memberScalar.Start, memberScalar.End, $"Unable to deserialize property [{memberName}] not found in type [{objectContext.Descriptor}]");
+                    throw new YamlException(memberScalar.Start, memberScalar.End, $"Unable to deserialize property [{memberName}] not found in type [{objectContext.Descriptor}]");
+                else
+                    objectContext.Reader.Skip(objectContext.Reader.CurrentDepth);
             }
         }
 

src/global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.100",
+        "version": "7.0.100",
         "rollForward": "latestMinor",
         "allowPrerelease": false
     }