From 1e6ada7c5348255571829b0c189888b2cc0be845 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 19 Feb 2024 21:56:37 +0100 Subject: [PATCH 1/6] Make GetByIds in MediaService extensions nullable --- src/Umbraco.Core/Packaging/PackagesRepository.cs | 2 +- src/Umbraco.Core/Services/MediaServiceExtensions.cs | 2 +- .../Implement/CreatedPackageSchemaRepository.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Core/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs index a130712c07a2..95b1bbc925b5 100644 --- a/src/Umbraco.Core/Packaging/PackagesRepository.cs +++ b/src/Umbraco.Core/Packaging/PackagesRepository.cs @@ -742,7 +742,7 @@ void OnSerializedMedia(IMedia media, XElement xmlMedia) } } - IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis); + IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis)!; var mediaXml = new XElement( "MediaItems", diff --git a/src/Umbraco.Core/Services/MediaServiceExtensions.cs b/src/Umbraco.Core/Services/MediaServiceExtensions.cs index e7d01f122e52..c626d0f76d37 100644 --- a/src/Umbraco.Core/Services/MediaServiceExtensions.cs +++ b/src/Umbraco.Core/Services/MediaServiceExtensions.cs @@ -17,7 +17,7 @@ namespace Umbraco.Extensions; /// public static class MediaServiceExtensions { - public static IEnumerable GetByIds(this IMediaService mediaService, IEnumerable ids) + public static IEnumerable? GetByIds(this IMediaService mediaService, IEnumerable ids) { var guids = new List(); foreach (Udi udi in ids) diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs index 05317b39e104..c2a2f6ed6d25 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs @@ -736,8 +736,8 @@ void OnSerializedMedia(IMedia media, XElement xmlMedia) // get the media file path and store that separately in the XML. // the media file path is different from the URL and is specifically // extracted using the property editor for this media file and the current media file system. - Stream mediaStream = _mediaFileManager.GetFile(media, out var mediaFilePath); - if (mediaFilePath is not null) + Stream? mediaStream = _mediaFileManager.GetFile(media, out var mediaFilePath); + if (mediaStream != null && mediaFilePath is not null) { xmlMedia.Add(new XAttribute("mediaFilePath", mediaFilePath)); @@ -746,7 +746,7 @@ void OnSerializedMedia(IMedia media, XElement xmlMedia) } } - IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis); + IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis)!; var mediaXml = new XElement( "MediaItems", From 9497fbac7e054344c903d70fb84edd53db605256 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 22 Feb 2024 00:33:31 +0100 Subject: [PATCH 2/6] Update src/Umbraco.Core/Packaging/PackagesRepository.cs Co-authored-by: Jason Elkin --- src/Umbraco.Core/Packaging/PackagesRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs index 95b1bbc925b5..a130712c07a2 100644 --- a/src/Umbraco.Core/Packaging/PackagesRepository.cs +++ b/src/Umbraco.Core/Packaging/PackagesRepository.cs @@ -742,7 +742,7 @@ void OnSerializedMedia(IMedia media, XElement xmlMedia) } } - IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis)!; + IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis); var mediaXml = new XElement( "MediaItems", From 50fb784a8363a907c1a02821f9144141233a1227 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 22 Feb 2024 00:33:55 +0100 Subject: [PATCH 3/6] Update src/Umbraco.Core/Services/MediaServiceExtensions.cs Co-authored-by: Jason Elkin --- src/Umbraco.Core/Services/MediaServiceExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/MediaServiceExtensions.cs b/src/Umbraco.Core/Services/MediaServiceExtensions.cs index c626d0f76d37..e7d01f122e52 100644 --- a/src/Umbraco.Core/Services/MediaServiceExtensions.cs +++ b/src/Umbraco.Core/Services/MediaServiceExtensions.cs @@ -17,7 +17,7 @@ namespace Umbraco.Extensions; /// public static class MediaServiceExtensions { - public static IEnumerable? GetByIds(this IMediaService mediaService, IEnumerable ids) + public static IEnumerable GetByIds(this IMediaService mediaService, IEnumerable ids) { var guids = new List(); foreach (Udi udi in ids) From d713a52397069c2e28e8dc2f3b85193ab67cff18 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 22 Feb 2024 00:34:15 +0100 Subject: [PATCH 4/6] Update src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs Co-authored-by: Jason Elkin --- .../Repositories/Implement/CreatedPackageSchemaRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs index c2a2f6ed6d25..ae54ca35a79a 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs @@ -746,7 +746,7 @@ void OnSerializedMedia(IMedia media, XElement xmlMedia) } } - IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis)!; + IEnumerable medias = _mediaService.GetByIds(definition.MediaUdis); var mediaXml = new XElement( "MediaItems", From 38d2c9b660e4259dd91d3864442e4e705b7c0511 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 22 Feb 2024 00:37:21 +0100 Subject: [PATCH 5/6] Make extensions non nullable --- src/Umbraco.Core/Services/ContentServiceExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs index 893a3eeaf55f..cac93c2426c7 100644 --- a/src/Umbraco.Core/Services/ContentServiceExtensions.cs +++ b/src/Umbraco.Core/Services/ContentServiceExtensions.cs @@ -19,7 +19,7 @@ public static class ContentServiceExtensions private static readonly Regex AnchorRegex = new(@"", RegexOptions.Compiled); private static readonly string[] _propertyTypesWithRte = new[] { Constants.PropertyEditors.Aliases.RichText, Constants.PropertyEditors.Aliases.BlockList, Constants.PropertyEditors.Aliases.BlockGrid }; - public static IEnumerable? GetByIds(this IContentService contentService, IEnumerable ids) + public static IEnumerable GetByIds(this IContentService contentService, IEnumerable ids) { var guids = new List(); foreach (Udi udi in ids) From 100c923490e81eca99e744d56478f8d51f0fbdd3 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 22 Feb 2024 00:45:05 +0100 Subject: [PATCH 6/6] Update src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs Co-authored-by: Jason Elkin --- .../Repositories/Implement/CreatedPackageSchemaRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs index ae54ca35a79a..05317b39e104 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs @@ -736,8 +736,8 @@ void OnSerializedMedia(IMedia media, XElement xmlMedia) // get the media file path and store that separately in the XML. // the media file path is different from the URL and is specifically // extracted using the property editor for this media file and the current media file system. - Stream? mediaStream = _mediaFileManager.GetFile(media, out var mediaFilePath); - if (mediaStream != null && mediaFilePath is not null) + Stream mediaStream = _mediaFileManager.GetFile(media, out var mediaFilePath); + if (mediaFilePath is not null) { xmlMedia.Add(new XAttribute("mediaFilePath", mediaFilePath));