Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs

build/NuSpecs/tools/install.ps1

@@ -118,6 +118,31 @@ if ($project) {
 		{
 			# Not a big problem if this fails, let it go
 		}
+		
+		Try 
+		{
+			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+
+			$uiXml = New-Object System.Xml.XmlDocument
+			$uiXml.PreserveWhitespace = $true
+
+			$uiXml.Load($uiXmlFile)
+			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
+
+			if($createExists.Count -eq 0) 
+			{    
+				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
+
+				#Creating: <create assembly="umbraco" type="macroTasks" />
+				$createNode = $uiXml.CreateElement("create")
+				$createNode.SetAttribute("assembly", "umbraco")
+				$createNode.SetAttribute("type", "macroTasks")
+				$macrosTasksNode.AppendChild($createNode)
+				$uiXml.Save($uiXmlFile)
+			}
+		} 
+		Catch { }
 	}
 	
 	$installFolder = Join-Path $projectPath "Install"

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.8.0")]
-[assembly: AssemblyInformationalVersion("7.8.0")]
+[assembly: AssemblyFileVersion("7.8.1")]
+[assembly: AssemblyInformationalVersion("7.8.1")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.8.0");
+        private static readonly Version Version = new Version("7.8.1");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/ObjectExtensions.cs

@@ -143,6 +143,7 @@ namespace Umbraco.Core
                         var inputString = input as string;
                         if (inputString != null)
                         {
+                            //TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
                             if (string.IsNullOrEmpty(inputString) && (underlying == typeof(DateTime) || underlying == typeof(bool)))
                             {
                                 return Attempt<object>.Succeed(null);
@@ -208,6 +209,14 @@ namespace Umbraco.Core
                     return Attempt.Succeed(outputConverter.ConvertFrom(input));
                 }
 
+                if (target.IsGenericType && GetCachedGenericNullableType(target) != null)
+                {
+                    // cannot Convert.ChangeType as that does not work with nullable
+                    // input has already been converted to the underlying type - just
+                    // return input, there's an implicit conversion from T to T? anyways
+                    return Attempt.Succeed(input);
+                }
+
                 // Re-check convertables since we altered the input through recursion
                 var convertible2 = input as IConvertible;
                 if (convertible2 != null)
@@ -745,9 +754,9 @@ namespace Umbraco.Core
             if (AssignableTypeCache.TryGetValue(key, out canConvert))
             {
                 return canConvert;
-            }
-
-            // "object is" is faster than "Type.IsAssignableFrom.
+            }
+
+            // "object is" is faster than "Type.IsAssignableFrom.
             // We can use it to very quickly determine whether true/false
             if (input is IConvertible && target.IsAssignableFrom(source))
             {

src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Xml.Linq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models;
@@ -176,6 +176,12 @@ namespace Umbraco.Core.PropertyEditors
         /// <returns></returns>
         internal Attempt<object> TryConvertValueToCrlType(object value)
         {
+            var jv = value as JValue;
+            if (jv != null)
+            {
+                value = value.ToString();
+            }
+
             //this is a custom check to avoid any errors, if it's a string and it's empty just make it null
             var s = value as string;
             if (s != null)
@@ -391,4 +397,4 @@ namespace Umbraco.Core.PropertyEditors
             }
         }
     }
-}
+}

src/Umbraco.Tests/ObjectExtensionsTests.cs

@@ -6,6 +6,10 @@ using System.Threading;
 using System.Web.UI.WebControls;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Strings;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests
 {
@@ -155,7 +159,7 @@ namespace Umbraco.Tests
 			Assert.AreEqual("Hello world", result.Result);
 		}
 
-		        [Test]
+		[Test]
         public virtual void CanConvertObjectToSameObject()
         {
             var obj = new MyTestObject();
@@ -164,7 +168,142 @@ namespace Umbraco.Tests
             Assert.AreEqual(obj, result.Result);
         }
 
-		private CultureInfo savedCulture;
+        [Test]
+        public void ConvertToIntegerTest()
+        {
+            var conv = "100".TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+
+            conv = "100.000".TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+
+            conv = "100,000".TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+
+            // oops
+            conv = "100.001".TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+
+            conv = 100m.TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+
+            conv = 100.000m.TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+
+            // oops
+            conv = 100.001m.TryConvertTo<int>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100, conv.Result);
+        }
+
+        [Test]
+        public void ConvertToDecimalTest()
+        {
+            var conv = "100".TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = "100.000".TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = "100,000".TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = "100.001".TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100.001m, conv.Result);
+
+            conv = 100m.TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = 100.000m.TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = 100.001m.TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100.001m, conv.Result);
+
+            conv = 100.TryConvertTo<decimal>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+        }
+
+        [Test]
+        public void ConvertToNullableDecimalTest()
+        {
+            var conv = "100".TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = "100.000".TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = "100,000".TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = "100.001".TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100.001m, conv.Result);
+
+            conv = 100m.TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = 100.000m.TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+
+            conv = 100.001m.TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100.001m, conv.Result);
+
+            conv = 100.TryConvertTo<decimal?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(100m, conv.Result);
+        }
+
+        [Test]
+        public void ConvertToDateTimeTest()
+        {
+            var conv = "2016-06-07".TryConvertTo<DateTime?>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
+        }
+
+        [Test]
+        public void ConvertToNullableDateTimeTest()
+        {
+            var conv = "2016-06-07".TryConvertTo<DateTime>();
+            Assert.IsTrue(conv);
+            Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
+        }
+
+        [Test]
+        public void Value_Editor_Can_Convert_Decimal_To_Decimal_Clr_Type()
+        {
+            var valueEditor = new PropertyValueEditor
+            {
+                ValueType = PropertyEditorValueTypes.Decimal
+            };
+
+            var result = valueEditor.TryConvertValueToCrlType(12.34d);
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(12.34d, result.Result);
+        }
+
+        private CultureInfo _savedCulture;
 
 	    /// <summary>
 		/// Run once before each test in derived test fixtures.
@@ -172,10 +311,13 @@ namespace Umbraco.Tests
         [SetUp]
 		public void TestSetup()
 		{
-			savedCulture = Thread.CurrentThread.CurrentCulture;
+			_savedCulture = Thread.CurrentThread.CurrentCulture;
 			Thread.CurrentThread.CurrentCulture = new CultureInfo("en-GB"); // make sure the dates parse correctly
-			return;
-		}
+
+		    var settings = SettingsForTests.GetDefault();
+		    ShortStringHelperResolver.Current = new ShortStringHelperResolver(new DefaultShortStringHelper(settings).WithDefaultConfig());
+		    Resolution.Freeze();
+        }
 
 		/// <summary>
 		/// Run once after each test in derived test fixtures.
@@ -183,9 +325,9 @@ namespace Umbraco.Tests
 	    [TearDown]
 		public void TestTearDown()
 		{
-			Thread.CurrentThread.CurrentCulture = savedCulture;
-			return;
-		}
+			Thread.CurrentThread.CurrentCulture = _savedCulture;
+		    ShortStringHelperResolver.Reset();
+        }
 
         private class MyTestObject
         {
@@ -195,4 +337,4 @@ namespace Umbraco.Tests
             }
         }
 	}
-}
+}

src/Umbraco.Tests/TryConvertToTests.cs

@@ -1,105 +0,0 @@
-using System;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Core.ObjectResolution;
-using Umbraco.Core.Strings;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests
-{
-    [TestFixture]
-    public class TryConvertToTests
-    {
-        [SetUp]
-        public void SetUp()
-        {
-            var settings = SettingsForTests.GetDefault();
-            ShortStringHelperResolver.Current = new ShortStringHelperResolver(new DefaultShortStringHelper(settings).WithDefaultConfig());
-            Resolution.Freeze();
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            ShortStringHelperResolver.Reset();
-        }
-
-        [Test]
-        public void ConvertToIntegerTest()
-        {
-            var conv = "100".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = "100.000".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = "100,000".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            // oops
-            conv = "100.001".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = 100m.TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = 100.000m.TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            // oops
-            conv = 100.001m.TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-        }
-
-        [Test]
-        public void ConvertToDecimalTest()
-        {
-            var conv = "100".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100.000".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100,000".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100.001".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
-
-            conv = 100m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = 100.000m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = 100.001m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
-
-            conv = 100.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-        }
-
-        [Test]
-        public void ConvertToDateTimeTest()
-        {
-            var conv = "2016-06-07".TryConvertTo<DateTime>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
-        }
-    }
-}

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -232,7 +232,6 @@
     <Compile Include="Services\CachedDataTypeServiceTests.cs" />
     <Compile Include="TestHelpers\Entities\MockedPropertyTypes.cs" />
     <Compile Include="TestHelpers\Entities\MockedUserGroup.cs" />
-    <Compile Include="TryConvertToTests.cs" />
     <Compile Include="UdiTests.cs" />
     <Compile Include="UmbracoExamine\RandomIdRAMDirectory.cs" />
     <Compile Include="UmbracoExamine\UmbracoContentIndexerTests.cs" />

src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js

@@ -149,8 +149,17 @@
 
             function setPublishDate(date) {
 
+                if (!date) {
+                    return;
+                }
+
+                //The date being passed in here is the user's local date/time that they have selected
+                //we need to convert this date back to the server date on the model.
+
+                var serverTime = dateHelper.convertToServerStringTime(moment(date), Umbraco.Sys.ServerVariables.application.serverTimeOffset);
+
                 // update publish value
-                scope.node.releaseDate = date;
+                scope.node.releaseDate = serverTime;
 
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();
@@ -174,8 +183,17 @@
 
             function setUnpublishDate(date) {
 
+                if (!date) {
+                    return;
+                }
+
+                //The date being passed in here is the user's local date/time that they have selected
+                //we need to convert this date back to the server date on the model.
+
+                var serverTime = dateHelper.convertToServerStringTime(moment(date), Umbraco.Sys.ServerVariables.application.serverTimeOffset);
+
                 // update publish value
-                scope.node.removeDate = date;
+                scope.node.removeDate = serverTime;
 
                 // make sure dates are formatted to the user's locale
                 formatDatesToLocal();

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -1024,12 +1024,15 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>7810</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:7810</IISUrl>
           <DevelopmentServerPort>7800</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:7800</IISUrl>
-          <DevelopmentServerPort>7800</DevelopmentServerPort>
+          <DevelopmentServerPort>7711</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7800</IISUrl>
+          <IISUrl>http://localhost:7711</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>