Merge branch temp8 into temp8-U4-11227

2018-05-02 13:43:12 +02:00
parent d56af5872d 8f11edc17a
commit a5f1ad6da1
374 changed files with 1429 additions and 19330 deletions
--- a/src/Umbraco.Tests/Models/MacroTests.cs
+++ b/src/Umbraco.Tests/Models/MacroTests.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Tests.Models
        [Test]
        public void Can_Deep_Clone()
        {
-            var macro = new Macro(1, Guid.NewGuid(), true, 3, "test", "Test", "blah", "blah", "xslt", false, true, true, "script");
+            var macro = new Macro(1, Guid.NewGuid(), true, 3, "test", "Test", false, true, true, "~/script.cshtml", MacroTypes.PartialView);
            macro.Properties.Add(new MacroProperty(6, Guid.NewGuid(), "rewq", "REWQ", 1, "asdfasdf"));

            var clone = (Macro)macro.DeepClone();