Target Umbraco 8.1 with IPublishedContent changes

Author: Stephan

src/SolutionInfo.cs

@@ -32,11 +32,11 @@
 [assembly: AssemblyVersion("8.0.0")]
 
 // ... good to have a build number ...
-[assembly: AssemblyFileVersion("8.0.5")]
+[assembly: AssemblyFileVersion("8.1.0")]
 
 // NuGet Package
 // Note: could not release "1.8.0" because it was depending on pre-release NuGet packages
 //  for Roslyn, so had to release 1.8.0-final... starting with 2.1.3 Roslyn has a released
 //  1.0 version, so now we can release "2.1.3" without the "-final" extension.
-[assembly: AssemblyInformationalVersion("8.0.5")]
+[assembly: AssemblyInformationalVersion("8.1.0")]
 // Do not remove this line.

src/Umbraco.ModelsBuilder.Api/Umbraco.ModelsBuilder.Api.csproj

@@ -54,7 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="UmbracoCms.Web">
-      <Version>8.0.1</Version>
+      <Version>8.1.0-zb.7</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/Umbraco.ModelsBuilder.CustomTool/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="F5C32FC3-6672-4665-803D-6C5D2CAC556A" Version="8.0.5.190617001" Language="en-US" Publisher="ZpqrtBnk" />
+    <Identity Id="F5C32FC3-6672-4665-803D-6C5D2CAC556A" Version="8.1.0.190626003" Language="en-US" Publisher="ZpqrtBnk" />
     <DisplayName>Umbraco ModelsBuilder Custom Tool</DisplayName>
     <Description xml:space="preserve">Umbraco Visual Studio Custom Tool for generating strongly typed IPublishedContent models.</Description>
     <MoreInfo>https://github.com/zpqrtbnk/Zbu.ModelsBuilder</MoreInfo>

src/Umbraco.ModelsBuilder.Tests/BuilderCompilerTests.cs

@@ -0,0 +1,69 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Composing;
+using Umbraco.ModelsBuilder.Building;
+using Umbraco.ModelsBuilder.Configuration;
+
+namespace Umbraco.ModelsBuilder.Tests
+{
+    [TestFixture]
+    public class BuilderCompilerTests
+    {
+        private string _tempDir;
+
+        [SetUp]
+        public void Setup()
+        {
+            _tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            Directory.CreateDirectory(_tempDir);
+
+            Current.Reset();
+            Current.UnlockConfigs();
+            Current.Configs.Add(() => new Config());
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            if (_tempDir != null && Directory.Exists(_tempDir))
+                Directory.Delete(_tempDir, true);
+        }
+
+        [Test]
+        public void CanCompile()
+        {
+            var type1 = new TypeModel
+            {
+                Id = 1,
+                Alias = "type1",
+                ClrName = "Type1",
+                ParentId = 0,
+                BaseType = null,
+                ItemType = TypeModel.ItemTypes.Content,
+            };
+
+            var types = new[] { type1 };
+
+            var code = new Dictionary<string, string>();
+
+            var parseResult = new CodeParser().Parse(code);
+            var builder = new TextBuilder(types, parseResult);
+            var btypes = builder.TypeModels;
+            var btype0 = btypes[0];
+
+            var sb = new StringBuilder();
+            builder.Generate(sb, btype0);
+
+            var text = sb.ToString();
+
+            var compiler = new Compiler();
+            compiler.Compile("Whatever", new Dictionary<string, string> { { "code", text } }, _tempDir);
+            Assert.IsTrue(File.Exists(Path.Combine(_tempDir, "Whatever.dll")));
+        }
+    }
+}

src/Umbraco.ModelsBuilder.Tests/SampleGeneratedCode.cs

@@ -191,9 +191,9 @@ public partial class DebugTextBuilder : PublishedContentModel
 #pragma warning disable 0109 // new is redundant
         public new const string ModelTypeAlias = "debugTextBuilder";
         public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-        public new static PublishedContentType GetModelContentType()
+        public new static IPublishedContentType GetModelContentType()
             => PublishedModelUtility.GetModelContentType(ModelItemType, ModelTypeAlias);
-        public static PublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<DebugTextBuilder, TValue>> selector)
+        public static IPublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<DebugTextBuilder, TValue>> selector)
             => PublishedModelUtility.GetModelPropertyType(GetModelContentType(), selector);
 #pragma warning restore 0109
 

src/Umbraco.ModelsBuilder.Tests/TestElements.cs

@@ -21,7 +21,7 @@ public PublishedProperty(string alias, object sourceValue)
 
             public object SourceValue { get; }
 
-            public PublishedPropertyType PropertyType => throw new NotImplementedException();
+            public IPublishedPropertyType PropertyType => throw new NotImplementedException();
 
             bool IPublishedProperty.HasValue(string culture, string segment) => SourceValue != null;
 
@@ -44,15 +44,17 @@ public class PublishedContent : IPublishedContent
         {
             private readonly PublishedProperty[] _properties;
 
-            public PublishedContent(PublishedContentType contentType, PublishedProperty[] properties)
+            public PublishedContent(IPublishedContentType contentType, PublishedProperty[] properties)
             {
                 ContentType = contentType;
                 _properties = properties;
             }
 
             public IEnumerable<IPublishedContent> Children => throw new NotImplementedException();
 
-            public PublishedContentType ContentType { get; }
+            public IEnumerable<IPublishedContent> ChildrenForAllCultures => throw new NotImplementedException();
+
+            public IPublishedContentType ContentType { get; }
 
             public DateTime CreateDate => throw new NotImplementedException();
 

src/Umbraco.ModelsBuilder.Tests/Umbraco.ModelsBuilder.Tests.csproj

@@ -38,7 +38,7 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="UmbracoCms.Web">
-      <Version>8.0.1</Version>
+      <Version>8.1.0-zb.7</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -47,6 +47,7 @@
     </Compile>
     <Compile Include="ApiTests.cs" />
     <Compile Include="AppDomainTests.cs" />
+    <Compile Include="BuilderCompilerTests.cs" />
     <Compile Include="BuilderTests.cs" />
     <Compile Include="ApiVersionTests.cs" />
     <Compile Include="CompilerTests.cs" />

src/Umbraco.ModelsBuilder/Building/TextBuilder.cs

@@ -203,10 +203,10 @@ private void WriteContentType(StringBuilder sb, TypeModel type)
             sb.AppendFormat("\t\tpublic new const PublishedItemType ModelItemType = PublishedItemType.{0};\n",
                 itemType);
             WriteGeneratedCodeAttribute(sb, "\t\t");
-            sb.Append("\t\tpublic new static PublishedContentType GetModelContentType()\n");
+            sb.Append("\t\tpublic new static IPublishedContentType GetModelContentType()\n");
             sb.Append("\t\t\t=> PublishedModelUtility.GetModelContentType(ModelItemType, ModelTypeAlias);\n");
             WriteGeneratedCodeAttribute(sb, "\t\t");
-            sb.AppendFormat("\t\tpublic static PublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<{0}, TValue>> selector)\n",
+            sb.AppendFormat("\t\tpublic static IPublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<{0}, TValue>> selector)\n",
                 type.ClrName);
             sb.Append("\t\t\t=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(), selector);\n");
             sb.Append("#pragma warning restore 0109\n\n");

src/Umbraco.ModelsBuilder/Umbraco.ModelsBuilder.csproj

@@ -41,7 +41,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
     <PackageReference Include="UmbracoCms.Web">
-      <Version>8.0.1</Version>
+      <Version>8.1.0-zb.7</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs

@@ -24,7 +24,7 @@ public static class PublishedModelUtility
         //    // etc...
         //}
 
-        public static PublishedContentType GetModelContentType(PublishedItemType itemType, string alias)
+        public static IPublishedContentType GetModelContentType(PublishedItemType itemType, string alias)
         {
             var facade = Current.UmbracoContext.PublishedSnapshot; // fixme inject!
             switch (itemType)
@@ -40,7 +40,7 @@ public static PublishedContentType GetModelContentType(PublishedItemType itemTyp
             }
         }
 
-        public static PublishedPropertyType GetModelPropertyType<TModel, TValue>(PublishedContentType contentType, Expression<Func<TModel, TValue>> selector)
+        public static IPublishedPropertyType GetModelPropertyType<TModel, TValue>(IPublishedContentType contentType, Expression<Func<TModel, TValue>> selector)
             //where TModel : PublishedContentModel // fixme PublishedContentModel _or_ PublishedElementModel
         {
             // fixme therefore, missing a check on TModel here