diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs index 2a24c800b5..d9a71a1cc2 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs @@ -9,7 +9,7 @@ using Umbraco.Core.Migrations.Upgrade.V_8_1_0; using Umbraco.Core.Migrations.Upgrade.V_8_6_0; using Umbraco.Core.Migrations.Upgrade.V_8_9_0; using Umbraco.Core.Migrations.Upgrade.V_8_10_0; -using Umbraco.Core.Migrations.Upgrade.V_8_12_0; +using Umbraco.Core.Migrations.Upgrade.V_8_15_0; namespace Umbraco.Core.Migrations.Upgrade { @@ -203,7 +203,7 @@ namespace Umbraco.Core.Migrations.Upgrade // to 8.10.0 To("{D6A8D863-38EC-44FB-91EC-ACD6A668BD18}"); - // to 8.12.0... + // to 8.15.0... To("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}"); To("{4695D0C9-0729-4976-985B-048D503665D8}"); diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs similarity index 90% rename from src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs rename to src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs index 7c793688ec..3eab1a812e 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs @@ -1,7 +1,7 @@ using System.Linq; using Umbraco.Core.Persistence.Dtos; -namespace Umbraco.Core.Migrations.Upgrade.V_8_12_0 +namespace Umbraco.Core.Migrations.Upgrade.V_8_15_0 { public class AddCmsContentNuByteColumn : MigrationBase { diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/UpgradedIncludeIndexes.cs similarity index 98% rename from src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs rename to src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/UpgradedIncludeIndexes.cs index d88abdef75..d51f99fb44 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/UpgradedIncludeIndexes.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Migrations.Expressions.Execute.Expressions; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Dtos; -namespace Umbraco.Core.Migrations.Upgrade.V_8_12_0 +namespace Umbraco.Core.Migrations.Upgrade.V_8_15_0 { public class UpgradedIncludeIndexes : MigrationBase { diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 956ea7602e..514bd8d798 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -139,8 +139,8 @@ - - + + diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 2d6ce89a7b..815db985ce 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -79,8 +79,6 @@ - - 1.8.14 @@ -102,10 +100,7 @@ - - 4.14.5 - - + diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs index 944d93107d..6ae872ef69 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs @@ -28,8 +28,9 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource // TODO: We want to be able to intern the strings for aliases when deserializing like we do for Newtonsoft but I'm unsure exactly how // to do that but it would seem to be with a custom message pack resolver but I haven't quite figured out based on the docs how // to do that since that is part of the int key -> string mapping operation, might have to see the source code to figure that one out. - - // resolver custom types first + // There are docs here on how to build one of these: https://github.com/neuecc/MessagePack-CSharp/blob/master/README.md#low-level-api-imessagepackformattert + // and there are a couple examples if you search on google for them but this will need to be a separate project. + // NOTE: resolver custom types first // new ContentNestedDataResolver(), // finally use standard resolver @@ -121,87 +122,5 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource } } } - - - - //private class ContentNestedDataResolver : IFormatterResolver - //{ - // // GetFormatter's get cost should be minimized so use type cache. - // public IMessagePackFormatter GetFormatter() => FormatterCache.Formatter; - - // private static class FormatterCache - // { - // public static readonly IMessagePackFormatter Formatter; - - // // generic's static constructor should be minimized for reduce type generation size! - // // use outer helper method. - // static FormatterCache() - // { - // Formatter = (IMessagePackFormatter)SampleCustomResolverGetFormatterHelper.GetFormatter(typeof(T)); - // } - // } - //} - - //internal static class SampleCustomResolverGetFormatterHelper - //{ - // // If type is concrete type, use type-formatter map - // static readonly Dictionary _formatterMap = new Dictionary() - // { - // {typeof(ContentNestedData), new ContentNestedDataFormatter()} - // // add more your own custom serializers. - // }; - - // internal static object GetFormatter(Type t) - // { - // object formatter; - // if (_formatterMap.TryGetValue(t, out formatter)) - // { - // return formatter; - // } - - // // If target type is generics, use MakeGenericType. - // if (t.IsGenericParameter && t.GetGenericTypeDefinition() == typeof(ValueTuple<,>)) - // { - // return Activator.CreateInstance(typeof(ValueTupleFormatter<,>).MakeGenericType(t.GenericTypeArguments)); - // } - - // // If type can not get, must return null for fallback mechanism. - // return null; - // } - //} - - //public class ContentNestedDataFormatter : IMessagePackFormatter - //{ - // public void Serialize(ref MessagePackWriter writer, ContentNestedData value, MessagePackSerializerOptions options) - // { - // if (value == null) - // { - // writer.WriteNil(); - // return; - // } - - // writer.WriteArrayHeader(3); - // writer.WriteString(value.UrlSegment); - // writer.WriteString(value.FullName); - // writer.WriteString(value.Age); - - // writer.WriteString(value.FullName); - // } - - // public ContentNestedData Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options) - // { - // if (reader.TryReadNil()) - // { - // return null; - // } - - // options.Security.DepthStep(ref reader); - - // var path = reader.ReadString(); - - // reader.Depth--; - // return new FileInfo(path); - // } - //} } }