Merge branch 'develop'

azabluda · May 21, 2017 · 07af055 · 07af055
2 parents 4792042 + 2f12a53
commit 07af055
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 | branch | package | AppVeyor |
 | --- | --- | --- |
-| `master` | [![NuGet](https://img.shields.io/nuget/v/InfoCarrier.Core.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/InfoCarrier.Core/) | - |
+| `master` | [![NuGet](https://img.shields.io/nuget/v/InfoCarrier.Core.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/InfoCarrier.Core/) | [![Build status](https://ci.appveyor.com/api/projects/status/7jd134yd7m2w035h/branch/master?svg=true)](https://ci.appveyor.com/project/azabluda/infocarrier-core/branch/master) |
 | `develop` | - | [![Build status](https://ci.appveyor.com/api/projects/status/7jd134yd7m2w035h/branch/develop?svg=true)](https://ci.appveyor.com/project/azabluda/infocarrier-core/branch/develop) |
 
 

diff --git a/src/InfoCarrier.Core/InfoCarrier.Core.csproj b/src/InfoCarrier.Core/InfoCarrier.Core.csproj
@@ -25,9 +25,8 @@
     <Compile Include="obj\GitVersionTaskAssemblyInfo.g.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="aqua-core" Version="4.0.0-alpha-059" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.0" />
-    <PackageReference Include="Remote.Linq" Version="5.4.0-alpha-027" />
+    <PackageReference Include="Remote.Linq" Version="5.4.0-beta-003" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/InfoCarrier.Core/Server/QueryDataHelper.cs b/src/InfoCarrier.Core/Server/QueryDataHelper.cs
@@ -216,7 +216,11 @@ private DynamicObject MapGrouping<TKey, TElement>(IGrouping<TKey, TElement> grou
             {
                 var mappedGrouping = new DynamicObject(typeof(IGrouping<TKey, TElement>));
                 mappedGrouping.Add("Key", this.MapToDynamicObjectGraph(grouping.Key, setTypeInformation));
-                mappedGrouping.Add("Elements", this.MapCollection(grouping, setTypeInformation).ToList());
+                mappedGrouping.Add(
+                    "Elements",
+                    new DynamicObject(
+                        this.MapCollection(grouping, setTypeInformation).ToList(),
+                        this));
                 return mappedGrouping;
             }
         }

diff --git a/test/InfoCarrier.Core.FunctionalTests/InfoCarrier.Core.FunctionalTests.csproj b/test/InfoCarrier.Core.FunctionalTests/InfoCarrier.Core.FunctionalTests.csproj
@@ -4,12 +4,11 @@
     <CodeAnalysisRuleSet>..\..\Style.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="aqua-core" Version="4.0.0-alpha-059" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="1.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Remote.Linq" Version="5.4.0-alpha-027" />
-    <PackageReference Include="Remote.Linq.Newtonsoft.Json" Version="5.4.0-alpha-027" />
+    <PackageReference Include="Remote.Linq" Version="5.4.0-beta-003" />
+    <PackageReference Include="Remote.Linq.Newtonsoft.Json" Version="5.4.0-beta-003" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>