Merge branch 'contrib' into v15/dev

Author: nul800sebastiaan

src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Index.cshtml

@@ -28,7 +28,7 @@
     <base href="@backOfficePath.EnsureEndsWith('/')" />
     <link rel="icon" type="image/svg+xml" href="@backOfficeAssetsPath/assets/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="apple-mobile-web-app-capable" content="yes"/>
+    <meta name="mobile-web-app-capable" content="yes"/>
     <meta name="robots" content="noindex, nofollow"/>
     <meta name="pinterest" content="nopin"/>
     <title>Umbraco</title>

src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml

@@ -40,7 +40,7 @@
     <base href="@backOfficePath.EnsureEndsWith('/')"/>
     <link rel="icon" type="image/svg+xml" href="~/umbraco/login/favicon.svg"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <meta name="apple-mobile-web-app-capable" content="yes"/>
+    <meta name="mobile-web-app-capable" content="yes"/>
     <meta name="robots" content="noindex, nofollow"/>
     <meta name="pinterest" content="nopin"/>
     <title>Umbraco</title>

src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs

@@ -1,6 +1,7 @@
 using System.Data.Common;
 using System.Net.Http.Headers;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
@@ -326,23 +327,40 @@ public static IUmbracoBuilder AddHelpers(this IUmbracoBuilder builder)
         return builder;
     }
 
-    // TODO: Does this need to exist and/or be public?
+    [Obsolete("This is not necessary any more. This will be removed in v16")]
     public static IUmbracoBuilder AddWebServer(this IUmbracoBuilder builder)
     {
-        // TODO: We need to figure out why this is needed and fix those endpoints to not need them, we don't want to change global things
-        // If using Kestrel: https://stackoverflow.com/a/55196057
         builder.Services.Configure<KestrelServerOptions>(options =>
         {
             options.AllowSynchronousIO = true;
         });
-        builder.Services.Configure<IISServerOptions>(options =>
-        {
-            options.AllowSynchronousIO = true;
-        });
 
+        try
+        {
+            // See https://github.com/umbraco/Umbraco-CMS/pull/17886. This is a workaround for non-windows machines
+            // they won't have IIS available and trying to set this option will throw an exception.
+            //
+            // We're deferring this call to a method because if we just try to set the options here, we still get a
+            // TypeLoadException on non-windows machines.
+            // This workaround came from this comment: https://stackoverflow.com/a/3346975
+            AllowSynchronousIOForIIS(builder);
+        }
+        catch (TypeLoadException)
+        {
+            // Ignoring this exception because it's expected on non-windows machines
+        }
         return builder;
     }
 
+    // Prevents the compiler from inlining the method
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void AllowSynchronousIOForIIS(IUmbracoBuilder builder) =>
+        builder.Services.Configure<IISServerOptions>(
+            options =>
+            {
+                options.AllowSynchronousIO = true;
+            });
+
     private static IProfiler GetWebProfiler(IConfiguration config, IHttpContextAccessor httpContextAccessor)
     {
         var isDebug = config.GetValue<bool>($"{Constants.Configuration.ConfigHosting}:Debug");

src/Umbraco.Web.Common/Routing/UmbracoVirtualPageRoute.cs

@@ -5,8 +5,10 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
+using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Common.Extensions;
 
@@ -21,6 +23,7 @@ public class UmbracoVirtualPageRoute : IUmbracoVirtualPageRoute
     private readonly LinkParser _linkParser;
     private readonly UriUtility _uriUtility;
     private readonly IPublishedRouter _publishedRouter;
+    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
     /// <summary>
     /// Constructor.
@@ -29,16 +32,29 @@ public class UmbracoVirtualPageRoute : IUmbracoVirtualPageRoute
     /// <param name="linkParser">The link parser.</param>
     /// <param name="uriUtility">The Uri utility.</param>
     /// <param name="publishedRouter">The published router.</param>
+    /// <param name="umbracoContextAccessor">The umbraco context accessor.</param>
     public UmbracoVirtualPageRoute(
         EndpointDataSource endpointDataSource,
         LinkParser linkParser,
         UriUtility uriUtility,
-        IPublishedRouter publishedRouter)
+        IPublishedRouter publishedRouter,
+        IUmbracoContextAccessor umbracoContextAccessor)
     {
         _endpointDataSource = endpointDataSource;
         _linkParser = linkParser;
         _uriUtility = uriUtility;
         _publishedRouter = publishedRouter;
+        _umbracoContextAccessor = umbracoContextAccessor;
+    }
+
+    [Obsolete("Please use constructor that takes an IUmbracoContextAccessor instead, scheduled for removal in v17")]
+    public UmbracoVirtualPageRoute(
+        EndpointDataSource endpointDataSource,
+        LinkParser linkParser,
+        UriUtility uriUtility,
+        IPublishedRouter publishedRouter)
+        : this(endpointDataSource, linkParser, uriUtility, publishedRouter, StaticServiceProvider.Instance.GetRequiredService<IUmbracoContextAccessor>())
+    {
     }
 
     /// <summary>
@@ -157,7 +173,8 @@ public async Task<IPublishedRequest> CreatePublishedRequest(HttpContext httpCont
         requestBuilder.SetPublishedContent(publishedContent);
         _publishedRouter.RouteDomain(requestBuilder);
 
-        return requestBuilder.Build();
+        // Ensure the culture and domain is set correctly for the published request
+        return await _publishedRouter.RouteRequestAsync(requestBuilder, new RouteRequestOptions(Core.Routing.RouteDirection.Inbound));
     }
 
     /// <summary>
@@ -171,6 +188,12 @@ public async Task SetRouteValues(HttpContext httpContext, IPublishedContent publ
     {
         IPublishedRequest publishedRequest = await CreatePublishedRequest(httpContext, publishedContent);
 
+        // Ensure the published request is set to the UmbracoContext
+        if (_umbracoContextAccessor.TryGetUmbracoContext(out IUmbracoContext? umbracoContext))
+        {
+            umbracoContext.PublishedRequest = publishedRequest;
+        }
+
         var umbracoRouteValues = new UmbracoRouteValues(
             publishedRequest,
             controllerActionDescriptor);

src/Umbraco.Web.UI.Login/index.html

@@ -5,7 +5,7 @@
   <base href="/"/>
   <link rel="icon" type="image/svg+xml" href="/favicon.svg"/>
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="apple-mobile-web-app-capable" content="yes"/>
+  <meta name="mobile-web-app-capable" content="yes"/>
   <meta name="robots" content="noindex, nofollow"/>
   <meta name="pinterest" content="nopin"/>
   <title>Umbraco</title>

src/Umbraco.Web/HealthCheck/Checks/Security/UmbracoApplicationUrlCheck.cs

@@ -35,4 +35,4 @@
 * Use VSCode as the editor of choice as it has good tooling support for TypeScript and it will recommend a VSCode Extension for good Lit WebComponent completions
 
 == Other Resources ==
-* Umbraco Docs - https://docs.umbraco.com/umbraco-cms/customizing/extend-and-customize-editing-experience
+* Umbraco Docs - https://docs.umbraco.com/umbraco-cms/customizing/overview

templates/UmbracoExtension/README.txt

@@ -192,7 +192,7 @@ public static ContentTypeCreateModel CreateContentTypeWithContentPicker(string a
             .Build();
     }
 
-        public static ContentTypeCreateModel CreateContentTypeWithTwoPropertiesOneVariantAndOneInvariant(string alias = "test", string name = "TestName", string variantPropertyAlias = "variant", string variantPropertyName = "Variant", string invariantAlias = "invariant", string invariantName = "Invariant")
+    public static ContentTypeCreateModel CreateContentTypeWithTwoPropertiesOneVariantAndOneInvariant(string alias = "test", string name = "TestName", string variantPropertyAlias = "variant", string variantPropertyName = "Variant", string invariantAlias = "invariant", string invariantName = "Invariant")
     {
         var containerKey = Guid.NewGuid();
         var builder = new ContentTypeEditingBuilder();

tests/Umbraco.Tests.Common/Builders/ContentTypeEditingBuilder.cs

@@ -96,8 +96,7 @@ public IScopeProvider ScopeProvider
                 Mock.Of<IMediaPathScheme>(),
                 loggerFactory.CreateLogger<MediaFileManager>(),
                 Mock.Of<IShortStringHelper>(),
-                Mock.Of<IServiceProvider>(),
-                Options.Create(new ContentSettings()));
+                Mock.Of<IServiceProvider>());
             var databaseFactory = new Mock<IUmbracoDatabaseFactory>();
             var database = new Mock<IUmbracoDatabase>();
             var sqlContext = new Mock<ISqlContext>();
@@ -207,7 +206,7 @@ public virtual string MapPathForTestFiles(string relativePath)
             throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
         }
 
-        var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
+        var codeBase = typeof(TestHelperBase).Assembly.Location;
         var uri = new Uri(codeBase);
         var path = uri.LocalPath;
         var bin = Path.GetDirectoryName(path);

tests/Umbraco.Tests.Common/TestHelperBase.cs

@@ -8,5 +8,5 @@ namespace Umbraco.Cms.Tests.Common;
 
 public class TestLastChanceFinder : IContentLastChanceFinder
 {
-    public async Task<bool> TryFindContent(IPublishedRequestBuilder frequest) => false;
+    public Task<bool> TryFindContent(IPublishedRequestBuilder frequest) => Task.FromResult(false);
 }