Updated package info

Author: Dave de Moel

ContentApi Umb9.yml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Dave de Moel
+Copyright (c) 2021 Dave de Moel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

License.txt

@@ -11,6 +11,7 @@ Out of the box easy to use, full DI support and fast.
 - The Umbraco Content Api 2.0.10 works with Umbraco 8.1.3+
 - The Umbraco Content Api 3.0.0+ works with Umbraco 8.7.0+
 - The Umbraco Content Api 4.0.0+ works with Umbraco 8.14.0+
+- The Umbraco Content Api 9.2.0+ works with Umbraco 9.0.0+
 
 #### Basic Usage:
 1. Download the package from [NuGet](https://www.nuget.org/packages/UmbracoContentApi.Core/)
@@ -20,20 +21,36 @@ Out of the box easy to use, full DI support and fast.
 5. Resolve the content
 
 ```csharp
-public class SampleApiController : UmbracoApiController
+[Route("api/content")]
+    public class ContentApiController : UmbracoApiController
     {
         private readonly Lazy<IContentResolver> _contentResolver;
+        private readonly IPublishedContentQuery _publishedContent;
 
-        public ContentApiController(Lazy<IContentResolver> contentResolver)
+        public ContentApiController(
+            Lazy<IContentResolver> contentResolver, IPublishedContentQuery publishedContent)
         {
             _contentResolver = contentResolver;
+            _publishedContent = publishedContent;
         }
 
-        public IHttpActionResult Get(Guid id)
-        { 
-            IPublishedContent content = Umbraco.Content(id);
-            var model = _contentResolver.Value.ResolveContent(content);
-            return Ok(model);
+        [HttpGet("{id:guid}")]
+        public IActionResult Get(Guid id, int level = 0)
+        {
+            var content = _publishedContent.Content(id);
+            var dictionary = new Dictionary<string, object>
+            {
+                {"addUrl", true}
+            };
+
+            if (level <= 0)
+            {
+                return Ok(_contentResolver.Value.ResolveContent(content, dictionary));
+            }
+
+            dictionary.Add("level", level);
+
+            return Ok(_contentResolver.Value.ResolveContent(content, dictionary));
         }
     }
 ```
@@ -54,20 +71,16 @@ public class SampleConverter : IConverter
         }
     }
 // Composer:
-    [ComposeAfter(typeof(UmbracoContentApi.Core.Composers.ConvertersComposer))]
-    public class ConverterComposer : IUserComposer
-    {
-        public void Compose(Composition composition)
+    public void Compose(IUmbracoBuilder builder)
         {
-            composition.Converters().Append<SampleConverter>();
+            builder.Converters().Append<SampleConverter>();
         }
-    }
 ```
 
 #### Replace an exsisting converter
 To replace a converter just add the following to the composer:
 ```csharp
-composition.Converters()
+builder.Converters()
     .Replace<ConverterToReplace, SampleConverter>();
 ```
 
@@ -87,4 +100,13 @@ Added grid editor converters.
 
 #### 4.0.0
 
-Added support for Umbraco MediaPicker 3
+Added support for Umbraco MediaPicker 3
+
+#### 9.2.0
+
+Added official support for Umbraco 9
+
+Added default BlocklistConverter. 
+The BlockListConverter will use the default converter if no specific converter is specified for the block's element type.
+
+Migrated to Github Actions for package releases.

README.md

@@ -0,0 +1,8 @@
+# Umbraco Content Api
+
+The Umbraco Content Api is a package that enables easy integration of Headless Api functionality into your project.
+The package includes converters for all default Umbraco porperty editors and allows developers to add to and replace them at will.
+
+Out of the box easy to use, full DI support and fast.
+
+Read more on https://github.com/deMD/UmbracoContentApi

src/UmbracoContentApi/UmbracoContentApi.Core/GitVersion.yml

@@ -5,6 +5,12 @@
     <Authors>Dave de Moel</Authors>
     <Company>Dave de Moel</Company>
     <PackageTags>Umbraco; API; Content;</PackageTags>
+    <PackageProjectUrl>https://github.com/deMD/UmbracoContentApi</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageLicenseFile>License.txt</PackageLicenseFile>
+    <Copyright>Copyright (c) 2021 Dave de Moel</Copyright>
+    <Description>The Umbraco Content Api is a package that enables easy integration of Headless Api functionality into your project.</Description>
+    <PackageIcon>UmbracoContentApiLogo.png</PackageIcon>
   </PropertyGroup>
 
 
@@ -15,6 +21,9 @@
 
   <ItemGroup>
     <None Remove="GitVersion.yml" />
+    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="License.txt" Pack="true" PackagePath="\" />
+    <None Include="UmbracoContentApiLogo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -24,4 +33,10 @@
     <PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="..\..\..\License.txt">
+      <Link>License.txt</Link>
+    </Content>
+  </ItemGroup>
+
 </Project>

src/UmbracoContentApi/UmbracoContentApi.Core/README.md

@@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat
 		..\..\.gitattributes = ..\..\.gitattributes
 		..\..\.gitignore = ..\..\.gitignore
 		..\..\ContentApi Umb8.yml = ..\..\ContentApi Umb8.yml
-		..\..\ContentApi Umb9.yml = ..\..\ContentApi Umb9.yml
 		..\..\GitVersion.yml = ..\..\GitVersion.yml
 		..\..\License.txt = ..\..\License.txt
 		..\..\README.md = ..\..\README.md
@@ -34,9 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umbraco 8", "Umbraco 8", "{
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umbraco 9", "Umbraco 9", "{ED25CE6F-82DF-499E-9597-7CEF5238B4E7}"
-	ProjectSection(SolutionItems) = preProject
-		UmbracoContentApi.Core\GitVersion.yml = UmbracoContentApi.Core\GitVersion.yml
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution