From d725f1362f63b01ed1af3fb3510e79d7efa0124b Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 16 Sep 2016 21:23:31 +0200 Subject: [PATCH 1/6] U4-8984 Upgrade AutoMapper to latest 3.x --- src/Umbraco.Core/Umbraco.Core.csproj | 9 +++++---- src/Umbraco.Core/UmbracoApplicationBase.cs | 19 +++++++++++++++++++ src/Umbraco.Core/packages.config | 2 +- src/Umbraco.Tests/Umbraco.Tests.csproj | 9 +++++---- src/Umbraco.Tests/packages.config | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 9 +++++---- src/Umbraco.Web.UI/packages.config | 2 +- src/Umbraco.Web.UI/web.Template.config | 5 +++++ src/Umbraco.Web/Umbraco.Web.csproj | 11 +++++------ src/Umbraco.Web/packages.config | 2 +- src/umbraco.businesslogic/packages.config | 2 +- .../umbraco.businesslogic.csproj | 9 +++++---- 12 files changed, 54 insertions(+), 27 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index e6e91549fa..3dd960db06 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -37,12 +37,12 @@ false - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll True - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll True @@ -1452,6 +1452,7 @@ + + \ No newline at end of file diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index d485791d8c..fc20d98a80 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/umbraco.businesslogic/packages.config b/src/umbraco.businesslogic/packages.config index 4a0a1d249b..65ef682839 100644 --- a/src/umbraco.businesslogic/packages.config +++ b/src/umbraco.businesslogic/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/umbraco.businesslogic/umbraco.businesslogic.csproj b/src/umbraco.businesslogic/umbraco.businesslogic.csproj index e134c33eab..1483523caf 100644 --- a/src/umbraco.businesslogic/umbraco.businesslogic.csproj +++ b/src/umbraco.businesslogic/umbraco.businesslogic.csproj @@ -106,12 +106,12 @@ false - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll True - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll True @@ -295,4 +295,5 @@ + \ No newline at end of file From c9106065fda4ff535e6bf8f7f3a80bf926b5264f Mon Sep 17 00:00:00 2001 From: Claus Date: Tue, 20 Sep 2016 09:12:44 +0200 Subject: [PATCH 2/6] config transform for nuget upgrade. --- build/NuSpecs/tools/Web.config.install.xdt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt index 987db6c3d6..0f7280a7f0 100644 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ b/build/NuSpecs/tools/Web.config.install.xdt @@ -319,6 +319,7 @@ + @@ -338,6 +339,10 @@ + + + + From 0cc88a17067e40f07f609acfd419dceb790bb849 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 26 Sep 2016 20:03:14 +0200 Subject: [PATCH 3/6] Bugfix in Initialize method of UmbracoMediaFile GetExtension returns an empty string instead of null which causes the substring to return an argumentoutofrange exception. Discovered this when trying to use Save(HttpPostedFile file) and Save(HttpPostedFileBase file), but since the temporary generated path didn't include an extension, these methods always threw an exception --- src/Umbraco.Core/IO/UmbracoMediaFile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/IO/UmbracoMediaFile.cs b/src/Umbraco.Core/IO/UmbracoMediaFile.cs index d708fcb804..f7076be234 100644 --- a/src/Umbraco.Core/IO/UmbracoMediaFile.cs +++ b/src/Umbraco.Core/IO/UmbracoMediaFile.cs @@ -86,7 +86,7 @@ namespace Umbraco.Core.IO private void Initialize() { Filename = _fs.GetFileName(Path); - Extension = _fs.GetExtension(Path) != null + Extension = !string.IsNullOrEmpty(_fs.GetExtension(Path)) ? _fs.GetExtension(Path).Substring(1).ToLowerInvariant() : ""; Url = _fs.GetUrl(Path); From 94b12dfb0275ddec9ae90f3ae9b35fdab04e9678 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 27 Sep 2016 09:36:35 +0200 Subject: [PATCH 4/6] Updated code according to coding rules --- src/Umbraco.Core/IO/UmbracoMediaFile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/IO/UmbracoMediaFile.cs b/src/Umbraco.Core/IO/UmbracoMediaFile.cs index f7076be234..c466db29af 100644 --- a/src/Umbraco.Core/IO/UmbracoMediaFile.cs +++ b/src/Umbraco.Core/IO/UmbracoMediaFile.cs @@ -86,7 +86,7 @@ namespace Umbraco.Core.IO private void Initialize() { Filename = _fs.GetFileName(Path); - Extension = !string.IsNullOrEmpty(_fs.GetExtension(Path)) + Extension = string.IsNullOrEmpty(_fs.GetExtension(Path)) == false ? _fs.GetExtension(Path).Substring(1).ToLowerInvariant() : ""; Url = _fs.GetUrl(Path); From 248177f518908dd531e6d36553c4d4dc726f8396 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 28 Sep 2016 15:33:32 +0200 Subject: [PATCH 5/6] Ensures Nuspec has correct AutoMapper, ensures config transform is correct (we cannot remove something that isn't there since it never existed before) --- build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- build/NuSpecs/tools/Web.config.install.xdt | 7 +++---- build/UmbracoVersion.txt | 2 +- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index dbc7be00e4..450aec09b6 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -30,7 +30,7 @@ - + diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt index 0f7280a7f0..12ccd2e360 100644 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ b/build/NuSpecs/tools/Web.config.install.xdt @@ -318,8 +318,7 @@ - - + @@ -335,11 +334,11 @@ - + - + diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index df444cdd7b..469bf7a466 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1,2 +1,2 @@ # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta) -7.5.3 \ No newline at end of file +7.5.4 \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index a0a32912c9..39cbd18c2a 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -11,5 +11,5 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("7.5.3")] -[assembly: AssemblyInformationalVersion("7.5.3")] \ No newline at end of file +[assembly: AssemblyFileVersion("7.5.4")] +[assembly: AssemblyInformationalVersion("7.5.4")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 72e7187960..ddde8fbd5f 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/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.5.3"); + private static readonly Version Version = new Version("7.5.4"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index a75c2021c0..fa2d6d391d 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2412,9 +2412,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" True True - 7530 + 7540 / - http://localhost:7530 + http://localhost:7540 False False From b8aaebf51a473d00bd0e5766da441f9238f2f2b0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 28 Sep 2016 16:05:35 +0200 Subject: [PATCH 6/6] Fix automapper remove/insert transform --- build/NuSpecs/tools/Web.config.install.xdt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt index 12ccd2e360..2d5dfb0bdb 100644 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ b/build/NuSpecs/tools/Web.config.install.xdt @@ -318,7 +318,8 @@ - + + @@ -334,11 +335,11 @@ - + - +