From 2b0cf782babc1c61802d9e7bfd8885cdb261fd5d Mon Sep 17 00:00:00 2001 From: Alexander Zabluda Date: Wed, 10 May 2017 13:05:08 +0200 Subject: [PATCH 1/4] AppVeyor badge for 'master' branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 329d132..7568936 100644 --- 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) | From 3f548ff112dbb13834813a66a66d84ea40f4491d Mon Sep 17 00:00:00 2001 From: Alexander Zabluda Date: Mon, 15 May 2017 13:48:17 +0200 Subject: [PATCH 2/4] Map elements of IGrouping as DynamicObject For some obscure reason my previous solution doesn't seem to work anymore with EntityFrameworkCore-1.1.2 --- src/InfoCarrier.Core/Server/QueryDataHelper.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/InfoCarrier.Core/Server/QueryDataHelper.cs b/src/InfoCarrier.Core/Server/QueryDataHelper.cs index 09c0023..30551a3 100644 --- a/src/InfoCarrier.Core/Server/QueryDataHelper.cs +++ b/src/InfoCarrier.Core/Server/QueryDataHelper.cs @@ -216,7 +216,10 @@ private DynamicObject MapGrouping(IGrouping grou { var mappedGrouping = new DynamicObject(typeof(IGrouping)); 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; } } From bd043fcbb9e60e141885cbe89f852f7351b73959 Mon Sep 17 00:00:00 2001 From: Alexander Zabluda Date: Tue, 16 May 2017 17:17:26 +0200 Subject: [PATCH 3/4] Code style --- src/InfoCarrier.Core/Server/QueryDataHelper.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/InfoCarrier.Core/Server/QueryDataHelper.cs b/src/InfoCarrier.Core/Server/QueryDataHelper.cs index 30551a3..d17923e 100644 --- a/src/InfoCarrier.Core/Server/QueryDataHelper.cs +++ b/src/InfoCarrier.Core/Server/QueryDataHelper.cs @@ -216,7 +216,8 @@ private DynamicObject MapGrouping(IGrouping grou { var mappedGrouping = new DynamicObject(typeof(IGrouping)); mappedGrouping.Add("Key", this.MapToDynamicObjectGraph(grouping.Key, setTypeInformation)); - mappedGrouping.Add("Elements", + mappedGrouping.Add( + "Elements", new DynamicObject( this.MapCollection(grouping, setTypeInformation).ToList(), this)); From 2f12a53958c57951c7d0d3248504d7fc7b2850d2 Mon Sep 17 00:00:00 2001 From: Alexander Zabluda Date: Sun, 21 May 2017 17:03:02 +0200 Subject: [PATCH 4/4] Remote.Linq-5.4.0-beta-003 This fixes issues with AsQueryable() in functional tests like 'Method_with_constant_queryable_arg' of EFC-1.1.2 https://github.com/6bee/Remote.Linq/issues/22 --- src/InfoCarrier.Core/InfoCarrier.Core.csproj | 3 +-- .../InfoCarrier.Core.FunctionalTests.csproj | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/InfoCarrier.Core/InfoCarrier.Core.csproj b/src/InfoCarrier.Core/InfoCarrier.Core.csproj index 19098ce..658c74c 100644 --- a/src/InfoCarrier.Core/InfoCarrier.Core.csproj +++ b/src/InfoCarrier.Core/InfoCarrier.Core.csproj @@ -25,9 +25,8 @@ - - + all diff --git a/test/InfoCarrier.Core.FunctionalTests/InfoCarrier.Core.FunctionalTests.csproj b/test/InfoCarrier.Core.FunctionalTests/InfoCarrier.Core.FunctionalTests.csproj index 98397d4..563d0ef 100644 --- a/test/InfoCarrier.Core.FunctionalTests/InfoCarrier.Core.FunctionalTests.csproj +++ b/test/InfoCarrier.Core.FunctionalTests/InfoCarrier.Core.FunctionalTests.csproj @@ -4,12 +4,11 @@ ..\..\Style.ruleset - - - + + all