From ed8cc2ad0dc521cc0ac2f74a41dfa3e4b1799209 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 12 Nov 2014 12:40:24 +0100 Subject: [PATCH 1/2] Also fixes U4-5592 and U4-5746 for 7.1.9 --- build/NuSpecs/UmbracoCms.Core.nuspec | 4 ++-- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 11 +++++++---- src/Umbraco.Web.UI/packages.config | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 54c6cf2dc5..a97a9eaa4a 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -33,8 +33,8 @@ - - + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index a9f9c43144..4a948b43d0 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -132,9 +132,9 @@ False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - + False - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll True @@ -199,6 +199,7 @@ ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + True False @@ -223,9 +224,11 @@ ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + True True @@ -2530,9 +2533,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" True True - 7180 + 7190 / - http://localhost:7180 + http://localhost:7190 False False diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index 543b58d3c0..25eee32251 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -5,7 +5,7 @@ - + From 4eb0981552cebe50408fb87c629d6145dbb8e7b0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 12 Nov 2014 14:28:13 +0100 Subject: [PATCH 2/2] Bump version --- build/UmbracoVersion.txt | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index 0e5aa899e0..cdf5fdc526 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1 +1 @@ -7.1.8 \ No newline at end of file +7.1.9 \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index a1ff481ecb..85a1c0272e 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("7.1.8"); + private static readonly Version Version = new Version("7.1.9"); /// /// Gets the current version of Umbraco.