Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js

src/Umbraco.PublishedCache.NuCache/DataSource/ContentNestedData.cs

@@ -9,15 +9,28 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
     /// </summary>
     internal class ContentNestedData
     {
-        [JsonProperty("properties")]
+        //dont serialize empty properties
+        [JsonProperty("pd")]
         [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<PropertyData[]>))]
         public Dictionary<string, PropertyData[]> PropertyData { get; set; }
 
-        [JsonProperty("cultureData")]
+        [JsonProperty("cd")]
         [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<CultureVariation>))]
         public Dictionary<string, CultureVariation> CultureData { get; set; }
 
-        [JsonProperty("urlSegment")]
+        [JsonProperty("us")]
         public string UrlSegment { get; set; }
+
+        //Legacy properties used to deserialize existing nucache db entries
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<PropertyData[]>))]
+        private Dictionary<string, PropertyData[]> LegacyPropertyData { set { PropertyData = value; } }
+
+        [JsonProperty("cultureData")]
+        [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<CultureVariation>))]
+        private Dictionary<string, CultureVariation> LegacyCultureData { set { CultureData = value; } }
+
+        [JsonProperty("urlSegment")]
+        private string LegacyUrlSegment { set { UrlSegment = value; } }
     }
 }

src/Umbraco.PublishedCache.NuCache/DataSource/CultureVariation.cs

@@ -8,16 +8,29 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
     /// </summary>
     public class CultureVariation
     {
-        [JsonProperty("name")]
+        [JsonProperty("nm")]
         public string Name { get; set; }
 
-        [JsonProperty("urlSegment")]
+        [JsonProperty("us")]
         public string UrlSegment { get; set; }
 
-        [JsonProperty("date")]
+        [JsonProperty("dt")]
         public DateTime Date { get; set; }
 
-        [JsonProperty("isDraft")]
+        [JsonProperty("isd")]
         public bool IsDraft { get; set; }
+
+        //Legacy properties used to deserialize existing nucache db entries
+        [JsonProperty("name")]
+        private string LegacyName { set { Name = value; } }
+
+        [JsonProperty("urlSegment")]
+        private string LegacyUrlSegment { set { UrlSegment = value; } }
+
+        [JsonProperty("date")]
+        private DateTime LegacyDate { set { Date = value; } }
+
+        [JsonProperty("isDraft")]
+        private bool LegacyIsDraft { set { IsDraft = value; } }
     }
 }

src/Umbraco.PublishedCache.NuCache/DataSource/PropertyData.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using Newtonsoft.Json;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
@@ -8,21 +9,43 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         private string _culture;
         private string _segment;
 
-        [JsonProperty("culture")]
+        [DefaultValue("")]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate, PropertyName = "c")]
         public string Culture
         {
             get => _culture;
             set => _culture = value ?? throw new ArgumentNullException(nameof(value)); // TODO: or fallback to string.Empty? CANNOT be null
         }
 
-        [JsonProperty("seg")]
+        [DefaultValue("")]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate, PropertyName = "s")]
         public string Segment
         {
             get => _segment;
             set => _segment = value ?? throw new ArgumentNullException(nameof(value)); // TODO: or fallback to string.Empty? CANNOT be null
         }
 
-        [JsonProperty("val")]
+        [JsonProperty("v")]
         public object Value { get; set; }
+
+
+        //Legacy properties used to deserialize existing nucache db entries
+        [JsonProperty("culture")]
+        private string LegacyCulture
+        {
+            set => Culture = value;
+        }
+
+        [JsonProperty("seg")]
+        private string LegacySegment
+        {
+            set => Segment = value;
+        }
+
+        [JsonProperty("val")]
+        private object LegacyValue
+        {
+            set => Value = value;
+        }
     }
 }