From ac6aaedf3e5e9bfbf8ba46f3dc449ea4363af743 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 18 Oct 2013 08:34:37 +1100 Subject: [PATCH] missing csproj commit to fix build --- src/Umbraco.Core/Umbraco.Core.csproj | 1 + src/Umbraco.Tests/Umbraco.Tests.csproj | 6 ++++++ .../Models/ChangingPasswordModel.cs | 19 +----------------- .../Models/PasswordChangedModel.cs | 20 +++++++++++++++++++ src/Umbraco.Web/Umbraco.Web.csproj | 1 + 5 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 src/Umbraco.Web/Models/PasswordChangedModel.cs diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index fe9a0159db..0243ef5f57 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -923,6 +923,7 @@ + diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 515cfd653c..9fe481793a 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -117,6 +117,7 @@ + True ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll @@ -164,6 +165,7 @@ + @@ -547,6 +549,10 @@ {89C09045-1064-466B-B94A-DB3AFE2A5853} umbraco.MacroEngines + + {d7636876-0756-43cb-a192-138c6f0d5e42} + umbraco.providers + {651E1350-91B6-44B7-BD60-7207006D7003} Umbraco.Web diff --git a/src/Umbraco.Web/Models/ChangingPasswordModel.cs b/src/Umbraco.Web/Models/ChangingPasswordModel.cs index 935d9d3ccf..9be423a8f1 100644 --- a/src/Umbraco.Web/Models/ChangingPasswordModel.cs +++ b/src/Umbraco.Web/Models/ChangingPasswordModel.cs @@ -1,24 +1,7 @@ -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; +using System.Runtime.Serialization; namespace Umbraco.Web.Models { - /// - /// A model representing an attempt at changing a password - /// - public class PasswordChangedModel - { - /// - /// The error affiliated with the failing password changes, null if changing was successful - /// - public ValidationResult ChangeError { get; set; } - - /// - /// If the password was reset, this is the value it has been changed to - /// - public string ResetPassword { get; set; } - } - /// /// A model representing the data required to set a member/user password depending on the provider installed. /// diff --git a/src/Umbraco.Web/Models/PasswordChangedModel.cs b/src/Umbraco.Web/Models/PasswordChangedModel.cs new file mode 100644 index 0000000000..098026794e --- /dev/null +++ b/src/Umbraco.Web/Models/PasswordChangedModel.cs @@ -0,0 +1,20 @@ +using System.ComponentModel.DataAnnotations; + +namespace Umbraco.Web.Models +{ + /// + /// A model representing an attempt at changing a password + /// + public class PasswordChangedModel + { + /// + /// The error affiliated with the failing password changes, null if changing was successful + /// + public ValidationResult ChangeError { get; set; } + + /// + /// If the password was reset, this is the value it has been changed to + /// + public string ResetPassword { get; set; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index e81d9f047a..45190cb47d 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -331,6 +331,7 @@ +