V14/merge

src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj

@@ -2,10 +2,6 @@
   <PropertyGroup>
     <Title>Umbraco CMS - API Common</Title>
     <Description>Contains the bits and pieces that are shared between the Umbraco CMS APIs.</Description>
-    <IsPackable>true</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
-    <AssemblyName>Umbraco.Cms.Api.Common</AssemblyName>
-    <RootNamespace>Umbraco.Cms.Api.Common</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,6 +15,7 @@
     <PackageReference Include="OpenIddict.Abstractions" Version="4.5.0" />
     <PackageReference Include="OpenIddict.AspNetCore" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Cms.Persistence.EFCore.Sqlite\Umbraco.Cms.Persistence.EFCore.Sqlite.csproj" />
     <ProjectReference Include="..\Umbraco.Cms.Persistence.EFCore.SqlServer\Umbraco.Cms.Persistence.EFCore.SqlServer.csproj" />

src/Umbraco.Cms.Api.Delivery/Umbraco.Cms.Api.Delivery.csproj

@@ -2,14 +2,8 @@
   <PropertyGroup>
     <Title>Umbraco CMS - Delivery API</Title>
     <Description>Contains the presentation layer for the Umbraco CMS Delivery API.</Description>
-    <IsPackable>true</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
-    <AssemblyName>Umbraco.Cms.Api.Delivery</AssemblyName>
-    <RootNamespace>Umbraco.Cms.Api.Delivery</RootNamespace>
-    <PackageId>Umbraco.Cms.Api.Delivery</PackageId>
   </PropertyGroup>
 
-
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj" />
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />

src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj

@@ -2,8 +2,6 @@
   <PropertyGroup>
     <Title>Umbraco CMS - Imaging - ImageSharp 2</Title>
     <Description>Adds imaging support using ImageSharp/ImageSharp.Web version 2 to Umbraco CMS.</Description>
-    <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>

src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj

@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Title>Umbraco CMS - EF Core - SqlServer migrations</Title>
+    <Title>Umbraco CMS - Persistence - Entity Framework Core - SQL Server migrations</Title>
+    <Description>Adds support for Entity Framework Core SQL Server migrations to Umbraco CMS.</Description>
     <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>

src/Umbraco.Cms.Persistence.EFCore.Sqlite/Umbraco.Cms.Persistence.EFCore.Sqlite.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Title>Umbraco CMS - EF Core - Sqlite migrations</Title>
+    <Title>Umbraco CMS - Persistence - Entity Framework Core - SQLite migrations</Title>
+    <Description>Adds support for Entity Framework Core SQLite migrations to Umbraco CMS.</Description>
     <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>

src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Title>Umbraco CMS - Persistence - EFCore</Title>
-    <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
-    <EnablePackageValidation>false</EnablePackageValidation>
+    <Title>Umbraco CMS - Persistence - Entity Framework Core</Title>
+    <Description>Adds support for Entity Framework Core to Umbraco CMS.</Description>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,5 +20,4 @@
       <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
-
 </Project>

src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerSyntaxProvider.cs

@@ -81,15 +81,16 @@ public override DatabaseType GetUpdatedDatabaseType(DatabaseType current, string
         var setting = _globalSettings.Value.DatabaseFactoryServerVersion;
         var fromSettings = false;
 
-        if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.")
-                                         || !Enum<VersionName>.TryParse(setting.Substring("SqlServer.".Length), out VersionName versionName, true))
+        if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.") || !Enum.TryParse(setting.AsSpan("SqlServer.".Length), true, out VersionName versionName))
         {
             versionName = GetSetVersion(connectionString, ProviderName, _logger).ProductVersionName;
         }
+
         if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
         {
             _logger.LogDebug("SqlServer {SqlServerVersion}, DatabaseType is {DatabaseType} ({Source}).", versionName, DatabaseType.SqlServer2012, fromSettings ? "settings" : "detected");
         }
+
         return DatabaseType.SqlServer2012;
     }
 

src/Umbraco.Core/Configuration/Models/ContentSettings.cs

@@ -191,7 +191,7 @@ public class ContentSettings
     ///     Gets or sets a value for the macro error behaviour.
     /// </summary>
     [DefaultValue(StaticMacroErrors)]
-    public MacroErrorBehaviour MacroErrors { get; set; } = Enum<MacroErrorBehaviour>.Parse(StaticMacroErrors);
+    public MacroErrorBehaviour MacroErrors { get; set; } = Enum.Parse<MacroErrorBehaviour>(StaticMacroErrors);
 
     /// <summary>
     ///     Gets or sets a value for the collection of file extensions that are disallowed for upload.
@@ -243,7 +243,7 @@ public class ContentSettings
     public bool DisableUnpublishWhenReferenced { get; set; } = StaticDisableUnpublishWhenReferenced;
 
     /// <summary>
-    ///     Get or sets the model representing the global content version cleanup policy
+    ///     Gets or sets the model representing the global content version cleanup policy
     /// </summary>
     public ContentVersionCleanupPolicySettings ContentVersionCleanupPolicy { get; set; } = new();
 

src/Umbraco.Core/Configuration/Models/HealthChecksNotificationMethodSettings.cs

@@ -25,8 +25,7 @@ public class HealthChecksNotificationMethodSettings
     ///     Gets or sets a value for the health check notifications reporting verbosity.
     /// </summary>
     [DefaultValue(StaticVerbosity)]
-    public HealthCheckNotificationVerbosity Verbosity { get; set; } =
-        Enum<HealthCheckNotificationVerbosity>.Parse(StaticVerbosity);
+    public HealthCheckNotificationVerbosity Verbosity { get; set; } = Enum.Parse<HealthCheckNotificationVerbosity>(StaticVerbosity);
 
     /// <summary>
     ///     Gets or sets a value indicating whether the health check notifications should occur on failures only.

src/Umbraco.Core/Configuration/Models/HostingSettings.cs

@@ -23,8 +23,7 @@ public class HostingSettings
     ///     Gets or sets a value for the location of temporary files.
     /// </summary>
     [DefaultValue(StaticLocalTempStorageLocation)]
-    public LocalTempStorage LocalTempStorageLocation { get; set; } =
-        Enum<LocalTempStorage>.Parse(StaticLocalTempStorageLocation);
+    public LocalTempStorage LocalTempStorageLocation { get; set; } = Enum.Parse<LocalTempStorage>(StaticLocalTempStorageLocation);
 
     /// <summary>
     ///     Gets or sets a value indicating whether umbraco is running in [debug mode].

src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs

@@ -22,7 +22,7 @@ public class ModelsBuilderSettings
     ///     Gets or sets a value for the models mode.
     /// </summary>
     [DefaultValue(StaticModelsMode)]
-    public ModelsMode ModelsMode { get; set; } = Enum<ModelsMode>.Parse(StaticModelsMode);
+    public ModelsMode ModelsMode { get; set; } = Enum.Parse<ModelsMode>(StaticModelsMode);
 
     /// <summary>
     ///     Gets or sets a value for models namespace.
@@ -52,10 +52,9 @@ public bool FlagOutOfDateModels
             return _flagOutOfDateModels;
         }
 
-            set => _flagOutOfDateModels = value;
+        set => _flagOutOfDateModels = value;
     }
 
-
     /// <summary>
     ///     Gets or sets a value for the models directory.
     /// </summary>

src/Umbraco.Core/Configuration/Models/NuCacheSettings.cs

@@ -24,8 +24,7 @@ public class NuCacheSettings
     ///     The serializer type that nucache uses to persist documents in the database.
     /// </summary>
     [DefaultValue(StaticNuCacheSerializerType)]
-    public NuCacheSerializerType NuCacheSerializerType { get; set; } =
-        Enum<NuCacheSerializerType>.Parse(StaticNuCacheSerializerType);
+    public NuCacheSerializerType NuCacheSerializerType { get; set; } = Enum.Parse<NuCacheSerializerType>(StaticNuCacheSerializerType);
 
     /// <summary>
     ///     The paging size to use for nucache SQL queries.

src/Umbraco.Core/Configuration/Models/RuntimeMinificationSettings.cs

@@ -19,8 +19,7 @@ public class RuntimeMinificationSettings
     ///     The cache buster type to use
     /// </summary>
     [DefaultValue(StaticCacheBuster)]
-    public RuntimeMinificationCacheBuster CacheBuster { get; set; } =
-        Enum<RuntimeMinificationCacheBuster>.Parse(StaticCacheBuster);
+    public RuntimeMinificationCacheBuster CacheBuster { get; set; } = Enum.Parse<RuntimeMinificationCacheBuster>(StaticCacheBuster);
 
     /// <summary>
     ///     The unique version string used if CacheBuster is 'Version'.

src/Umbraco.Core/Configuration/Models/SmtpSettings.cs

@@ -74,8 +74,7 @@ public class SmtpSettings : ValidatableEntryBase
     ///     Gets or sets a value for the secure socket options.
     /// </summary>
     [DefaultValue(StaticSecureSocketOptions)]
-    public SecureSocketOptions SecureSocketOptions { get; set; } =
-        Enum<SecureSocketOptions>.Parse(StaticSecureSocketOptions);
+    public SecureSocketOptions SecureSocketOptions { get; set; } = Enum.Parse<SecureSocketOptions>(StaticSecureSocketOptions);
 
     /// <summary>
     ///     Gets or sets a value for the SMTP pick-up directory.
@@ -86,7 +85,7 @@ public class SmtpSettings : ValidatableEntryBase
     ///     Gets or sets a value for the SMTP delivery method.
     /// </summary>
     [DefaultValue(StaticDeliveryMethod)]
-    public SmtpDeliveryMethod DeliveryMethod { get; set; } = Enum<SmtpDeliveryMethod>.Parse(StaticDeliveryMethod);
+    public SmtpDeliveryMethod DeliveryMethod { get; set; } = Enum.Parse<SmtpDeliveryMethod>(StaticDeliveryMethod);
 
     /// <summary>
     ///     Gets or sets a value for the SMTP user name.

src/Umbraco.Core/Configuration/Models/WebRoutingSettings.cs

@@ -75,7 +75,7 @@ public class WebRoutingSettings
     ///     Gets or sets a value for the URL provider mode (<see cref="UrlMode" />).
     /// </summary>
     [DefaultValue(StaticUrlProviderMode)]
-    public UrlMode UrlProviderMode { get; set; } = Enum<UrlMode>.Parse(StaticUrlProviderMode);
+    public UrlMode UrlProviderMode { get; set; } = Enum.Parse<UrlMode>(StaticUrlProviderMode);
 
     /// <summary>
     ///     Gets or sets a value for the Umbraco application URL.

src/Umbraco.Core/Dictionary/ICultureDictionaryFactory.cs

@@ -1,6 +1,10 @@
+using System.Globalization;
+
 namespace Umbraco.Cms.Core.Dictionary;
 
 public interface ICultureDictionaryFactory
 {
     ICultureDictionary CreateDictionary();
+
+    ICultureDictionary CreateDictionary(CultureInfo specificCulture)  => throw new NotImplementedException();
 }

src/Umbraco.Core/Dictionary/UmbracoCultureDictionary.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using System.Text.RegularExpressions;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
@@ -47,7 +48,7 @@ public DefaultCultureDictionary(CultureInfo specificCulture, ILocalizationServic
     }
 
     /// <summary>
-    ///     Returns the current culture
+    ///     Returns the defualt umbraco's back office culture
     /// </summary>
     public CultureInfo Culture => _specificCulture ?? Thread.CurrentThread.CurrentUICulture;
 

src/Umbraco.Core/Dictionary/UmbracoCultureDictionaryFactory.cs

@@ -1,3 +1,4 @@
+using System.Globalization;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Services;
 
@@ -23,4 +24,7 @@ public DefaultCultureDictionaryFactory(ILocalizationService localizationService,
 
     public ICultureDictionary CreateDictionary() =>
         new DefaultCultureDictionary(_localizationService, _appCaches.RequestCache);
+
+    public ICultureDictionary CreateDictionary(CultureInfo specificCulture) =>
+        new DefaultCultureDictionary(specificCulture, _localizationService, _appCaches.RequestCache);
 }

src/Umbraco.Core/Enum.cs

@@ -22,7 +22,7 @@ static Enum()
         IntToValue = new Dictionary<int, T>();
         ValueToName = new Dictionary<T, string>();
         SensitiveNameToValue = new Dictionary<string, T>();
-        InsensitiveNameToValue = new Dictionary<string, T>();
+        InsensitiveNameToValue = new Dictionary<string, T>(StringComparer.InvariantCultureIgnoreCase);
 
         foreach (T value in Values)
         {
@@ -31,15 +31,15 @@ static Enum()
             IntToValue[Convert.ToInt32(value)] = value;
             ValueToName[value] = name!;
             SensitiveNameToValue[name!] = value;
-            InsensitiveNameToValue[name!.ToLowerInvariant()] = value;
+            InsensitiveNameToValue[name!] = value;
         }
     }
 
-    public static bool IsDefined(T value) => ValueToName.Keys.Contains(value);
+    public static bool IsDefined(T value) => ValueToName.ContainsKey(value);
 
-    public static bool IsDefined(string value) => SensitiveNameToValue.Keys.Contains(value);
+    public static bool IsDefined(string value) => SensitiveNameToValue.ContainsKey(value);
 
-    public static bool IsDefined(int value) => IntToValue.Keys.Contains(value);
+    public static bool IsDefined(int value) => IntToValue.ContainsKey(value);
 
     public static IEnumerable<T> GetValues() => Values;
 
@@ -50,28 +50,15 @@ static Enum()
     public static T Parse(string value, bool ignoreCase = false)
     {
         Dictionary<string, T> names = ignoreCase ? InsensitiveNameToValue : SensitiveNameToValue;
-        if (ignoreCase)
-        {
-            value = value.ToLowerInvariant();
-        }
 
-        if (names.TryGetValue(value, out T parsed))
-        {
-            return parsed;
-        }
+        return names.TryGetValue(value, out T parsed) ? parsed : Throw();
 
-        throw new ArgumentException(
-            $"Value \"{value}\"is not a valid {typeof(T).Name} enumeration value.",
-            nameof(value));
+        T Throw() => throw new ArgumentException($"Value \"{value}\"is not a valid {typeof(T).Name} enumeration value.", nameof(value));
     }
 
     public static bool TryParse(string value, out T returnValue, bool ignoreCase = false)
     {
         Dictionary<string, T> names = ignoreCase ? InsensitiveNameToValue : SensitiveNameToValue;
-        if (ignoreCase)
-        {
-            value = value.ToLowerInvariant();
-        }
 
         return names.TryGetValue(value, out returnValue);
     }
@@ -83,7 +70,7 @@ public static bool TryParse(string value, out T returnValue, bool ignoreCase = f
             return null;
         }
 
-        if (InsensitiveNameToValue.TryGetValue(value.ToLowerInvariant(), out T parsed))
+        if (InsensitiveNameToValue.TryGetValue(value, out T parsed))
         {
             return parsed;
         }

src/Umbraco.Core/Models/DictionaryItem.cs

@@ -34,6 +34,9 @@ public DictionaryItem(Guid? parentId, string itemKey)
         _translations = new List<IDictionaryTranslation>();
     }
 
+    [Obsolete("This will be removed in V14.")]
+    public Func<int, ILanguage?>? GetLanguage { get; set; }
+
     /// <summary>
     ///     Gets or Sets the Parent Id of the Dictionary Item
     /// </summary>

src/Umbraco.Core/Models/IDictionaryTranslation.cs

@@ -5,10 +5,14 @@ namespace Umbraco.Cms.Core.Models;
 
 public interface IDictionaryTranslation : IEntity, IRememberBeingDirty
 {
+    /// <summary>
+    ///     Gets the ISO code of the language.
+    /// </summary>
+    [DataMember]
     string LanguageIsoCode { get; }
 
     /// <summary>
-    ///     Gets or sets the translated text
+    ///     Gets or sets the translated text.
     /// </summary>
     [DataMember]
     string Value { get; set; }