Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/2.6.1 #11

Merged
merged 2 commits into from
Apr 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Contentstack.AspNetCore/Contentstack.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Copyright>Copyright (c) 2012-2020 Contentstack (http://app.contentstack.com). All Rights Reserved</Copyright>
<PackageProjectUrl>https://github.com/contentstack/contentstack-dotnet</PackageProjectUrl>
<PackageTags>v2.5.0</PackageTags>
<ReleaseVersion>2.6.0</ReleaseVersion>
<ReleaseVersion>2.6.1</ReleaseVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand Down
2 changes: 1 addition & 1 deletion Contentstack.Core.Tests/Contentstack.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.1</TargetFramework>

<IsPackable>false</IsPackable>
<ReleaseVersion>2.6.0</ReleaseVersion>
<ReleaseVersion>2.6.1</ReleaseVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions Contentstack.Core.Tests/QueryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1177,14 +1177,13 @@ 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<SourceModelIncludeRef>();
var result = await query.Find<SourceModel>();
if (result == null && result.Items.Count() == 0)
{
Assert.False(true, "Query.Exec is not match with expected result.");
Expand Down
13 changes: 8 additions & 5 deletions Contentstack.Core/Contentstack.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<PackageId>contentstack.csharp</PackageId>
<Authors>Contentstack</Authors>
<Description>.NET SDK for the Contentstack Content Delivery API.</Description>
<PackageVersion>2.6.0</PackageVersion>
<PackageVersion>2.6.1</PackageVersion>
<Owners>Contentstack</Owners>
<PackageReleaseNotes>Embedded Objects fearure added</PackageReleaseNotes>
<Copyright>Copyright © 2012-2020 Contentstack. All Rights Reserved</Copyright>
<Copyright>Copyright © 2012-2021 Contentstack. All Rights Reserved</Copyright>
<PackOnBuild>true</PackOnBuild>
<PackageTags>v2.6.0</PackageTags>
<PackageTags>v2.6.1</PackageTags>
<PackageProjectUrl>https://github.com/contentstack/contentstack-dotnet</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/contentstack/contentstack-dotnet/blob/master/LICENSE</PackageLicenseUrl>
<ReleaseVersion>2.6.0</ReleaseVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<ReleaseVersion>2.6.1</ReleaseVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -31,6 +31,9 @@
<PackageReference Include="Markdig" Version="0.22.0" />
<PackageReference Include="contentstack.utils" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<None Include="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Internals\" />
<Folder Include="Models\" />
Expand Down
21 changes: 21 additions & 0 deletions Contentstack.Core/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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.
20 changes: 15 additions & 5 deletions Contentstack.Core/Models/Asset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Threading.Tasks;
using Contentstack.Core.Configuration;
using Contentstack.Core.Internals;
using Contentstack.Utils.Interfaces;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

Expand All @@ -14,7 +15,7 @@ namespace Contentstack.Core.Models
/// <summary>
/// Assets refer to all the media files (images, videos, PDFs, audio files, and so on) uploaded in your Contentstack repository for future use
/// </summary>
public class Asset
public class Asset : IEmbeddedObject
{
#region Internal & Private Properties
private Dictionary<string, object> _ObjectAttributes = new Dictionary<string, object>();
Expand Down Expand Up @@ -90,10 +91,16 @@ public string Url
}

/// <summary>
/// This is Entry Uid of an entry.
/// This is Asset Uid of an Asset.
/// </summary>
public string Uid { get; set; }

/// <summary>
/// This is Asset type uid.
/// </summary>
[JsonProperty(propertyName: "_content_type_uid")]
public string ContentTypeUid { get; set; }

/// <summary>
/// The size of the file in bytes.
/// </summary>
Expand All @@ -103,15 +110,18 @@ public string Url
/// <summary>
/// The original name of the file.
/// </summary>
public string FileName { get; set; }
public string FileName { get; set; }

/// <summary>
/// This is Asset description.
/// </summary>
public string Description { get; set; }

/// <summary>
/// Set array of Tags
/// </summary>
public Object[] Tags { get; set; }
public Object[] Tags { get; set; }

#region Internal Constructors
internal Asset(ContentstackClient stack, string uid)
{
Expand Down
2 changes: 1 addition & 1 deletion Contentstack.Net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down