Fix edge case for resolving embedded entries without a strong type (#355)

Author: Roblinde

Contentful.AspNetCore/Contentful.AspNetCore.csproj

@@ -3,7 +3,7 @@
     <Description>Official .NET SDK for the Contentful Content Delivery and Management API for ASP.NET core.</Description>
     <PackageId>contentful.aspnetcore</PackageId>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>8.2.1</VersionPrefix>
+    <VersionPrefix>8.3.0</VersionPrefix>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Authors>Contentful</Authors>
     <Copyright>Contentful GmbH.</Copyright>
@@ -13,10 +13,10 @@
     <PackageProjectUrl>https://github.com/contentful/contentful.net</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <Version>8.2.1</Version>
-    <AssemblyVersion>8.2.1.0</AssemblyVersion>
+    <Version>8.3.0</Version>
+    <AssemblyVersion>8.3.0.0</AssemblyVersion>
     <RepositoryUrl>https://github.com/contentful/contentful.net</RepositoryUrl>
-    <FileVersion>8.2.1.0</FileVersion>
+    <FileVersion>8.3.0.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DocumentationFile>bin\Release\netstandard1.5\Contentful.AspNetCore.xml</DocumentationFile>
@@ -25,7 +25,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="contentful.csharp" Version="8.2.1" />
+    <PackageReference Include="contentful.csharp" Version="8.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />

Contentful.Core.Tests/ClientTestsBase.cs

@@ -274,6 +274,18 @@ public class SelfReferencerInArray
         public SelfReferencer[] SubCategories { get; set; }
     }
 
+    public class InlineListReferences
+    {
+        public SystemProperties Sys { get; set; }
+        public List<SubWithRichText> List { get; set; }
+    }
+
+    public class SubWithRichText
+    {
+        public Document Rich { get; set; }
+        public Document Rich2 { get; set; }
+    }
+
     public interface IMarker
     {
 

Contentful.Core.Tests/Contentful.Core.Tests.csproj

@@ -10,6 +10,7 @@
     <None Remove="JsonFiles\CreateScheduledAction.json" />
     <None Remove="JsonFiles\EditorInterfaceWithMetadata.json" />
     <None Remove="JsonFiles\EntriesCollectionWithCrossReference.json" />
+    <None Remove="JsonFiles\EntriesCollectionWithNestedEmbeddedEntry.json" />
     <None Remove="JsonFiles\EntriesCollectionWithRichTextField.json" />
     <None Remove="JsonFiles\EntriesCollectionWithRichTextFieldCalledFields.json" />
     <None Remove="JsonFiles\EntriesCollectionWithRichTextFieldTable.json" />
@@ -31,6 +32,7 @@
   <ItemGroup>
     <EmbeddedResource Include="JsonFiles\ApiKey.json" />
     <EmbeddedResource Include="JsonFiles\CancelScheduledAction.json" />
+    <EmbeddedResource Include="JsonFiles\EntriesCollectionWithNestedEmbeddedEntry.json" />
     <EmbeddedResource Include="JsonFiles\UpdateScheduledAction.json" />
     <EmbeddedResource Include="JsonFiles\GetScheduledAction.json" />
     <EmbeddedResource Include="JsonFiles\CreateScheduledAction.json" />

Contentful.Core.Tests/ContentfulClientTests.cs

@@ -1407,6 +1407,19 @@ public async Task ComplexStructureWithSelfReferenceInArrayIsDeserializedCorrectl
             Assert.Equal(res.First().SubCategories.First().Sys.Id, res.Skip(3).First().Sys.Id);
         }
 
+        [Fact]
+        public async Task ComplexStructureWithEmbeddedReferenceInArrayIsDeserializedCorrectly()
+        {
+            //Arrange
+            _handler.Response = GetResponseFromFile(@"EntriesCollectionWithNestedEmbeddedEntry.json");
+
+            //Act
+            var res = await _client.GetEntries<InlineListReferences>();
+
+            //Assert
+            Assert.Single(res);
+        }
+
         [Fact]
         public async Task SettingEnvironmentShouldYieldCorrectUrlForSingleAsset()
         {