+
diff --git a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
index 4ce8f99e64..140cb8a115 100644
--- a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
+++ b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
@@ -4,9 +4,6 @@
Installs Umbraco CMS with minimal dependencies in your ASP.NET Core project.
false
false
-
-
false
-
false
@@ -26,7 +23,7 @@
NU5100;NU5128
-
+
diff --git a/src/Umbraco.Cms/Umbraco.Cms.csproj b/src/Umbraco.Cms/Umbraco.Cms.csproj
index 8b0dcb8a87..39a3b03c56 100644
--- a/src/Umbraco.Cms/Umbraco.Cms.csproj
+++ b/src/Umbraco.Cms/Umbraco.Cms.csproj
@@ -4,7 +4,6 @@
Installs Umbraco CMS with all default dependencies in your ASP.NET Core project.
false
false
- false
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index e22df693e9..e3b7ddef9b 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -34,7 +34,7 @@ public class TypeFinder : ITypeFinder
"ServiceStack.", "SqlCE4Umbraco,", "Superpower,", // used by Serilog
"System.", "TidyNet,", "TidyNet.", "WebDriver,", "itextsharp,", "mscorlib,", "NUnit,", "NUnit.", "NUnit3.",
"Selenium.", "ImageProcessor", "MiniProfiler.", "Owin,", "SQLite",
- "ReSharperTestRunner32", "ReSharperTestRunner64", // These are used by the Jetbrains Rider IDE and Visual Studio ReSharper Extension
+ "ReSharperTestRunner", "ReSharperTestRunner32", "ReSharperTestRunner64", // These are used by the Jetbrains Rider IDE and Visual Studio ReSharper Extension
};
private static readonly ConcurrentDictionary TypeNamesCache = new();
diff --git a/src/Umbraco.Core/Constants-HttpClients.cs b/src/Umbraco.Core/Constants-HttpClients.cs
index 677f442085..a9c693f39d 100644
--- a/src/Umbraco.Core/Constants-HttpClients.cs
+++ b/src/Umbraco.Core/Constants-HttpClients.cs
@@ -14,5 +14,18 @@ public static partial class Constants
/// Name for http client which ignores certificate errors.
///
public const string IgnoreCertificateErrors = "Umbraco:HttpClients:IgnoreCertificateErrors";
+
+ ///
+ /// Name for http client which sends webhook requests.
+ ///
+ public const string WebhookFiring = "Umbraco:HttpClients:WebhookFiring";
+
+ public static class Headers
+ {
+ ///
+ /// User agent name for the product name.
+ ///
+ public const string UserAgentProductName = "Umbraco-Cms";
+ }
}
}
diff --git a/src/Umbraco.Core/Constants-WebhookEvents.cs b/src/Umbraco.Core/Constants-WebhookEvents.cs
index afd57b5188..28c4a42dd2 100644
--- a/src/Umbraco.Core/Constants-WebhookEvents.cs
+++ b/src/Umbraco.Core/Constants-WebhookEvents.cs
@@ -1,33 +1,96 @@
-namespace Umbraco.Cms.Core;
+namespace Umbraco.Cms.Core;
public static partial class Constants
{
public static class WebhookEvents
{
+ public static class HeaderNames
+ {
+ ///
+ /// Gets the Umb-Webhook-Event HTTP header name.
+ ///
+ public const string EventName = "Umb-Webhook-Event";
+
+ ///
+ /// Gets the Umb-Webhook-RetryCount HTTP header name.
+ ///
+ public const string RetryCount = "Umb-Webhook-RetryCount";
+ }
+
public static class Aliases
{
///
- /// Webhook event alias for content publish.
+ /// Webhook event alias for content versions deleted.
+ ///
+ public const string ContentDeletedVersions = "Umbraco.ContentDeletedVersions";
+
+ ///
+ /// Webhook event alias for content blueprint saved.
+ ///
+ public const string ContentSavedBlueprint = "Umbraco.ContentSavedBlueprint";
+
+ ///
+ /// Webhook event alias for content blueprint deleted.
+ ///
+ public const string ContentDeletedBlueprint = "Umbraco.ContentDeletedBlueprint";
+
+ ///
+ /// Webhook event alias for content moved into the recycle bin.
+ ///
+ public const string ContentMovedToRecycleBin = "Umbraco.ContentMovedToRecycleBin";
+
+ ///
+ /// Webhook event alias for content sorted.
+ ///
+ public const string ContentSorted = "Umbraco.ContentSorted";
+
+ ///
+ /// Webhook event alias for content moved.
+ ///
+ public const string ContentMoved = "Umbraco.ContentMoved";
+
+ ///
+ /// Webhook event alias for content copied.
+ ///
+ public const string ContentCopied = "Umbraco.ContentCopied";
+
+ ///
+ /// Webhook event alias for content emptied recycle bin.
+ ///
+ public const string ContentEmptiedRecycleBin = "Umbraco.ContentEmptiedRecycleBin";
+
+ ///
+ /// Webhook event alias for content rolled back.
+ ///
+ public const string ContentRolledBack = "Umbraco.ContentRolledBack";
+
+ ///
+ /// Webhook event alias for content saved.
+ ///
+ public const string ContentSaved = "Umbraco.ContentSaved";
+
+ ///
+ /// Webhook event alias for content publish.
///
public const string ContentPublish = "Umbraco.ContentPublish";
///
- /// Webhook event alias for content delete.
+ /// Webhook event alias for content delete.
///
public const string ContentDelete = "Umbraco.ContentDelete";
///
- /// Webhook event alias for content unpublish.
+ /// Webhook event alias for content unpublish.
///
public const string ContentUnpublish = "Umbraco.ContentUnpublish";
///
- /// Webhook event alias for media delete.
+ /// Webhook event alias for media delete.
///
public const string MediaDelete = "Umbraco.MediaDelete";
///
- /// Webhook event alias for media save.
+ /// Webhook event alias for media save.
///
public const string MediaSave = "Umbraco.MediaSave";
}
@@ -35,22 +98,22 @@ public static partial class Constants
public static class Types
{
///
- /// Webhook event type for content.
+ /// Webhook event type for content.
///
public const string Content = "Content";
///
- /// Webhook event type for content media.
+ /// Webhook event type for content media.
///
public const string Media = "Media";
///
- /// Webhook event type for content member.
+ /// Webhook event type for content member.
///
public const string Member = "Member";
///
- /// Webhook event type for others, this is the default category if you have not chosen one.
+ /// Webhook event type for others, this is the default category if you have not chosen one.
///
public const string Other = "Other";
}
diff --git a/src/Umbraco.Core/DeliveryApi/DeliveryApiCompositeIdHandler.cs b/src/Umbraco.Core/DeliveryApi/DeliveryApiCompositeIdHandler.cs
new file mode 100644
index 0000000000..a3c1f0fceb
--- /dev/null
+++ b/src/Umbraco.Core/DeliveryApi/DeliveryApiCompositeIdHandler.cs
@@ -0,0 +1,21 @@
+namespace Umbraco.Cms.Core.DeliveryApi;
+
+public class DeliveryApiCompositeIdHandler : IDeliveryApiCompositeIdHandler
+{
+ public string IndexId(int id, string culture) => $"{id}|{culture}";
+
+ public DeliveryApiIndexCompositeIdModel Decompose(string indexId)
+ {
+ var parts = indexId.Split(Constants.CharArrays.VerticalTab);
+ if (parts.Length == 2 && int.TryParse(parts[0], out var id))
+ {
+ return new DeliveryApiIndexCompositeIdModel
+ {
+ Id = id,
+ Culture = parts[1],
+ };
+ }
+
+ return new DeliveryApiIndexCompositeIdModel();
+ }
+}
diff --git a/src/Umbraco.Core/DeliveryApi/DeliveryApiIndexCompositeIdModel.cs b/src/Umbraco.Core/DeliveryApi/DeliveryApiIndexCompositeIdModel.cs
new file mode 100644
index 0000000000..d3b876b5aa
--- /dev/null
+++ b/src/Umbraco.Core/DeliveryApi/DeliveryApiIndexCompositeIdModel.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Cms.Core.DeliveryApi;
+
+public class DeliveryApiIndexCompositeIdModel
+{
+ public int? Id { get; set; }
+
+ public string? Culture { get; set; }
+}
diff --git a/src/Umbraco.Core/DeliveryApi/FilterOperation.cs b/src/Umbraco.Core/DeliveryApi/FilterOperation.cs
index 1e69f68c7f..6b897fd27d 100644
--- a/src/Umbraco.Core/DeliveryApi/FilterOperation.cs
+++ b/src/Umbraco.Core/DeliveryApi/FilterOperation.cs
@@ -5,5 +5,9 @@ public enum FilterOperation
Is,
IsNot,
Contains,
- DoesNotContain
+ DoesNotContain,
+ LessThan,
+ LessThanOrEqual,
+ GreaterThan,
+ GreaterThanOrEqual
}
diff --git a/src/Umbraco.Core/DeliveryApi/IDeliveryApiCompositeIdHandler.cs b/src/Umbraco.Core/DeliveryApi/IDeliveryApiCompositeIdHandler.cs
new file mode 100644
index 0000000000..a472d0f9ff
--- /dev/null
+++ b/src/Umbraco.Core/DeliveryApi/IDeliveryApiCompositeIdHandler.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Cms.Core.DeliveryApi;
+
+public interface IDeliveryApiCompositeIdHandler
+{
+ string IndexId(int id, string culture);
+
+ DeliveryApiIndexCompositeIdModel Decompose(string indexId);
+}
diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
index 255f84a32e..bec4c39298 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
@@ -1,5 +1,6 @@
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Dashboards;
+using Umbraco.Cms.Core.DynamicRoot.QuerySteps;
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Media;
@@ -11,91 +12,119 @@ using Umbraco.Cms.Core.Webhooks;
namespace Umbraco.Cms.Core.DependencyInjection;
///
-/// Contains extensions methods for used for registering content apps.
+/// Contains extensions methods for .
///
public static partial class UmbracoBuilderExtensions
{
///
- /// Register a component.
+ /// Register a component.
///
/// The type of the component.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddComponent(this IUmbracoBuilder builder)
- where T : class, IComponent
+ where T : IComponent
{
builder.Components().Append();
+
return builder;
}
///
- /// Register a content app.
+ /// Register a content app.
///
/// The type of the content app.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddContentApp(this IUmbracoBuilder builder)
- where T : class, IContentAppFactory
+ where T : IContentAppFactory
{
builder.ContentApps().Append();
+
return builder;
}
///
- /// Register a content finder.
+ /// Register a content finder.
///
/// The type of the content finder.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddContentFinder(this IUmbracoBuilder builder)
- where T : class, IContentFinder
+ where T : IContentFinder
{
builder.ContentFinders().Append();
+
return builder;
}
///
- /// Register a dashboard.
+ /// Register a dashboard.
///
/// The type of the dashboard.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddDashboard(this IUmbracoBuilder builder)
- where T : class, IDashboard
+ where T : IDashboard
{
builder.Dashboards().Add();
+
return builder;
}
///
- /// Register a manifest filter
+ /// Register a manifest filter.
///
/// The type of the manifest filter.
/// The Builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddManifestFilter(this IUmbracoBuilder builder)
where T : class, ILegacyManifestFilter
{
builder.ManifestFilters().Append();
+
return builder;
}
///
- /// Register a media url provider.
+ /// Register a media URL provider.
///
- /// The type of the media url provider.
+ /// The type of the media URL provider.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddMediaUrlProvider(this IUmbracoBuilder builder)
- where T : class, IMediaUrlProvider
+ where T : IMediaUrlProvider
{
builder.MediaUrlProviders().Append();
+
return builder;
}
///
- /// Register a embed provider.
+ /// Register a embed provider.
///
/// The type of the embed provider.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddEmbedProvider(this IUmbracoBuilder builder)
- where T : class, IEmbedProvider
+ where T : IEmbedProvider
{
builder.EmbedProviders().Append();
+
return builder;
}
@@ -104,46 +133,74 @@ public static partial class UmbracoBuilderExtensions
///
/// The type of the section.
/// The builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddSection(this IUmbracoBuilder builder)
- where T : class, ISection
+ where T : ISection
{
builder.Sections().Append();
+
return builder;
}
///
- /// Register a url provider.
+ /// Register a URL provider.
///
- /// The type of the url provider.
+ /// The type of the URL provider.
/// The Builder.
+ ///
+ /// The builder.
+ ///
public static IUmbracoBuilder AddUrlProvider(this IUmbracoBuilder builder)
- where T : class, IUrlProvider
+ where T : IUrlProvider
{
builder.UrlProviders().Append();
+
return builder;
}
///
- /// Add an IMapDefinition to the MapDefinitionCollectionBuilder
+ /// Add a map definition.
///
- ///
- ///
- ///
- public static IUmbracoBuilder AddMapDefinition(this IUmbracoBuilder builder) where T : IMapDefinition
+ /// The type of map definition.
+ /// The builder.
+ ///
+ /// The builder.
+ ///
+ public static IUmbracoBuilder AddMapDefinition(this IUmbracoBuilder builder)
+ where T : IMapDefinition
{
- builder.WithCollectionBuilder().Add();
+ builder.MapDefinitions().Add();
+
return builder;
}
///
- /// Add an IWebhookEvent to the WebhookEventCollectionBuilder.
+ /// Add a webhook event.
+ ///
+ /// The type of webhook event.
+ /// The builder.
+ ///
+ /// The builder.
+ ///
+ public static IUmbracoBuilder AddWebhookEvent(this IUmbracoBuilder builder)
+ where T : IWebhookEvent
+ {
+ builder.WebhookEvents().Add();
+
+ return builder;
+ }
+
+ ///
+ /// Add an IDynamicRootQueryStep to the DynamicRootQueryStepCollectionBuilder.
///
///
///
///
- public static IUmbracoBuilder AddWebhookEvent(this IUmbracoBuilder builder) where T : IWebhookEvent
+ public static IUmbracoBuilder AddDynamicRootStep(this IUmbracoBuilder builder) where T : IDynamicRootQueryStep
{
- builder.WebhookEvents().Append();
+ builder.DynamicRootSteps().Append();
return builder;
}
}
diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
index 1b204f7b40..f6ba0ca03f 100644
--- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
+++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
@@ -1,9 +1,11 @@
using Umbraco.Cms.Core.Actions;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.ContentApps;
using Umbraco.Cms.Core.Dashboards;
+using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.DynamicRoot.Origin;
+using Umbraco.Cms.Core.DynamicRoot.QuerySteps;
using Umbraco.Cms.Core.Editors;
using Umbraco.Cms.Core.HealthChecks;
using Umbraco.Cms.Core.HealthChecks.NotificationMethods;
@@ -15,8 +17,6 @@ using Umbraco.Cms.Core.PropertyEditors.Validators;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Sections;
using Umbraco.Cms.Core.Snippets;
-using Umbraco.Cms.Core.DynamicRoot.QuerySteps;
-using Umbraco.Cms.Core.DynamicRoot.Origin;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Core.Tour;
using Umbraco.Cms.Core.Trees;
@@ -145,7 +145,7 @@ public static partial class UmbracoBuilderExtensions
builder.FilterHandlers().Add(() => builder.TypeLoader.GetTypes());
builder.SortHandlers().Add(() => builder.TypeLoader.GetTypes());
builder.ContentIndexHandlers().Add(() => builder.TypeLoader.GetTypes());
- builder.WebhookEvents().AddCoreWebhooks();
+ builder.WebhookEvents().AddCms(true);
}
///
diff --git a/src/Umbraco.Core/Deploy/ArtifactBase.cs b/src/Umbraco.Core/Deploy/ArtifactBase.cs
index 0d354b65de..994297990d 100644
--- a/src/Umbraco.Core/Deploy/ArtifactBase.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactBase.cs
@@ -1,49 +1,69 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Provides a base class to all artifacts.
+/// Provides a base class for all artifacts.
///
+/// The UDI type.
public abstract class ArtifactBase : IArtifact
where TUdi : Udi
{
+ private IEnumerable _dependencies;
+ private readonly Lazy _checksum;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The UDI.
+ /// The dependencies.
protected ArtifactBase(TUdi udi, IEnumerable? dependencies = null)
{
- Udi = udi ?? throw new ArgumentNullException("udi");
+ Udi = udi ?? throw new ArgumentNullException(nameof(udi));
Name = Udi.ToString();
_dependencies = dependencies ?? Enumerable.Empty();
_checksum = new Lazy(GetChecksum);
}
- private readonly Lazy _checksum;
-
- private IEnumerable _dependencies;
-
- protected abstract string GetChecksum();
-
+ ///
Udi IArtifactSignature.Udi => Udi;
+ ///
public TUdi Udi { get; set; }
- public string Checksum => _checksum.Value;
-
- ///
- /// Prevents the property from being serialized.
- ///
- ///
- /// Note that we can't use here as that works only on fields, not properties. And we want to avoid using [JsonIgnore]
- /// as that would require an external dependency in Umbraco.Cms.Core.
- /// So using this method of excluding properties from serialized data, documented here: https://www.newtonsoft.com/json/help/html/ConditionalProperties.htm
- ///
- public bool ShouldSerializeChecksum() => false;
-
+ ///
public IEnumerable Dependencies
{
get => _dependencies;
set => _dependencies = value.OrderBy(x => x.Udi);
}
+ ///
+ public string Checksum => _checksum.Value;
+
+ ///
public string Name { get; set; }
+ ///
public string Alias { get; set; } = string.Empty;
+
+ ///
+ /// Gets the checksum.
+ ///
+ ///
+ /// The checksum.
+ ///
+ protected abstract string GetChecksum();
+
+ ///
+ /// Prevents the property from being serialized.
+ ///
+ ///
+ /// Returns false to prevent the property from being serialized.
+ ///
+ ///
+ /// Note that we can't use here as that works only on fields, not properties. And we want to avoid using [JsonIgnore]
+ /// as that would require an external dependency in Umbraco.Cms.Core.
+ /// So using this method of excluding properties from serialized data, documented here: https://www.newtonsoft.com/json/help/html/ConditionalProperties.htm
+ ///
+ public bool ShouldSerializeChecksum() => false;
}
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependency.cs b/src/Umbraco.Core/Deploy/ArtifactDependency.cs
index 31c8025ddb..80a77740d0 100644
--- a/src/Umbraco.Core/Deploy/ArtifactDependency.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactDependency.cs
@@ -1,27 +1,17 @@
-using System.Text.Json.Serialization;
-
namespace Umbraco.Cms.Core.Deploy;
///
/// Represents an artifact dependency.
///
-///
-///
-/// Dependencies have an order property which indicates whether it must be respected when ordering artifacts.
-///
-///
-/// Dependencies have a mode which can be or depending on whether the checksum should match.
-///
-///
public class ArtifactDependency
{
///
/// Initializes a new instance of the class.
///
/// The entity identifier of the artifact dependency.
- /// A value indicating whether the dependency is ordering.
- /// The dependency mode.
- /// The checksum.
+ /// A value indicating whether the dependency must be included when building a dependency tree and ensure the artifact gets deployed in the correct order.
+ /// A value indicating whether the checksum must match or the artifact just needs to exist.
+ /// The checksum of the dependency.
public ArtifactDependency(Udi udi, bool ordering, ArtifactDependencyMode mode, string? checksum = null)
{
Udi = udi;
@@ -39,10 +29,10 @@ public class ArtifactDependency
public Udi Udi { get; }
///
- /// Gets a value indicating whether the dependency is ordering.
+ /// Gets a value indicating whether the dependency is included when building a dependency tree and gets deployed in the correct order.
///
///
- /// true if the dependency is ordering; otherwise, false.
+ /// true if the dependency is included when building a dependency tree and gets deployed in the correct order; otherwise, false.
///
public bool Ordering { get; }
@@ -55,10 +45,10 @@ public class ArtifactDependency
public ArtifactDependencyMode Mode { get; }
///
- /// Gets the checksum.
+ /// Gets or sets the checksum.
///
///
/// The checksum.
///
- public string? Checksum { get; }
+ public string? Checksum { get; set; }
}
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs b/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
index 1be524c86f..7f2b05eaad 100644
--- a/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
@@ -3,42 +3,53 @@ using System.Collections;
namespace Umbraco.Cms.Core.Deploy;
///
-/// Represents a collection of distinct .
+/// Represents a collection of distinct .
///
-/// The collection cannot contain duplicates and modes are properly managed.
+///
+/// The collection cannot contain duplicates and modes are properly managed.
+///
public class ArtifactDependencyCollection : ICollection
{
private readonly Dictionary _dependencies = new();
+ ///
public int Count => _dependencies.Count;
- public IEnumerator GetEnumerator() => _dependencies.Values.GetEnumerator();
-
- IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+ ///
+ public bool IsReadOnly => false;
+ ///
public void Add(ArtifactDependency item)
{
- if (_dependencies.ContainsKey(item.Udi))
+ if (item.Mode == ArtifactDependencyMode.Exist &&
+ _dependencies.TryGetValue(item.Udi, out ArtifactDependency? existingItem) &&
+ existingItem.Mode == ArtifactDependencyMode.Match)
{
- ArtifactDependency exist = _dependencies[item.Udi];
- if (item.Mode == ArtifactDependencyMode.Exist || item.Mode == exist.Mode)
- {
- return;
- }
+ // Don't downgrade dependency mode from Match to Exist
+ return;
}
_dependencies[item.Udi] = item;
}
+ ///
public void Clear() => _dependencies.Clear();
- public bool Contains(ArtifactDependency item) =>
- _dependencies.ContainsKey(item.Udi) &&
- (_dependencies[item.Udi].Mode == item.Mode || _dependencies[item.Udi].Mode == ArtifactDependencyMode.Match);
+ ///
+ public bool Contains(ArtifactDependency item)
+ => _dependencies.TryGetValue(item.Udi, out ArtifactDependency? existingItem) &&
+ // Check whether it has the same or higher dependency mode
+ (existingItem.Mode == item.Mode || existingItem.Mode == ArtifactDependencyMode.Match);
+ ///
public void CopyTo(ArtifactDependency[] array, int arrayIndex) => _dependencies.Values.CopyTo(array, arrayIndex);
- public bool Remove(ArtifactDependency item) => throw new NotSupportedException();
+ ///
+ public bool Remove(ArtifactDependency item) => _dependencies.Remove(item.Udi);
- public bool IsReadOnly => false;
+ ///
+ public IEnumerator GetEnumerator() => _dependencies.Values.GetEnumerator();
+
+ ///
+ IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
}
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs b/src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs
index b997b9c759..6ea6a5e2c2 100644
--- a/src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs
@@ -1,17 +1,16 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Indicates the mode of the dependency.
+/// Indicates the mode of the dependency.
///
public enum ArtifactDependencyMode
{
///
- /// The dependency must match exactly.
+ /// The dependency must match exactly.
///
Match,
-
///
- /// The dependency must exist.
+ /// The dependency must exist.
///
Exist,
}
diff --git a/src/Umbraco.Core/Deploy/ArtifactDeployState.cs b/src/Umbraco.Core/Deploy/ArtifactDeployState.cs
index e2dd343af1..b6a31f2da2 100644
--- a/src/Umbraco.Core/Deploy/ArtifactDeployState.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactDeployState.cs
@@ -1,27 +1,36 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Represent the state of an artifact being deployed.
+/// Represent the state of an artifact being deployed.
///
public abstract class ArtifactDeployState
{
///
- /// Gets the artifact.
+ /// Gets the artifact.
///
+ ///
+ /// The artifact.
+ ///
public IArtifact Artifact => GetArtifactAsIArtifact();
///
- /// Gets or sets the service connector in charge of deploying the artifact.
+ /// Gets or sets the service connector in charge of deploying the artifact.
///
+ ///
+ /// The connector.
+ ///
public IServiceConnector? Connector { get; set; }
///
- /// Gets or sets the next pass number.
+ /// Gets or sets the next pass number.
///
+ ///
+ /// The next pass.
+ ///
public int NextPass { get; set; }
///
- /// Creates a new instance of the class from an artifact and an entity.
+ /// Creates a new instance of the class from an artifact and an entity.
///
/// The type of the artifact.
/// The type of the entity.
@@ -29,24 +38,28 @@ public abstract class ArtifactDeployState
/// The entity.
/// The service connector deploying the artifact.
/// The next pass number.
- /// A deploying artifact.
+ ///
+ /// A deploying artifact.
+ ///
public static ArtifactDeployState Create(TArtifact art, TEntity? entity, IServiceConnector connector, int nextPass)
where TArtifact : IArtifact =>
new ArtifactDeployState(art, entity, connector, nextPass);
///
- /// Gets the artifact as an .
+ /// Gets the artifact as an .
///
- /// The artifact, as an .
+ ///
+ /// The artifact, as an .
+ ///
///
- /// This is because classes that inherit from this class cannot override the Artifact property
- /// with a property that specializes the return type, and so they need to 'new' the property.
+ /// This is because classes that inherit from this class cannot override the Artifact property
+ /// with a property that specializes the return type, and so they need to 'new' the property.
///
protected abstract IArtifact GetArtifactAsIArtifact();
}
///
-/// Represent the state of an artifact being deployed.
+/// Represent the state of an artifact being deployed.
///
/// The type of the artifact.
/// The type of the entity.
@@ -54,7 +67,7 @@ public class ArtifactDeployState : ArtifactDeployState
where TArtifact : IArtifact
{
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The artifact.
/// The entity.
@@ -69,13 +82,19 @@ public class ArtifactDeployState : ArtifactDeployState
}
///
- /// Gets or sets the artifact.
+ /// Gets or sets the artifact.
///
+ ///
+ /// The artifact.
+ ///
public new TArtifact Artifact { get; set; }
///
- /// Gets or sets the entity.
+ /// Gets or sets the entity.
///
+ ///
+ /// The entity.
+ ///
public TEntity? Entity { get; set; }
///
diff --git a/src/Umbraco.Core/Deploy/ArtifactSignature.cs b/src/Umbraco.Core/Deploy/ArtifactSignature.cs
index 3dccddba29..c91897355e 100644
--- a/src/Umbraco.Core/Deploy/ArtifactSignature.cs
+++ b/src/Umbraco.Core/Deploy/ArtifactSignature.cs
@@ -1,17 +1,27 @@
namespace Umbraco.Cms.Core.Deploy;
+///
public sealed class ArtifactSignature : IArtifactSignature
{
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The UDI.
+ /// The checksum.
+ /// The artifact dependencies.
public ArtifactSignature(Udi udi, string checksum, IEnumerable? dependencies = null)
{
Udi = udi;
Checksum = checksum;
- Dependencies = dependencies ?? Enumerable.Empty();
+ Dependencies = dependencies ?? Array.Empty();
}
+ ///
public Udi Udi { get; }
+ ///
public string Checksum { get; }
+ ///
public IEnumerable Dependencies { get; }
}
diff --git a/src/Umbraco.Core/Deploy/Difference.cs b/src/Umbraco.Core/Deploy/Difference.cs
index d704642a9f..7bc3ff3055 100644
--- a/src/Umbraco.Core/Deploy/Difference.cs
+++ b/src/Umbraco.Core/Deploy/Difference.cs
@@ -1,7 +1,16 @@
namespace Umbraco.Cms.Core.Deploy;
+///
+/// Represents a difference between two artifacts.
+///
public class Difference
{
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The title.
+ /// The text.
+ /// The category.
public Difference(string title, string? text = null, string? category = null)
{
Title = title;
@@ -9,12 +18,36 @@ public class Difference
Category = category;
}
+ ///
+ /// Gets or sets the title.
+ ///
+ ///
+ /// The title.
+ ///
public string Title { get; set; }
+ ///
+ /// Gets or sets the text.
+ ///
+ ///
+ /// The text.
+ ///
public string? Text { get; set; }
+ ///
+ /// Gets or sets the category.
+ ///
+ ///
+ /// The category.
+ ///
public string? Category { get; set; }
+ ///
+ /// Converts the difference to a .
+ ///
+ ///
+ /// A that represents the difference.
+ ///
public override string ToString()
{
var s = Title;
diff --git a/src/Umbraco.Core/Deploy/Direction.cs b/src/Umbraco.Core/Deploy/Direction.cs
index 30439380f2..a1129e2e4c 100644
--- a/src/Umbraco.Core/Deploy/Direction.cs
+++ b/src/Umbraco.Core/Deploy/Direction.cs
@@ -1,7 +1,16 @@
namespace Umbraco.Cms.Core.Deploy;
+///
+/// Represents the direction when replacing an attribute value while parsing macros.
+///
public enum Direction
{
+ ///
+ /// Replacing an attribute value while converting to an artifact.
+ ///
ToArtifact,
+ ///
+ /// Replacing an attribute value while converting from an artifact.
+ ///
FromArtifact,
}
diff --git a/src/Umbraco.Core/Deploy/IArtifact.cs b/src/Umbraco.Core/Deploy/IArtifact.cs
index faea983dee..6b041b7f82 100644
--- a/src/Umbraco.Core/Deploy/IArtifact.cs
+++ b/src/Umbraco.Core/Deploy/IArtifact.cs
@@ -1,11 +1,23 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Represents an artifact ie an object that can be transfered between environments.
+/// Represents an artifact ie an object that can be transfered between environments.
///
public interface IArtifact : IArtifactSignature
{
+ ///
+ /// Gets the name.
+ ///
+ ///
+ /// The name.
+ ///
string Name { get; }
+ ///
+ /// Gets the alias.
+ ///
+ ///
+ /// The alias.
+ ///
string? Alias { get; }
}
diff --git a/src/Umbraco.Core/Deploy/IArtifactSignature.cs b/src/Umbraco.Core/Deploy/IArtifactSignature.cs
index f1dd35295f..ca34fdb894 100644
--- a/src/Umbraco.Core/Deploy/IArtifactSignature.cs
+++ b/src/Umbraco.Core/Deploy/IArtifactSignature.cs
@@ -1,46 +1,55 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Represents the signature of an artifact.
+/// Represents the signature of an artifact.
///
public interface IArtifactSignature
{
///
- /// Gets the entity unique identifier of this artifact.
+ /// Gets the entity unique identifier of this artifact.
///
+ ///
+ /// The udi.
+ ///
///
- ///
- /// The project identifier is independent from the state of the artifact, its data
- /// values, dependencies, anything. It never changes and fully identifies the artifact.
- ///
- ///
- /// What an entity uses as a unique identifier will influence what we can transfer
- /// between environments. Eg content type "Foo" on one environment is not necessarily the
- /// same as "Foo" on another environment, if guids are used as unique identifiers. What is
- /// used should be documented for each entity, along with the consequences of the choice.
- ///
+ ///
+ /// The project identifier is independent from the state of the artifact, its data
+ /// values, dependencies, anything. It never changes and fully identifies the artifact.
+ ///
+ ///
+ /// What an entity uses as a unique identifier will influence what we can transfer
+ /// between environments. Eg content type "Foo" on one environment is not necessarily the
+ /// same as "Foo" on another environment, if guids are used as unique identifiers. What is
+ /// used should be documented for each entity, along with the consequences of the choice.
+ ///
///
Udi Udi { get; }
///
- /// Gets the checksum of this artifact.
+ /// Gets the checksum of this artifact.
///
+ ///
+ /// The checksum.
+ ///
///
- ///
- /// The checksum depends on the artifact's properties, and on the identifiers of all its dependencies,
- /// but not on their checksums. So the checksum changes when any of the artifact's properties changes,
- /// or when the list of dependencies changes. But not if one of these dependencies change.
- ///
- ///
- /// It is assumed that checksum collisions cannot happen ie that no two different artifact's
- /// states will ever produce the same checksum, so that if two artifacts have the same checksum then
- /// they are identical.
- ///
+ ///
+ /// The checksum depends on the artifact's properties, and on the identifiers of all its dependencies,
+ /// but not on their checksums. So the checksum changes when any of the artifact's properties changes,
+ /// or when the list of dependencies changes. But not if one of these dependencies change.
+ ///
+ ///
+ /// It is assumed that checksum collisions cannot happen ie that no two different artifact's
+ /// states will ever produce the same checksum, so that if two artifacts have the same checksum then
+ /// they are identical.
+ ///
///
string Checksum { get; }
///
- /// Gets the dependencies of this artifact.
+ /// Gets the dependencies of this artifact.
///
+ ///
+ /// The dependencies.
+ ///
IEnumerable Dependencies { get; }
}
diff --git a/src/Umbraco.Core/Deploy/IDeployContext.cs b/src/Umbraco.Core/Deploy/IDeployContext.cs
index bdc8fd8d61..f706cbd3ae 100644
--- a/src/Umbraco.Core/Deploy/IDeployContext.cs
+++ b/src/Umbraco.Core/Deploy/IDeployContext.cs
@@ -1,39 +1,56 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Represents a deployment context.
+/// Represents a deployment context.
///
public interface IDeployContext
{
///
- /// Gets the unique identifier of the deployment.
+ /// Gets the unique identifier of the deployment.
///
+ ///
+ /// The session identifier.
+ ///
Guid SessionId { get; }
///
- /// Gets the file source.
+ /// Gets the file source.
///
- /// The file source is used to obtain files from the source environment.
+ ///
+ /// The file source.
+ ///
+ ///
+ /// The file source is used to obtain files from the source environment.
+ ///
IFileSource FileSource { get; }
///
- /// Gets items.
+ /// Gets items.
///
+ ///
+ /// The items.
+ ///
IDictionary Items { get; }
///
- /// Gets the next number in a numerical sequence.
+ /// Gets the next number in a numerical sequence.
///
- /// The next sequence number.
- /// Can be used to uniquely number things during a deployment.
+ ///
+ /// The next sequence number.
+ ///
+ ///
+ /// Can be used to uniquely number things during a deployment.
+ ///
int NextSeq();
///
- /// Gets item.
+ /// Gets item.
///
/// The type of the item.
/// The key of the item.
- /// The item with the specified key and type, if any, else null.
+ ///
+ /// The item with the specified key and type, if any, else null.
+ ///
T? Item(string key)
where T : class;
diff --git a/src/Umbraco.Core/Deploy/IFileSource.cs b/src/Umbraco.Core/Deploy/IFileSource.cs
index d3f6ebe770..92eb125d9e 100644
--- a/src/Umbraco.Core/Deploy/IFileSource.cs
+++ b/src/Umbraco.Core/Deploy/IFileSource.cs
@@ -1,70 +1,86 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Represents a file source, ie a mean for a target environment involved in a
-/// deployment to obtain the content of files being deployed.
+/// Represents a file source, ie a mean for a target environment involved in a
+/// deployment to obtain the content of files being deployed.
///
public interface IFileSource
{
///
- /// Gets the content of a file as a stream.
+ /// Gets the content of a file as a stream.
///
/// A file entity identifier.
- /// A stream with read access to the file content.
+ ///
+ /// A stream with read access to the file content.
+ ///
///
- /// Returns null if no content could be read.
- /// The caller should ensure that the stream is properly closed/disposed.
+ /// Returns null if no content could be read.
+ /// The caller should ensure that the stream is properly closed/disposed.
///
Stream GetFileStream(StringUdi udi);
///
- /// Gets the content of a file as a stream.
+ /// Gets the content of a file as a stream.
///
/// A file entity identifier.
/// A cancellation token.
- /// A stream with read access to the file content.
+ ///
+ /// A stream with read access to the file content.
+ ///
///
- /// Returns null if no content could be read.
- /// The caller should ensure that the stream is properly closed/disposed.
+ /// Returns null if no content could be read.
+ /// The caller should ensure that the stream is properly closed/disposed.
///
Task GetFileStreamAsync(StringUdi udi, CancellationToken token);
///
- /// Gets the content of a file as a string.
+ /// Gets the content of a file as a string.
///
/// A file entity identifier.
- /// A string containing the file content.
- /// Returns null if no content could be read.
+ ///
+ /// A string containing the file content.
+ ///
+ ///
+ /// Returns null if no content could be read.
+ ///
string GetFileContent(StringUdi udi);
///
- /// Gets the content of a file as a string.
+ /// Gets the content of a file as a string.
///
/// A file entity identifier.
/// A cancellation token.
- /// A string containing the file content.
- /// Returns null if no content could be read.
+ ///
+ /// A string containing the file content.
+ ///
+ ///
+ /// Returns null if no content could be read.
+ ///
Task GetFileContentAsync(StringUdi udi, CancellationToken token);
///
- /// Gets the length of a file.
+ /// Gets the length of a file.
///
/// A file entity identifier.
- /// The length of the file, or -1 if the file does not exist.
+ ///
+ /// The length of the file, or -1 if the file does not exist.
+ ///
long GetFileLength(StringUdi udi);
///
- /// Gets the length of a file.
+ /// Gets the length of a file.
///
/// A file entity identifier.
/// A cancellation token.
- /// The length of the file, or -1 if the file does not exist.
+ ///
+ /// The length of the file, or -1 if the file does not exist.
+ ///
Task GetFileLengthAsync(StringUdi udi, CancellationToken token);
// TODO (V14): Remove obsolete methods and default implementations for GetFiles and GetFilesAsync overloads.
///
- /// Gets files and store them using a file store.
+ /// Gets files and store them using a file store.
///
/// The UDIs of the files to get.
/// A collection of file types which can store the files.
@@ -72,32 +88,38 @@ public interface IFileSource
void GetFiles(IEnumerable udis, IFileTypeCollection fileTypes);
///
- /// Gets files and store them using a file store.
+ /// Gets files and store them using a file store.
///
/// The UDIs of the files to get.
- /// A collection of file types which can store the files.
/// A flag indicating whether to continue if a file isn't found or to stop and throw a FileNotFoundException.
+ /// A collection of file types which can store the files.
void GetFiles(IEnumerable udis, bool continueOnFileNotFound, IFileTypeCollection fileTypes)
#pragma warning disable CS0618 // Type or member is obsolete
=> GetFiles(udis, fileTypes);
#pragma warning restore CS0618 // Type or member is obsolete
///
- /// Gets files and store them using a file store.
+ /// Gets files and store them using a file store.
///
/// The UDIs of the files to get.
/// A collection of file types which can store the files.
/// A cancellation token.
+ ///
+ /// The task object representing the asynchronous operation.
+ ///
[Obsolete("Please use the method overload taking all parameters. This method overload will be removed in Umbraco 14.")]
Task GetFilesAsync(IEnumerable udis, IFileTypeCollection fileTypes, CancellationToken token);
///
- /// Gets files and store them using a file store.
+ /// Gets files and store them using a file store.
///
/// The UDIs of the files to get.
/// A collection of file types which can store the files.
/// A flag indicating whether to continue if a file isn't found or to stop and throw a FileNotFoundException.
/// A cancellation token.
+ ///
+ /// The task object representing the asynchronous operation.
+ ///
Task GetFilesAsync(IEnumerable udis, IFileTypeCollection fileTypes, bool continueOnFileNotFound, CancellationToken token)
#pragma warning disable CS0618 // Type or member is obsolete
=> GetFilesAsync(udis, fileTypes, token);
diff --git a/src/Umbraco.Core/Deploy/IFileType.cs b/src/Umbraco.Core/Deploy/IFileType.cs
index 466c87a3ed..dfd80e2c1e 100644
--- a/src/Umbraco.Core/Deploy/IFileType.cs
+++ b/src/Umbraco.Core/Deploy/IFileType.cs
@@ -1,27 +1,101 @@
namespace Umbraco.Cms.Core.Deploy;
+///
+/// Represents a deployable file type.
+///
public interface IFileType
{
+ ///
+ /// Gets a value indicating whether the file can be set using a physical path.
+ ///
+ ///
+ /// true if the file can be set using a physical path; otherwise, false.
+ ///
bool CanSetPhysical { get; }
+ ///
+ /// Gets the stream.
+ ///
+ /// The UDI.
+ ///
+ /// The stream.
+ ///
Stream GetStream(StringUdi udi);
+ ///
+ /// Gets the stream as an asynchronous operation.
+ ///
+ /// The UDI.
+ /// The cancellation token.
+ ///
+ /// The task object representing the asynchronous operation.
+ ///
Task GetStreamAsync(StringUdi udi, CancellationToken token);
+ ///
+ /// Gets the checksum stream.
+ ///
+ /// The UDI.
+ ///
+ /// The checksum stream.
+ ///
Stream GetChecksumStream(StringUdi udi);
+ ///
+ /// Gets the file length in bytes or -1 if not found.
+ ///
+ /// The UDI.
+ ///
+ /// The file length in bytes or -1 if not found.
+ ///
long GetLength(StringUdi udi);
+ ///
+ /// Sets the stream.
+ ///
+ /// The UDI.
+ /// The stream.
void SetStream(StringUdi udi, Stream stream);
+ ///
+ /// Sets the stream as an asynchronous operation.
+ ///
+ /// The UDI.
+ /// The stream.
+ /// The cancellation token.
+ ///
+ /// The task object representing the asynchronous operation.
+ ///
Task SetStreamAsync(StringUdi udi, Stream stream, CancellationToken token);
+ ///
+ /// Sets the physical path of the file.
+ ///
+ /// The UDI.
+ /// The physical path.
+ /// If set to true copies the file instead of moving.
void Set(StringUdi udi, string physicalPath, bool copy = false);
- // this is not pretty as *everywhere* in Deploy we take care of ignoring
- // the physical path and always rely on Core's virtual IFileSystem but
- // Cloud wants to add some of these files to Git and needs the path...
+ ///
+ /// Gets the physical path or if not found.
+ ///
+ /// The UDI.
+ ///
+ /// The physical path or if not found.
+ ///
+ ///
+ /// This is not pretty as *everywhere* in Deploy we take care of ignoring
+ /// the physical path and always rely on the virtual IFileSystem,
+ /// but Cloud wants to add some of these files to Git and needs the path...
+ ///
string GetPhysicalPath(StringUdi udi);
+ ///
+ /// Gets the virtual path or if not found.
+ ///
+ /// The UDI.
+ ///
+ /// The virtual path or if not found.
+ ///
string GetVirtualPath(StringUdi udi);
}
diff --git a/src/Umbraco.Core/Deploy/IFileTypeCollection.cs b/src/Umbraco.Core/Deploy/IFileTypeCollection.cs
index 2ae2bb4bb9..5dc03eb185 100644
--- a/src/Umbraco.Core/Deploy/IFileTypeCollection.cs
+++ b/src/Umbraco.Core/Deploy/IFileTypeCollection.cs
@@ -1,8 +1,59 @@
+using System.Diagnostics.CodeAnalysis;
+
namespace Umbraco.Cms.Core.Deploy;
+///
+/// Represents a collection of deployable file types used for each specific entity type.
+///
public interface IFileTypeCollection
{
+ ///
+ /// Gets the for the specified entity type.
+ ///
+ ///
+ /// The .
+ ///
+ /// The entity type.
+ ///
+ /// The for the specified entity type.
+ ///
IFileType this[string entityType] { get; }
+ ///
+ /// Gets the for the specified entity type.
+ ///
+ /// The entity type.
+ /// When this method returns, contains the file type associated with the specified entity type, if the item is found; otherwise, null.
+ ///
+ /// true if the file type associated with the specified entity type was found; otherwise, false.
+ ///
+ bool TryGetValue(string entityType, [NotNullWhen(true)] out IFileType? fileType)
+ {
+ // TODO (V14): Remove default implementation
+ if (Contains(entityType))
+ {
+ fileType = this[entityType];
+ return true;
+ }
+
+ fileType = null;
+ return false;
+ }
+
+ ///
+ /// Determines whether this collection contains a file type for the specified entity type.
+ ///
+ /// The entity type.
+ ///
+ /// true if this collection contains a file type for the specified entity type; otherwise, false.
+ ///
bool Contains(string entityType);
+
+ ///
+ /// Gets the entity types.
+ ///
+ ///
+ /// The entity types.
+ ///
+ ICollection GetEntityTypes() => Array.Empty(); // TODO (V14): Remove default implementation
}
diff --git a/src/Umbraco.Core/Deploy/IImageSourceParser.cs b/src/Umbraco.Core/Deploy/IImageSourceParser.cs
index cbbaa6bc9a..861e15dc1b 100644
--- a/src/Umbraco.Core/Deploy/IImageSourceParser.cs
+++ b/src/Umbraco.Core/Deploy/IImageSourceParser.cs
@@ -1,49 +1,67 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Provides methods to parse image tag sources in property values.
+/// Provides methods to parse image tag sources in property values.
///
public interface IImageSourceParser
{
///
- /// Parses an Umbraco property value and produces an artifact property value.
+ /// Parses an Umbraco property value and produces an artifact property value.
///
/// The property value.
/// A list of dependencies.
- /// The parsed value.
- /// Turns src="/media/..." into src="umb://media/..." and adds the corresponding udi to the dependencies.
+ ///
+ /// The parsed value.
+ ///
+ ///
+ /// Turns src="/media/..." into src="umb://media/..." and adds the corresponding udi to the dependencies.
+ ///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string ToArtifact(string value, ICollection dependencies);
///
- /// Parses an Umbraco property value and produces an artifact property value.
+ /// Parses an Umbraco property value and produces an artifact property value.
///
/// The property value.
/// A list of dependencies.
/// The context cache.
- /// The parsed value.
- /// Turns src="/media/..." into src="umb://media/..." and adds the corresponding udi to the dependencies.
+ ///
+ /// The parsed value.
+ ///
+ ///
+ /// Turns src="/media/..." into src="umb://media/..." and adds the corresponding udi to the dependencies.
+ ///
+ string ToArtifact(string value, ICollection dependencies, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
- string ToArtifact(string value, ICollection dependencies, IContextCache contextCache) => ToArtifact(value, dependencies);
+ => ToArtifact(value, dependencies);
#pragma warning restore CS0618 // Type or member is obsolete
///
- /// Parses an artifact property value and produces an Umbraco property value.
+ /// Parses an artifact property value and produces an Umbraco property value.
///
/// The artifact property value.
- /// The parsed value.
- /// Turns umb://media/... into /media/....
+ ///
+ /// The parsed value.
+ ///
+ ///
+ /// Turns umb://media/... into /media/....
+ ///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string FromArtifact(string value);
///
- /// Parses an artifact property value and produces an Umbraco property value.
+ /// Parses an artifact property value and produces an Umbraco property value.
///
/// The artifact property value.
/// The context cache.
- /// The parsed value.
- /// Turns umb://media/... into /media/....
+ ///
+ /// The parsed value.
+ ///
+ ///
+ /// Turns umb://media/... into /media/....
+ ///
+ string FromArtifact(string value, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
- string FromArtifact(string value, IContextCache contextCache) => FromArtifact(value);
+ => FromArtifact(value);
#pragma warning restore CS0618 // Type or member is obsolete
}
diff --git a/src/Umbraco.Core/Deploy/ILocalLinkParser.cs b/src/Umbraco.Core/Deploy/ILocalLinkParser.cs
index d84bf35af1..9273faa054 100644
--- a/src/Umbraco.Core/Deploy/ILocalLinkParser.cs
+++ b/src/Umbraco.Core/Deploy/ILocalLinkParser.cs
@@ -1,55 +1,69 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Provides methods to parse local link tags in property values.
+/// Provides methods to parse local link tags in property values.
///
public interface ILocalLinkParser
{
///
- /// Parses an Umbraco property value and produces an artifact property value.
+ /// Parses an Umbraco property value and produces an artifact property value.
///
/// The property value.
/// A list of dependencies.
- /// The parsed value.
+ ///
+ /// The parsed value.
+ ///
///
- /// Turns {{localLink:1234}} into {{localLink:umb://{type}/{id}}} and adds the corresponding udi to the
- /// dependencies.
+ /// Turns {{localLink:1234}} into {{localLink:umb://{type}/{id}}} and adds the corresponding udi to the
+ /// dependencies.
///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string ToArtifact(string value, ICollection dependencies);
///
- /// Parses an Umbraco property value and produces an artifact property value.
+ /// Parses an Umbraco property value and produces an artifact property value.
///
/// The property value.
/// A list of dependencies.
/// The context cache.
- /// The parsed value.
+ ///
+ /// The parsed value.
+ ///
///
- /// Turns {{localLink:1234}} into {{localLink:umb://{type}/{id}}} and adds the corresponding udi to the
- /// dependencies.
+ /// Turns {{localLink:1234}} into {{localLink:umb://{type}/{id}}} and adds the corresponding udi to the
+ /// dependencies.
///
+ string ToArtifact(string value, ICollection dependencies, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
- string ToArtifact(string value, ICollection dependencies, IContextCache contextCache) => ToArtifact(value, dependencies);
+ => ToArtifact(value, dependencies);
#pragma warning restore CS0618 // Type or member is obsolete
///
- /// Parses an artifact property value and produces an Umbraco property value.
+ /// Parses an artifact property value and produces an Umbraco property value.
///
/// The artifact property value.
- /// The parsed value.
- /// Turns {{localLink:umb://{type}/{id}}} into {{localLink:1234}}.
+ ///
+ /// The parsed value.
+ ///
+ ///
+ /// Turns {{localLink:umb://{type}/{id}}} into {{localLink:1234}}.
+ ///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string FromArtifact(string value);
///
- /// Parses an artifact property value and produces an Umbraco property value.
+ /// Parses an artifact property value and produces an Umbraco property value.
///
/// The artifact property value.
/// The context cache.
- /// The parsed value.
- /// Turns {{localLink:umb://{type}/{id}}} into {{localLink:1234}}.
+ ///
+ /// The parsed value.
+ ///
+ ///
+ /// Turns {{localLink:umb://{type}/{id}}} into {{localLink:1234}}.
+ ///
+ string FromArtifact(string value, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
- string FromArtifact(string value, IContextCache contextCache) => FromArtifact(value);
+ => FromArtifact(value);
#pragma warning restore CS0618 // Type or member is obsolete
}
diff --git a/src/Umbraco.Core/Deploy/IMacroParser.cs b/src/Umbraco.Core/Deploy/IMacroParser.cs
index 17f06992d5..de14bb528f 100644
--- a/src/Umbraco.Core/Deploy/IMacroParser.cs
+++ b/src/Umbraco.Core/Deploy/IMacroParser.cs
@@ -1,65 +1,82 @@
namespace Umbraco.Cms.Core.Deploy;
+///
+/// Provides methods to parse macro tags in property values.
+///
public interface IMacroParser
{
///
- /// Parses an Umbraco property value and produces an artifact property value.
+ /// Parses an Umbraco property value and produces an artifact property value.
///
/// Property value.
/// A list of dependencies.
- /// Parsed value.
+ ///
+ /// Parsed value.
+ ///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string ToArtifact(string value, ICollection dependencies);
///
- /// Parses an Umbraco property value and produces an artifact property value.
+ /// Parses an Umbraco property value and produces an artifact property value.
///
/// Property value.
/// A list of dependencies.
/// The context cache.
- /// Parsed value.
+ ///
+ /// Parsed value.
+ ///
+ string ToArtifact(string value, ICollection dependencies, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
- string ToArtifact(string value, ICollection dependencies, IContextCache contextCache) => ToArtifact(value, dependencies);
+ => ToArtifact(value, dependencies);
#pragma warning restore CS0618 // Type or member is obsolete
///
- /// Parses an artifact property value and produces an Umbraco property value.
+ /// Parses an artifact property value and produces an Umbraco property value.
///
/// Artifact property value.
- /// Parsed value.
+ ///
+ /// Parsed value.
+ ///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string FromArtifact(string value);
///
- /// Parses an artifact property value and produces an Umbraco property value.
+ /// Parses an artifact property value and produces an Umbraco property value.
///
/// Artifact property value.
/// The context cache.
- /// Parsed value.
+ ///
+ /// Parsed value.
+ ///
+ string FromArtifact(string value, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
- string FromArtifact(string value, IContextCache contextCache) => FromArtifact(value);
+ => FromArtifact(value);
#pragma warning restore CS0618 // Type or member is obsolete
///
- /// Tries to replace the value of the attribute/parameter with a value containing a converted identifier.
+ /// Tries to replace the value of the attribute/parameter with a value containing a converted identifier.
///
/// Value to attempt to convert
/// Alias of the editor used for the parameter
/// Collection to add dependencies to when performing ToArtifact
/// Indicates which action is being performed (to or from artifact)
- /// Value with converted identifiers
+ ///
+ /// Value with converted identifiers
+ ///
[Obsolete("Please use the overload taking all parameters. This method will be removed in Umbraco 14.")]
string ReplaceAttributeValue(string value, string editorAlias, ICollection dependencies, Direction direction);
///
- /// Tries to replace the value of the attribute/parameter with a value containing a converted identifier.
+ /// Tries to replace the value of the attribute/parameter with a value containing a converted identifier.
///
/// Value to attempt to convert
/// Alias of the editor used for the parameter
/// Collection to add dependencies to when performing ToArtifact
/// Indicates which action is being performed (to or from artifact)
/// The context cache.
- /// Value with converted identifiers
+ ///
+ /// Value with converted identifiers
+ ///
string ReplaceAttributeValue(string value, string editorAlias, ICollection dependencies, Direction direction, IContextCache contextCache)
#pragma warning disable CS0618 // Type or member is obsolete
=> ReplaceAttributeValue(value, editorAlias, dependencies, direction);
diff --git a/src/Umbraco.Core/Deploy/IServiceConnector.cs b/src/Umbraco.Core/Deploy/IServiceConnector.cs
index 84617943c6..e831ed9e08 100644
--- a/src/Umbraco.Core/Deploy/IServiceConnector.cs
+++ b/src/Umbraco.Core/Deploy/IServiceConnector.cs
@@ -5,7 +5,6 @@ namespace Umbraco.Cms.Core.Deploy;
///
/// Connects to an Umbraco service.
///
-///
public interface IServiceConnector : IDiscoverable
{
///
diff --git a/src/Umbraco.Core/Deploy/IUniqueIdentifyingServiceConnector.cs b/src/Umbraco.Core/Deploy/IUniqueIdentifyingServiceConnector.cs
index c68906bbbf..3178328e03 100644
--- a/src/Umbraco.Core/Deploy/IUniqueIdentifyingServiceConnector.cs
+++ b/src/Umbraco.Core/Deploy/IUniqueIdentifyingServiceConnector.cs
@@ -1,24 +1,26 @@
namespace Umbraco.Cms.Core.Deploy;
///
-/// Provides a method to retrieve an artifact's unique identifier.
+/// Provides a method to retrieve an artifact's unique identifier.
///
///
-/// Artifacts are uniquely identified by their , however they represent
-/// elements in Umbraco that may be uniquely identified by another value. For example,
-/// a content type is uniquely identified by its alias. If someone creates a new content
-/// type, and tries to deploy it to a remote environment where a content type with the
-/// same alias already exists, both content types end up having different
-/// but the same alias. By default, Deploy would fail and throw when trying to save the
-/// new content type (duplicate alias). However, if the connector also implements this
-/// interface, the situation can be detected beforehand and reported in a nicer way.
+/// Artifacts are uniquely identified by their , however they represent
+/// elements in Umbraco that may be uniquely identified by another value. For example,
+/// a content type is uniquely identified by its alias. If someone creates a new content
+/// type, and tries to deploy it to a remote environment where a content type with the
+/// same alias already exists, both content types end up having different
+/// but the same alias. By default, Deploy would fail and throw when trying to save the
+/// new content type (duplicate alias). However, if the connector also implements this
+/// interface, the situation can be detected beforehand and reported in a nicer way.
///
public interface IUniqueIdentifyingServiceConnector
{
///
- /// Gets the unique identifier of the specified artifact.
+ /// Gets the unique identifier of the specified artifact.
///
/// The artifact.
- /// The unique identifier.
+ ///
+ /// The unique identifier.
+ ///
string GetUniqueIdentifier(IArtifact artifact);
}
diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml
index d8623a90a7..1a69568c79 100644
--- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml
+++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml
@@ -17,7 +17,7 @@
Opret gruppe
Slet
Deaktivér
- Edit settings
+ Redigér indstillinger
Tøm papirkurv
Aktivér
Eksportér dokumenttype
@@ -26,7 +26,7 @@
Redigér i Canvas
Log af
Flyt
- Notificeringer
+ Notifikationer
Offentlig adgang
Udgiv
Afpublicér
@@ -84,7 +84,7 @@
Tillad adgang til at oversætte en node
Tillad adgang til at gemme en node
Tillad adgang til at oprette en indholdsskabelon
- Tillad adgang til at oprette notificeringer for noder
+ Tillad adgang til at oprette notifikationer for noder
Indhold
@@ -105,10 +105,10 @@
Domænet '%0%' er nu opdateret
eller rediger nuværende domæner
+ Yderligere understøttes også første niveau af stien efter domænet, f.eks. "example.com/en" eller "/en". ]]>
Nedarv
Sprog
- eller nedarv sprog fra forældre noder. Gælder også
+ eller nedarv sprog fra forældernoder. Gælder også
for den aktuelle node, medmindre et domæne nedenfor også indstiller et sprog.]]>
Domæner
@@ -120,7 +120,7 @@
Fortryd indryk afsnit
Indsæt formularfelt
Indsæt grafisk overskrift
- Redigér Html
+ Redigér HTML
Indryk afsnit
Kursiv
Centrér
@@ -154,7 +154,7 @@
Slet tag
Fortryd
Bekræft
- Flere publiseringsmuligheder
+ Flere publiceringsmuligheder
Indsæt
@@ -243,21 +243,21 @@
Ups: dette dokument er udgivet, men er ikke i cachen (intern fejl)
Kunne ikke hente URL'en
Dette dokument er udgivet, men dets URL ville kollidere med indholdet %0%
- Dette dokument er udgivet, men dets URL kan ikke dirigeres
+ Dette dokument er udgivet, men dets URL kan ikke genereres
Udgiv
Udgivet
Udgivet (Ventede ændringer)
Udgivelsesstatus
- Udgiv med undersider for at udgive %0% og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]>
+ Udgiv med undersider for at udgive %0% og alle sider under, og dermed gøre deres indhold offentligt tilgængeligt.]]>
- Udgiv med undersider for at udgive de valgte sprog og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]>
+ Udgiv med undersider for at udgive de valgte sprog og de samme sprog for sider under, og dermed gøre deres indhold offentligt tilgængeligt.]]>
Udgivelsesdato
Afpubliceringsdato
Fjern dato
Vælg dato
Sorteringsrækkefølgen er opdateret
- For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider
+ For at sortere, træk siderne eller klik på en af kolonneoverskrifterne. Du kan vælge flere sider
ved at holde "shift" eller "control" nede mens du vælger.
Statistik
@@ -298,8 +298,8 @@
Fjern denne tekstboks
Indholdsrod
Inkluder ikke-udgivet indhold.
- Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du
- kontakte din web-administrator.
+ Denne værdi er skjult. Hvis du har brug for adgang til at se denne værdi, bedes du
+ kontakte din administrator.
Denne værdi er skjult.
Hvilke sprog vil du gerne udgive?
@@ -334,11 +334,11 @@
Klik for at uploade
eller klik her for at vælge filer
- Kan ikke uploade denne fil, den har ikke en godkendt filtype
- Maks filstørrelse er
+ Kan ikke uploade denne fil; den har ikke en godkendt filtype
+ Maksimal filstørrelse er
Medie rod
- Overordnet og destinations mappe kan ikke være den samme
- Oprettelse af mappen under parent med id %0% fejlede
+ Overordnet og destinationsmappe kan ikke være den samme
+ Oprettelse af mappen under node med id %0% fejlede
Omdøbning af mappen med id %0% fejlede
Træk dine filer ind i dropzonen for, at uploade dem til
mediebiblioteket.
@@ -348,7 +348,7 @@
Opret et nyt medlem
Alle medlemmer
- Medlemgrupper har ingen yderligere egenskaber til redigering.
+ Medlemsgrupper har ingen yderligere egenskaber til redigering.
Totrinsbekræftelse
@@ -358,7 +358,7 @@
Kopiering af medietypen fejlede
Flytning af medietypen fejlede
- Auto vælg
+ Vælg automatisk
Kopiering af medlemstypen fejlede
@@ -370,18 +370,18 @@
Angiv et navn for mappen
Vælg en type og skriv en titel
- "dokumenttyper".]]>
+ Indstillinger under "Dokumenttyper".]]>
- Document Types within the Settings section.]]>
+ Dokumenttyper i Indstillinger-sektionen.]]>
Den valgte side i træet tillader ikke at sider oprettes under
den.
Rediger tilladelser for denne dokumenttype.
Opret en ny dokumenttype
- Dokumenttyper inde i Indstillinger sektionen, ved at ændre Tillad på rodniveau indestillingen under Permissions.]]>
+ Dokumenttyper inde i Indstillinger sektionen, ved at ændre Tillad på rodniveau indstillingen under Permissions.]]>
- "media typer".]]>
+ "Medietyper".]]>
Det valgte medie i træet tillader ikke at medier oprettes under det.
Rediger tilladelser for denne medietype.
@@ -436,7 +436,7 @@
Udgivelse vil gøre de valgte sider synlige på sitet.
Afpublicering vil fjerne de valgte sider og deres undersider fra sitet.
- Afpublicering vil fjerne denne side og alle dets undersider fra websitet.
+ Afpublicering vil fjerne denne side og alle dens undersider fra websitet.
Du har ikke-gemte ændringer. Hvis du ændrer dokumenttype, kasseres ændringerne.
@@ -871,6 +871,7 @@
Avatar til
Overskrift
system felt
+ Primær
BlĂĄ
@@ -1012,7 +1013,7 @@
Tilføj dokument type
Tilføj medie Type
Opret header
- Logs
+ Leverancer
Der er ikke tilføjet nogen webhook headers
@@ -1084,8 +1085,8 @@
Relater det kopierede element til originalen
- %0%]]>
- Notificeringer er gemt for
+ %0%]]>
+ Notifikationer er gemt for
RET