Update to CMS 16.0.0-rc2 and fix breaking changes

Author: ronaldbarendse

Directory.Packages.props

@@ -5,11 +5,11 @@
   <ItemGroup>
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
+    <GlobalPackageReference Include="Umbraco.Code" Version="2.3.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>
   <PropertyGroup>
-    <UmbracoCmsPackageVersion>[15.0.0, 16)</UmbracoCmsPackageVersion>
+    <UmbracoCmsPackageVersion>[16.0.0-rc2, 17)</UmbracoCmsPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />

examples/Umbraco.StorageProviders.AzureBlob.TestSite/Umbraco.StorageProviders.AzureBlob.TestSite.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms" Version="15.0.0" />
-    <!--<PackageReference Include="Umbraco.TheStarterKit" Version="15.0.0" />-->
+    <PackageReference Include="Umbraco.Cms" Version="16.0.0-rc2" />
+    <!--<PackageReference Include="Umbraco.TheStarterKit" Version="16.0.0-rc" />-->
   </ItemGroup>
 
   <Import Project="..\..\src\Umbraco.StorageProviders\buildTransitive\Umbraco.StorageProviders.props" />

examples/Umbraco.StorageProviders.AzureBlob.TestSite/appsettings.json

@@ -11,7 +11,7 @@
     }
   },
   "ConnectionStrings": {
-    "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco-15.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
+    "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco-16.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
     "umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
   },
   "Umbraco": {
@@ -41,7 +41,7 @@
       "AzureBlob": {
         "Media": {
           "ConnectionString": "UseDevelopmentStorage=true",
-          "ContainerName": "umbraco-storageproviders-15"
+          "ContainerName": "umbraco-storageproviders-16"
         }
       }
     }

src/Umbraco.StorageProviders/CdnMediaUrlProvider.cs

@@ -25,10 +25,9 @@ public sealed class CdnMediaUrlProvider : DefaultMediaUrlProvider
     /// <param name="globalSettings">The global settings.</param>
     /// <param name="hostingEnvironment">The hosting environment.</param>
     /// <param name="mediaPathGenerators">The media path generators.</param>
-    /// <param name="uriUtility">The URI utility.</param>
     /// <param name="urlAssembler">The URL assembler.</param>
-    public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options, IOptionsMonitor<GlobalSettings> globalSettings, IHostingEnvironment hostingEnvironment, MediaUrlGeneratorCollection mediaPathGenerators, UriUtility uriUtility, IUrlAssembler urlAssembler)
-        : base(mediaPathGenerators, uriUtility, urlAssembler)
+    public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options, IOptionsMonitor<GlobalSettings> globalSettings, IHostingEnvironment hostingEnvironment, MediaUrlGeneratorCollection mediaPathGenerators, IUrlAssembler urlAssembler)
+        : base(mediaPathGenerators, urlAssembler)
     {
         ArgumentNullException.ThrowIfNull(options);
         ArgumentNullException.ThrowIfNull(globalSettings);

src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs

@@ -83,11 +83,7 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, Action
         // Configure CDN as allowed media host
         builder.Services.AddOptions<ContentSettings>().PostConfigure<IOptions<CdnMediaUrlProviderOptions>>((options, cdnMediaUrlProviderOptions) =>
         {
-            string cdnMediaHost = cdnMediaUrlProviderOptions.Value.Url.Host;
-            if (!options.AllowedMediaHosts.Contains(cdnMediaHost, StringComparer.OrdinalIgnoreCase))
-            {
-                options.AllowedMediaHosts = [..options.AllowedMediaHosts, cdnMediaHost];
-            }
+            options.AllowedMediaHosts.Add(cdnMediaUrlProviderOptions.Value.Url.Host);
         });
 
         return builder;