Update EditorConfig and fix formatting issues

Author: ronaldbarendse

.globalconfig

@@ -48,9 +48,11 @@ dotnet_analyzer_diagnostic.category-StyleCop.CSharp.OrderingRules.severity = sug
 dotnet_analyzer_diagnostic.category-StyleCop.CSharp.MaintainabilityRules.severity = suggestion
 dotnet_analyzer_diagnostic.category-StyleCop.CSharp.LayoutRules.severity = suggestion
 
-dotnet_diagnostic.SA1636.severity = none # SA1636: File header copyright text should match
 dotnet_diagnostic.SA1101.severity = none # PrefixLocalCallsWithThis - stylecop appears to be ignoring dotnet_style_qualification_for_*
 dotnet_diagnostic.SA1309.severity = none # FieldNamesMustNotBeginWithUnderscore
+dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers
+dotnet_diagnostic.SA1633.severity = none # FileMustHaveHeader
+dotnet_diagnostic.SA1636.severity = none # FileHeaderCopyrightTextMustMatch
 
 dotnet_diagnostic.SA1503.severity = warning # BracesMustNotBeOmitted
 dotnet_diagnostic.SA1117.severity = warning # ParametersMustBeOnSameLineOrSeparateLines
@@ -81,3 +83,6 @@ dotnet_diagnostic.SA1209.severity = warning # UsingAliasDirectivesMustBePlacedAf
 dotnet_diagnostic.SA1216.severity = warning # UsingStaticDirectivesMustBePlacedAtTheCorrectLocation
 dotnet_diagnostic.SA1133.severity = warning # DoNotCombineAttributes
 dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified
+
+# IDE0058: Expression value is never used
+dotnet_diagnostic.IDE0058.severity = none

src/Umbraco.StorageProviders.AzureBlob.ImageSharp/AzureBlobFileSystemImageCache.cs

@@ -30,7 +30,7 @@ public AzureBlobFileSystemImageCache(IOptionsMonitor<AzureBlobFileSystemOptions>
         ArgumentNullException.ThrowIfNull(options);
         ArgumentNullException.ThrowIfNull(name);
 
-        var fileSystemOptions = options.Get(name);
+        AzureBlobFileSystemOptions fileSystemOptions = options.Get(name);
         _container = new BlobContainerClient(fileSystemOptions.ConnectionString, fileSystemOptions.ContainerName);
         _containerRootPath = GetContainerRootPath(containerRootPath, fileSystemOptions);
 
@@ -56,17 +56,10 @@ public AzureBlobFileSystemImageCache(BlobContainerClient blobContainerClient, st
         _containerRootPath = GetContainerRootPath(containerRootPath);
     }
 
-    private static string? GetContainerRootPath(string? containerRootPath, AzureBlobFileSystemOptions? options = null)
-    {
-        var path = containerRootPath ?? options?.ContainerRootPath;
-
-        return string.IsNullOrEmpty(path) ? null : path.EnsureEndsWith('/');
-    }
-
     /// <inheritdoc />
     public async Task<IImageCacheResolver?> GetAsync(string key)
     {
-        var blob = _container.GetBlobClient(_containerRootPath + key);
+        BlobClient blob = _container.GetBlobClient(_containerRootPath + key);
 
         return !await blob.ExistsAsync().ConfigureAwait(false)
             ? null
@@ -76,11 +69,18 @@ public AzureBlobFileSystemImageCache(BlobContainerClient blobContainerClient, st
     /// <inheritdoc />
     public async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
     {
-        var blob = _container.GetBlobClient(_containerRootPath + key);
+        BlobClient blob = _container.GetBlobClient(_containerRootPath + key);
 
         await blob.UploadAsync(stream, new BlobUploadOptions()
         {
             Metadata = metadata.ToDictionary()
         }).ConfigureAwait(false);
     }
+
+    private static string? GetContainerRootPath(string? containerRootPath, AzureBlobFileSystemOptions? options = null)
+    {
+        var path = containerRootPath ?? options?.ContainerRootPath;
+
+        return string.IsNullOrEmpty(path) ? null : path.EnsureEndsWith('/');
+    }
 }

src/Umbraco.StorageProviders.AzureBlob/AzureBlobFileProvider.cs

@@ -61,7 +61,7 @@ public IDirectoryContents GetDirectoryContents(string subpath)
     public IFileInfo GetFileInfo(string subpath)
     {
         var path = GetFullPath(subpath);
-        var blobClient = _containerClient.GetBlobClient(path);
+        BlobClient blobClient = _containerClient.GetBlobClient(path);
 
         BlobProperties properties;
         try

src/Umbraco.StorageProviders.AzureBlob/DependencyInjection/AzureBlobFileSystemExtensions.cs

@@ -89,7 +89,7 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, string
 
         builder.Services.TryAddSingleton<IAzureBlobFileSystemProvider, AzureBlobFileSystemProvider>();
 
-        var optionsBuilder = builder.Services.AddOptions<AzureBlobFileSystemOptions>(name)
+        OptionsBuilder<AzureBlobFileSystemOptions> optionsBuilder = builder.Services.AddOptions<AzureBlobFileSystemOptions>(name)
             .BindConfiguration($"Umbraco:Storage:AzureBlob:{name}")
             .ValidateDataAnnotations();
 

src/Umbraco.StorageProviders.AzureBlob/IO/AzureBlobFileSystem.cs

@@ -112,7 +112,7 @@ public void DeleteDirectory(string path, bool recursive)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        foreach (var blob in ListBlobs(GetDirectoryPath(path)))
+        foreach (BlobHierarchyItem blob in ListBlobs(GetDirectoryPath(path)))
         {
             if (blob.IsPrefix)
             {
@@ -153,7 +153,7 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
         ArgumentNullException.ThrowIfNull(path);
         ArgumentNullException.ThrowIfNull(stream);
 
-        var blob = GetBlobClient(path);
+        BlobClient blob = GetBlobClient(path);
         if (!overrideIfExists && blob.Exists())
         {
             throw new InvalidOperationException($"A file at path '{path}' already exists");
@@ -165,7 +165,7 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
             headers.ContentType = contentType;
         }
 
-        var conditions = overrideIfExists ? null : new BlobRequestConditions
+        BlobRequestConditions? conditions = overrideIfExists ? null : new BlobRequestConditions
         {
             IfNoneMatch = ETag.All
         };
@@ -185,19 +185,19 @@ public void AddFile(string path, string physicalPath, bool overrideIfExists = tr
         ArgumentNullException.ThrowIfNull(path);
         ArgumentNullException.ThrowIfNull(physicalPath);
 
-        var destinationBlob = GetBlobClient(path);
+        BlobClient destinationBlob = GetBlobClient(path);
         if (!overrideIfExists && destinationBlob.Exists())
         {
             throw new InvalidOperationException($"A file at path '{path}' already exists");
         }
 
-        var sourceBlob = GetBlobClient(physicalPath);
-        var destinationConditions = overrideIfExists ? null : new BlobRequestConditions
+        BlobClient sourceBlob = GetBlobClient(physicalPath);
+        BlobRequestConditions? destinationConditions = overrideIfExists ? null : new BlobRequestConditions
         {
             IfNoneMatch = ETag.All
         };
 
-        var copyFromUriOperation = destinationBlob.StartCopyFromUri(sourceBlob.Uri, new BlobCopyFromUriOptions()
+        CopyFromUriOperation copyFromUriOperation = destinationBlob.StartCopyFromUri(sourceBlob.Uri, new BlobCopyFromUriOptions()
         {
             DestinationConditions = destinationConditions
         });
@@ -228,7 +228,7 @@ public IEnumerable<string> GetFiles(string path, string? filter)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        var files = ListBlobs(GetDirectoryPath(path)).Where(x => x.IsBlob).Select(x => x.Blob.Name);
+        IEnumerable<string> files = ListBlobs(GetDirectoryPath(path)).Where(x => x.IsBlob).Select(x => x.Blob.Name);
         if (!string.IsNullOrEmpty(filter) && filter != "*.*")
         {
             // TODO: Might be better to use a globbing library

src/Umbraco.StorageProviders.AzureBlob/IO/AzureBlobFileSystemProvider.cs

@@ -42,7 +42,7 @@ public IAzureBlobFileSystem GetFileSystem(string name)
 
         return _fileSystems.GetOrAdd(name, name =>
         {
-            var options = _optionsMonitor.Get(name);
+            AzureBlobFileSystemOptions options = _optionsMonitor.Get(name);
 
             return new AzureBlobFileSystem(options, _hostingEnvironment, _ioHelper, _fileExtensionContentTypeProvider);
         });

src/Umbraco.StorageProviders/CdnMediaUrlProvider.cs

@@ -61,7 +61,7 @@ public CdnMediaUrlProvider(IOptionsMonitor<CdnMediaUrlProviderOptions> options,
     /// <inheritdoc />
     public override UrlInfo? GetMediaUrl(IPublishedContent content, string propertyAlias, UrlMode mode, string? culture, Uri current)
     {
-        var mediaUrl = base.GetMediaUrl(content, propertyAlias, UrlMode.Relative, culture, current);
+        UrlInfo? mediaUrl = base.GetMediaUrl(content, propertyAlias, UrlMode.Relative, culture, current);
         if (mediaUrl?.IsUrl == true)
         {
             string url = mediaUrl.Text;

src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs

@@ -73,7 +73,7 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, Action
 
         builder.MediaUrlProviders().Insert<CdnMediaUrlProvider>();
 
-        var optionsBuilder = builder.Services.AddOptions<CdnMediaUrlProviderOptions>()
+        OptionsBuilder<CdnMediaUrlProviderOptions> optionsBuilder = builder.Services.AddOptions<CdnMediaUrlProviderOptions>()
             .BindConfiguration("Umbraco:Storage:Cdn")
             .ValidateDataAnnotations();