V10: fix build warnings infrastructure

.editorconfig

@@ -282,7 +282,7 @@ dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR___
 
 # All public/protected/protected_internal constant fields must be PascalCase
 # https://docs.microsoft.com/dotnet/standard/design-guidelines/field
-dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal, internal, private
 dotnet_naming_symbols.public_protected_constant_fields_group.required_modifiers         = const
 dotnet_naming_symbols.public_protected_constant_fields_group.applicable_kinds           = field
 dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.symbols    = public_protected_constant_fields_group
@@ -356,24 +356,13 @@ dotnet_naming_rule.parameters_rule.symbols              = parameters_group
 dotnet_naming_rule.parameters_rule.style                = camel_case_style
 dotnet_naming_rule.parameters_rule.severity             = warning
 
-# Private static fields use camelCase and start with s_
-dotnet_naming_symbols.private_static_field_symbols.applicable_accessibilities                        = private
-dotnet_naming_symbols.private_static_field_symbols.required_modifiers                                = static, shared
-dotnet_naming_symbols.private_static_field_symbols.applicable_kinds                                  = field
-dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.symbols  = private_static_field_symbols
-dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.style    = camel_case_and_prefix_with_s_underscore_style
-dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.severity = warning
-dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.required_prefix                    = s_
-dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.capitalization                     = camel_case
-
 # Instance fields use camelCase and are prefixed with  '_'
-dotnet_naming_symbols.private_field_symbols.applicable_accessibilities                               = private
-dotnet_naming_symbols.private_field_symbols.applicable_kinds                                         = field
-dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.symbols  = private_field_symbols
-dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.style    = camel_case_and_prefix_with_underscore_style
-dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.severity = warning
-dotnet_naming_style.camel_case_and_prefix_with_underscore_style.required_prefix                      = _
-dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization                       = camel_case
+dotnet_naming_rule.instance_fields_should_be_camel_case.severity = warning
+dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
+dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
+dotnet_naming_symbols.instance_fields.applicable_kinds = field
+dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _
 
 ##########################################
 # License
@@ -408,4 +397,4 @@ dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-##########################################
+##########################################

src/Umbraco.Cms.Persistence.Sqlite/Services/SqliteSyntaxProvider.cs

@@ -180,8 +180,7 @@ public override string GetConcat(params string[] args)
         return string.Join(" || ", args.AsEnumerable());
     }
 
-    public override string GetColumn(DatabaseType dbType, string tableName, string columnName, string columnAlias,
-        string? referenceName = null, bool forInsert = false)
+    public override string GetColumn(DatabaseType dbType, string tableName, string columnName, string? columnAlias, string? referenceName = null, bool forInsert = false)
     {
         if (forInsert)
         {

src/Umbraco.Infrastructure/Cache/DatabaseServerMessengerNotificationHandler.cs

@@ -8,54 +8,55 @@
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.Persistence;
 
-namespace Umbraco.Cms.Core.Cache
+namespace Umbraco.Cms.Core.Cache;
+
+/// <summary>
+///     Ensures that distributed cache events are setup and the <see cref="IServerMessenger" /> is initialized
+/// </summary>
+public sealed class DatabaseServerMessengerNotificationHandler :
+    INotificationHandler<UmbracoApplicationStartingNotification>, INotificationHandler<UmbracoRequestEndNotification>
 {
+    private readonly IUmbracoDatabaseFactory _databaseFactory;
+    private readonly ILogger<DatabaseServerMessengerNotificationHandler> _logger;
+    private readonly IServerMessenger _messenger;
+    private readonly IRuntimeState _runtimeState;
+
     /// <summary>
-    /// Ensures that distributed cache events are setup and the <see cref="IServerMessenger"/> is initialized
+    ///     Initializes a new instance of the <see cref="DatabaseServerMessengerNotificationHandler" /> class.
     /// </summary>
-    public sealed class DatabaseServerMessengerNotificationHandler : INotificationHandler<UmbracoApplicationStartingNotification>, INotificationHandler<UmbracoRequestEndNotification>
+    public DatabaseServerMessengerNotificationHandler(
+        IServerMessenger serverMessenger,
+        IUmbracoDatabaseFactory databaseFactory,
+        ILogger<DatabaseServerMessengerNotificationHandler> logger,
+        IRuntimeState runtimeState)
+    {
+        _databaseFactory = databaseFactory;
+        _logger = logger;
+        _messenger = serverMessenger;
+        _runtimeState = runtimeState;
+    }
+
+    /// <inheritdoc />
+    public void Handle(UmbracoApplicationStartingNotification notification)
     {
-        private readonly IServerMessenger _messenger;
-        private readonly IUmbracoDatabaseFactory _databaseFactory;
-        private readonly ILogger<DatabaseServerMessengerNotificationHandler> _logger;
-        private readonly IRuntimeState _runtimeState;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseServerMessengerNotificationHandler"/> class.
-        /// </summary>
-        public DatabaseServerMessengerNotificationHandler(
-            IServerMessenger serverMessenger,
-            IUmbracoDatabaseFactory databaseFactory,
-            ILogger<DatabaseServerMessengerNotificationHandler> logger,
-            IRuntimeState runtimeState)
+        if (_runtimeState.Level != RuntimeLevel.Run)
         {
-            _databaseFactory = databaseFactory;
-            _logger = logger;
-            _messenger = serverMessenger;
-            _runtimeState = runtimeState;
+            return;
         }
 
-        /// <inheritdoc/>
-        public void Handle(UmbracoApplicationStartingNotification notification)
+        if (_databaseFactory.CanConnect == false)
         {
-            if (_runtimeState.Level != RuntimeLevel.Run)
-            {
-                return;
-            }
-
-            if (_databaseFactory.CanConnect == false)
-			{
-				_logger.LogWarning("Cannot connect to the database, distributed calls will not be enabled for this server.");
-                return;
-            }
-
-            // Sync on startup, this will run through the messenger's initialization sequence
-            _messenger?.Sync();
+            _logger.LogWarning(
+                "Cannot connect to the database, distributed calls will not be enabled for this server.");
+            return;
         }
 
-        /// <summary>
-        /// Clear the batch on end request
-        /// </summary>
-        public void Handle(UmbracoRequestEndNotification notification) => _messenger?.SendMessages();
+        // Sync on startup, this will run through the messenger's initialization sequence
+        _messenger?.Sync();
     }
+
+    /// <summary>
+    ///     Clear the batch on end request
+    /// </summary>
+    public void Handle(UmbracoRequestEndNotification notification) => _messenger?.SendMessages();
 }