From 59f51767b5877b8330d73eb288ebdcf1a761e592 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 18 Feb 2019 16:38:37 +1100 Subject: [PATCH 1/3] Forgot to remove the ContentService, MediaService and MemberService Created events - these should have been removed a very long time ago! --- src/Umbraco.Core/Services/Implement/ContentService.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs index 485299c18a..02117d064c 100644 --- a/src/Umbraco.Core/Services/Implement/ContentService.cs +++ b/src/Umbraco.Core/Services/Implement/ContentService.cs @@ -320,8 +320,6 @@ namespace Umbraco.Core.Services.Implement scope.Events.Dispatch(TreeChanged, this, new TreeChange(content, TreeChangeTypes.RefreshNode).ToEventArgs()); } - scope.Events.Dispatch(Created, this, new NewEventArgs(content, false, content.ContentType.Alias, parent)); - if (withIdentity == false) return; @@ -2281,15 +2279,6 @@ namespace Umbraco.Core.Services.Implement /// public static event TypedEventHandler Saved; - /// - /// Occurs after Create - /// - /// - /// Please note that the Content object has been created, but might not have been saved - /// so it does not have an identity yet (meaning no Id has been set). - /// - public static event TypedEventHandler> Created; - /// /// Occurs before Copy /// From aa90e61a979f9b4c01464f7eb8b2e2d52e3686ea Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 18 Feb 2019 16:38:55 +1100 Subject: [PATCH 2/3] Forgot to remove the ContentService, MediaService and MemberService Created events - these should have been removed a very long time ago! --- .../Services/Implement/MediaService.cs | 13 +------------ .../Services/Implement/MemberService.cs | 13 +------------ src/Umbraco.Tests/Services/MemberServiceTests.cs | 16 ---------------- .../PropertyEditors/PropertyEditorsComponent.cs | 2 -- 4 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs index 1fa9b9fdb4..a1aea45f11 100644 --- a/src/Umbraco.Core/Services/Implement/MediaService.cs +++ b/src/Umbraco.Core/Services/Implement/MediaService.cs @@ -289,9 +289,7 @@ namespace Umbraco.Core.Services.Implement scope.Events.Dispatch(Saved, this, saveEventArgs); scope.Events.Dispatch(TreeChanged, this, new TreeChange(media, TreeChangeTypes.RefreshNode).ToEventArgs()); } - - scope.Events.Dispatch(Created, this, new NewEventArgs(media, false, media.ContentType.Alias, parent)); - + if (withIdentity == false) return; @@ -1215,15 +1213,6 @@ namespace Umbraco.Core.Services.Implement /// public static event TypedEventHandler> Saved; - /// - /// Occurs after Create - /// - /// - /// Please note that the Media object has been created, but might not have been saved - /// so it does not have an identity yet (meaning no Id has been set). - /// - public static event TypedEventHandler> Created; - /// /// Occurs before Media is moved to Recycle Bin /// diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs index 5ce824de16..45a6dc7dc1 100644 --- a/src/Umbraco.Core/Services/Implement/MemberService.cs +++ b/src/Umbraco.Core/Services/Implement/MemberService.cs @@ -331,9 +331,7 @@ namespace Umbraco.Core.Services.Implement saveEventArgs.CanCancel = false; scope.Events.Dispatch(Saved, this, saveEventArgs); } - - scope.Events.Dispatch(Created, this, new NewEventArgs(member, false, member.ContentType.Alias, -1)); - + if (withIdentity == false) return; @@ -1110,15 +1108,6 @@ namespace Umbraco.Core.Services.Implement /// public static event TypedEventHandler> Saving; - /// - /// Occurs after Create - /// - /// - /// Please note that the Member object has been created, but might not have been saved - /// so it does not have an identity yet (meaning no Id has been set). - /// - public static event TypedEventHandler> Created; - /// /// Occurs after Save /// diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs index 98553941cd..f6f9aa446f 100644 --- a/src/Umbraco.Tests/Services/MemberServiceTests.cs +++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs @@ -521,22 +521,6 @@ namespace Umbraco.Tests.Services Assert.AreEqual("Test Real Name", member.Name); } - [Test] - public void Get_Member_Name_In_Created_Event() - { - IMemberType memberType = MockedContentTypes.CreateSimpleMemberType(); - ServiceContext.MemberTypeService.Save(memberType); - - TypedEventHandler> callback = (sender, args) => - { - Assert.AreEqual("Test Real Name", args.Entity.Name); - }; - - MemberService.Created += callback; - var member = ServiceContext.MemberService.CreateMember("testUsername", "test@test.com", "Test Real Name", memberType); - MemberService.Created -= callback; - } - [Test] public void Get_By_Username() { diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs index 3b4148eb56..df603d9e88 100644 --- a/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs +++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorsComponent.cs @@ -32,7 +32,6 @@ namespace Umbraco.Web.PropertyEditors private static void Initialize(FileUploadPropertyEditor fileUpload) { MediaService.Saving += fileUpload.MediaServiceSaving; - MediaService.Created += fileUpload.MediaServiceCreated; ContentService.Copied += fileUpload.ContentServiceCopied; MediaService.Deleted += (sender, args) @@ -46,7 +45,6 @@ namespace Umbraco.Web.PropertyEditors private static void Initialize(ImageCropperPropertyEditor imageCropper) { MediaService.Saving += imageCropper.MediaServiceSaving; - MediaService.Created += imageCropper.MediaServiceCreated; ContentService.Copied += imageCropper.ContentServiceCopied; MediaService.Deleted += (sender, args) From ed6167fb0a0997e09e4cb5125a0f310224942bc0 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 18 Feb 2019 09:46:43 +0100 Subject: [PATCH 3/3] Document Serilog per-source level --- src/Umbraco.Web.UI/config/serilog.Release.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI/config/serilog.Release.config b/src/Umbraco.Web.UI/config/serilog.Release.config index 960ad7e2aa..99897cfa0a 100644 --- a/src/Umbraco.Web.UI/config/serilog.Release.config +++ b/src/Umbraco.Web.UI/config/serilog.Release.config @@ -8,6 +8,11 @@ + + +