diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index b8a08f4ff9..a05637bbfe 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -16,7 +16,7 @@ umbraco - + @@ -27,19 +27,19 @@ - + - + - - + + - + diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index 4a56a6c9cf..59de33681f 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -16,7 +16,7 @@ umbraco - + diff --git a/src/SQLCE4Umbraco/app.config b/src/SQLCE4Umbraco/app.config index 40ad733a78..5a8a871213 100644 --- a/src/SQLCE4Umbraco/app.config +++ b/src/SQLCE4Umbraco/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/Umbraco.Core/Publishing/ScheduledPublisher.cs b/src/Umbraco.Core/Publishing/ScheduledPublisher.cs index 94df1b88f1..0a6c2f48bb 100644 --- a/src/Umbraco.Core/Publishing/ScheduledPublisher.cs +++ b/src/Umbraco.Core/Publishing/ScheduledPublisher.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Services; @@ -26,6 +27,10 @@ namespace Umbraco.Core.Publishing public int CheckPendingAndProcess() { var counter = 0; + + var contentForRelease = _contentService.GetContentForRelease().ToArray(); + if(contentForRelease.Any()) + LogHelper.Debug(string.Format("There's {0} items of content that need to be published", contentForRelease.Count())); foreach (var d in _contentService.GetContentForRelease()) { try @@ -54,7 +59,11 @@ namespace Umbraco.Core.Publishing throw; } } - foreach (var d in _contentService.GetContentForExpiration()) + + var contentForExpiration = _contentService.GetContentForExpiration().ToArray(); + if(contentForExpiration.Any()) + LogHelper.Debug(string.Format("There's {0} items of content that need to be unpublished", contentForExpiration.Count())); + foreach (var d in contentForExpiration) { try { diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 1703768ed2..b832313582 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -1124,7 +1124,9 @@ namespace Umbraco.Core.Services /// True if unpublishing succeeded, otherwise False public bool UnPublish(IContent content, int userId = 0) { - return ((IContentServiceOperations)this).UnPublish(content, userId).Success; + var attempt = ((IContentServiceOperations) this).UnPublish(content, userId); + LogHelper.Debug(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType)); + return attempt.Success; } /// diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 753812737b..6b4285392d 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -53,13 +53,11 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - - ..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll - True + + ..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll - - ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll - True + + ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll @@ -89,13 +87,11 @@ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll True - - ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll - True + + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/Umbraco.Core/app.config b/src/Umbraco.Core/app.config index 88c667708a..d4cb8d4759 100644 --- a/src/Umbraco.Core/app.config +++ b/src/Umbraco.Core/app.config @@ -4,7 +4,7 @@ - + @@ -35,6 +35,6 @@ - + diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config index 8cfe60d70f..11e49f0398 100644 --- a/src/Umbraco.Core/packages.config +++ b/src/Umbraco.Core/packages.config @@ -2,8 +2,8 @@ - - + + @@ -11,14 +11,14 @@ - - + + - - - - + + + + \ No newline at end of file diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index 8c8e9e14f0..3e324d1a54 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -124,7 +124,7 @@ - + diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 3c153c7aee..1bb38ed8cb 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -58,14 +58,17 @@ ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll + + ..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll + ..\packages\Examine.0.1.82\lib\net45\Examine.dll ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll + + ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll @@ -79,11 +82,11 @@ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - ..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll + + ..\packages\Moq.4.7.8\lib\net45\Moq.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index 9a8570bc2a..833b50746d 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -2,8 +2,9 @@ + - + @@ -16,16 +17,16 @@ - - + + - - - - + + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 79024159fc..332b1c2c78 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -123,9 +123,8 @@ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - False - ..\packages\dotless.1.4.1.0\lib\dotless.Core.dll + + ..\packages\dotless.1.5.2\lib\dotless.Core.dll ..\packages\Examine.0.1.82\lib\net45\Examine.dll @@ -134,16 +133,14 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll - True + + ..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll - - ..\packages\ImageProcessor.Web.4.8.2\lib\net45\ImageProcessor.Web.dll - True + + ..\packages\ImageProcessor.Web.4.8.3\lib\net45\ImageProcessor.Web.dll - - ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll + + ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll False @@ -157,13 +154,11 @@ False ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll - - ..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll - True + + ..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll @@ -198,12 +193,11 @@ False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - False - ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll + + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -212,9 +206,8 @@ System - - ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True + + ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll @@ -246,9 +239,8 @@ False False - - ..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll - True + + ..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll @@ -2380,8 +2372,8 @@ - - + + 11.0 diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index 8804c7aee5..c6311da281 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -3,12 +3,12 @@ - + - - + + - + @@ -19,9 +19,9 @@ - - - + + + @@ -30,12 +30,12 @@ - - + + - - + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config index 4dceddba34..c5b81dca5c 100644 --- a/src/Umbraco.Web.UI/web.Template.Debug.config +++ b/src/Umbraco.Web.UI/web.Template.Debug.config @@ -393,7 +393,7 @@ xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/> - + - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 823d38b14a..86d31ffda7 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -113,9 +113,8 @@ ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll True - - ..\packages\dotless.1.4.1.0\lib\dotless.Core.dll - True + + ..\packages\dotless.1.5.2\lib\dotless.Core.dll ..\packages\Examine.0.1.82\lib\net45\Examine.dll @@ -178,9 +177,8 @@ ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -213,9 +211,8 @@ - - ..\packages\System.Threading.Tasks.Dataflow.4.6.0\lib\netstandard1.1\System.Threading.Tasks.Dataflow.dll - True + + ..\packages\System.Threading.Tasks.Dataflow.4.7.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll diff --git a/src/Umbraco.Web/app.config b/src/Umbraco.Web/app.config index 9a32db0c22..d5ebd969e6 100644 --- a/src/Umbraco.Web/app.config +++ b/src/Umbraco.Web/app.config @@ -41,7 +41,7 @@ - + diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index 7f017d808f..01ce6a3f92 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -2,7 +2,7 @@ - + @@ -24,14 +24,14 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/src/UmbracoExamine/app.config b/src/UmbracoExamine/app.config index 5b7dc6eeea..973ab00741 100644 --- a/src/UmbracoExamine/app.config +++ b/src/UmbracoExamine/app.config @@ -12,7 +12,7 @@ - + diff --git a/src/umbraco.MacroEngines/app.config b/src/umbraco.MacroEngines/app.config index 128e1d599b..67c61337ba 100644 --- a/src/umbraco.MacroEngines/app.config +++ b/src/umbraco.MacroEngines/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/umbraco.MacroEngines/packages.config b/src/umbraco.MacroEngines/packages.config index 7bf40b9075..e125024a28 100644 --- a/src/umbraco.MacroEngines/packages.config +++ b/src/umbraco.MacroEngines/packages.config @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index cec5b99086..33cfdacd2f 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -65,9 +65,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/src/umbraco.businesslogic/app.config b/src/umbraco.businesslogic/app.config index 5b7dc6eeea..973ab00741 100644 --- a/src/umbraco.businesslogic/app.config +++ b/src/umbraco.businesslogic/app.config @@ -12,7 +12,7 @@ - + diff --git a/src/umbraco.cms/app.config b/src/umbraco.cms/app.config index 5b7dc6eeea..973ab00741 100644 --- a/src/umbraco.cms/app.config +++ b/src/umbraco.cms/app.config @@ -12,7 +12,7 @@ - + diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config index de9cf10606..4242d98950 100644 --- a/src/umbraco.cms/packages.config +++ b/src/umbraco.cms/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index f72a876994..921466498c 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -119,9 +119,8 @@ True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll System diff --git a/src/umbraco.controls/app.config b/src/umbraco.controls/app.config index 5b7dc6eeea..973ab00741 100644 --- a/src/umbraco.controls/app.config +++ b/src/umbraco.controls/app.config @@ -12,7 +12,7 @@ - + diff --git a/src/umbraco.datalayer/app.config b/src/umbraco.datalayer/app.config index 88c667708a..d4cb8d4759 100644 --- a/src/umbraco.datalayer/app.config +++ b/src/umbraco.datalayer/app.config @@ -4,7 +4,7 @@ - + @@ -35,6 +35,6 @@ - + diff --git a/src/umbraco.datalayer/packages.config b/src/umbraco.datalayer/packages.config index 3537761ce9..c77c1fb4a2 100644 --- a/src/umbraco.datalayer/packages.config +++ b/src/umbraco.datalayer/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/umbraco.datalayer/umbraco.datalayer.csproj b/src/umbraco.datalayer/umbraco.datalayer.csproj index e8feed4017..ac978cd1c3 100644 --- a/src/umbraco.datalayer/umbraco.datalayer.csproj +++ b/src/umbraco.datalayer/umbraco.datalayer.csproj @@ -72,9 +72,8 @@ ..\packages\Microsoft.ApplicationBlocks.Data.1.0.1559.20655\lib\Microsoft.ApplicationBlocks.Data.dll True - - ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll - True + + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll diff --git a/src/umbraco.editorControls/app.config b/src/umbraco.editorControls/app.config index 7f3dd8a32a..f56b46520c 100644 --- a/src/umbraco.editorControls/app.config +++ b/src/umbraco.editorControls/app.config @@ -16,7 +16,7 @@ - + diff --git a/src/umbraco.providers/app.config b/src/umbraco.providers/app.config index 5b7dc6eeea..973ab00741 100644 --- a/src/umbraco.providers/app.config +++ b/src/umbraco.providers/app.config @@ -12,7 +12,7 @@ - +