From b975a02bfa7bd580ded41d931072e59d11496a1d Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 29 Sep 2014 16:27:02 +1000 Subject: [PATCH] Updates version to 7.1.7 --- build/UmbracoVersion.txt | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- .../Repositories/DataTypeDefinitionRepositoryTest.cs | 2 +- src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs | 1 - src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs | 5 ----- src/umbraco.sln | 4 +++- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index c32f54ca04..c92484044e 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1 +1 @@ -7.1.6 \ No newline at end of file +7.1.7 \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 847be99a0d..1b05407755 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.6"); + private static readonly Version Version = new Version("7.1.7"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index fbf7f53414..e59945ac91 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -135,7 +135,7 @@ namespace Umbraco.Tests.Persistence.Repositories Assert.That(dataTypeDefinitions, Is.Not.Null); Assert.That(dataTypeDefinitions.Any(), Is.True); Assert.That(dataTypeDefinitions.Any(x => x == null), Is.False); - Assert.That(dataTypeDefinitions.Count(), Is.EqualTo(25)); + Assert.That(dataTypeDefinitions.Count(), Is.EqualTo(21)); } } diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs index d425c74024..3fc9c1de39 100644 --- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs @@ -47,7 +47,6 @@ namespace Umbraco.Web.Models.Mapping .ForMember(display => display.Published, expression => expression.Ignore()) .ForMember(display => display.Updator, expression => expression.Ignore()) .ForMember(display => display.Alias, expression => expression.Ignore()) - .ForMember(display => display.IsContainer, expression => expression.Ignore()) .ForMember(display => display.Tabs, expression => expression.ResolveUsing()) .AfterMap(AfterMap); diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs index 8369acebf1..1d8ee7abc4 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs @@ -81,9 +81,6 @@ namespace Umbraco.Web.Models.Mapping .ForMember(display => display.Published, expression => expression.Ignore()) .ForMember(display => display.Updator, expression => expression.Ignore()) .ForMember(display => display.Alias, expression => expression.Ignore()) - .ForMember(display => display.IsChildOfListView, expression => expression.Ignore()) - .ForMember(display => display.IsContainer, expression => expression.Ignore()) - .ForMember(display => display.TreeNodeUrl, expression => expression.Ignore()) .AfterMap((member, display) => MapGenericCustomProperties(applicationContext.Services.MemberService, member, display)); //FROM IMember TO ContentItemBasic @@ -100,8 +97,6 @@ namespace Umbraco.Web.Models.Mapping .ForMember(x => x.Published, expression => expression.Ignore()) .ForMember(x => x.Updator, expression => expression.Ignore()) .ForMember(x => x.Alias, expression => expression.Ignore()); - - .ForMember(x => x.ContentTypeAlias, expression => expression.Ignore()); //FROM IMember TO ContentItemDto config.CreateMap>() .ForMember( diff --git a/src/umbraco.sln b/src/umbraco.sln index 61add3f5d5..7b71ba11d2 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}" EndProject @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4 ..\build\RevertToCleanInstall.bat = ..\build\RevertToCleanInstall.bat ..\build\RevertToEmptyInstall.bat = ..\build\RevertToEmptyInstall.bat umbraco.presentation.targets = umbraco.presentation.targets + ..\build\UmbracoVersion.txt = ..\build\UmbracoVersion.txt + ..\build\webpihash.txt = ..\build\webpihash.txt EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}"