From 877e45f1dae604d3748a4280bad928de19489392 Mon Sep 17 00:00:00 2001 From: Uttam Krishna Ukkoji Date: Wed, 7 Apr 2021 13:58:20 +0530 Subject: [PATCH 1/2] Test case for embedded object --- Contentstack.Core.Tests/QueryTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Contentstack.Core.Tests/QueryTest.cs b/Contentstack.Core.Tests/QueryTest.cs index 6ff70ce..0c73fe8 100644 --- a/Contentstack.Core.Tests/QueryTest.cs +++ b/Contentstack.Core.Tests/QueryTest.cs @@ -1177,11 +1177,10 @@ public async Task Limit() } } - [Fact] public async Task IncludeEmbeddedItems() { - ContentType contenttype = client.ContentType("rte_embed"); + ContentType contenttype = client.ContentType(source); Query query = contenttype.Query(); query.includeEmbeddedItems(); var result = await query.Find(); From 88efc3c3c278b053f1dcfa324bcb2dce7febca66 Mon Sep 17 00:00:00 2001 From: Uttam Krishna Ukkoji Date: Fri, 9 Apr 2021 10:05:06 +0530 Subject: [PATCH 2/2] Asset class implements IEmbeddedObject --- .../Contentstack.AspNetCore.csproj | 2 +- .../Contentstack.Core.Tests.csproj | 2 +- Contentstack.Core.Tests/QueryTest.cs | 2 +- Contentstack.Core/Contentstack.Core.csproj | 13 +++++++----- Contentstack.Core/LICENSE.txt | 21 +++++++++++++++++++ Contentstack.Net.sln | 2 +- LICENSE | 2 +- 7 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 Contentstack.Core/LICENSE.txt diff --git a/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj b/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj index fc78f9b..e5b1e6f 100644 --- a/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj +++ b/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj @@ -12,7 +12,7 @@ Copyright (c) 2012-2020 Contentstack (http://app.contentstack.com). All Rights Reserved https://github.com/contentstack/contentstack-dotnet v2.5.0 - 2.6.0 + 2.6.1 diff --git a/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj b/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj index acbceb2..f43a5b7 100644 --- a/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj +++ b/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp2.1 false - 2.6.0 + 2.6.1 diff --git a/Contentstack.Core.Tests/QueryTest.cs b/Contentstack.Core.Tests/QueryTest.cs index 0c73fe8..a7906f6 100644 --- a/Contentstack.Core.Tests/QueryTest.cs +++ b/Contentstack.Core.Tests/QueryTest.cs @@ -1183,7 +1183,7 @@ public async Task IncludeEmbeddedItems() ContentType contenttype = client.ContentType(source); Query query = contenttype.Query(); query.includeEmbeddedItems(); - var result = await query.Find(); + var result = await query.Find(); if (result == null && result.Items.Count() == 0) { Assert.False(true, "Query.Exec is not match with expected result."); diff --git a/Contentstack.Core/Contentstack.Core.csproj b/Contentstack.Core/Contentstack.Core.csproj index b679261..44ea748 100644 --- a/Contentstack.Core/Contentstack.Core.csproj +++ b/Contentstack.Core/Contentstack.Core.csproj @@ -5,15 +5,15 @@ contentstack.csharp Contentstack .NET SDK for the Contentstack Content Delivery API. - 2.6.0 + 2.6.1 Contentstack Embedded Objects fearure added - Copyright © 2012-2020 Contentstack. All Rights Reserved + Copyright © 2012-2021 Contentstack. All Rights Reserved true - v2.6.0 + v2.6.1 https://github.com/contentstack/contentstack-dotnet - https://github.com/contentstack/contentstack-dotnet/blob/master/LICENSE - 2.6.0 + LICENSE.txt + 2.6.1 @@ -31,6 +31,9 @@ + + + diff --git a/Contentstack.Core/LICENSE.txt b/Contentstack.Core/LICENSE.txt new file mode 100644 index 0000000..e625c85 --- /dev/null +++ b/Contentstack.Core/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2012-2021 Contentstack (http://app.contentstack.com). All Rights Reserved + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Contentstack.Net.sln b/Contentstack.Net.sln index 68df4db..86383c9 100644 --- a/Contentstack.Net.sln +++ b/Contentstack.Net.sln @@ -132,6 +132,6 @@ Global $0.XmlFormattingPolicy = $9 $9.scope = application/xml $0.StandardHeader = $10 - version = 2.6.0 + version = 2.6.1 EndGlobalSection EndGlobal diff --git a/LICENSE b/LICENSE index d276026..e625c85 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2012-2020 Contentstack (http://app.contentstack.com). All Rights Reserved +Copyright (c) 2012-2021 Contentstack (http://app.contentstack.com). All Rights Reserved Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal