Bjarke Berg
a228f4e941
Merge remote-tracking branch 'origin/v9/dev' into v10/dev
# Conflicts:
# build/templates/UmbracoPackage/.template.config/template.json
# build/templates/UmbracoProject/.template.config/template.json
# src/Directory.Build.props
# src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
# src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
# tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs