Use file scoped namespaces

Demo/ConformanceTesting.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+
 using Fido2NetLib;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 public static class ConformanceTesting
 {
     private static readonly object _syncRoot = new ();
@@ -31,4 +32,3 @@ public static IMetadataService MetadataServiceInstance(string cacheDir, string o
         return _instance;
     }
 }
-}

Demo/Controller.cs

@@ -4,16 +4,18 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Fido2NetLib;
 using Fido2NetLib.Development;
 using Fido2NetLib.Objects;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 using static Fido2NetLib.Fido2;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 [Route("api/[controller]")]
 public class MyController : Controller
 {
@@ -218,4 +220,3 @@ public async Task<JsonResult> MakeAssertion([FromBody] AuthenticatorAssertionRaw
         }
     }
 }
-}

Demo/Program.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 public class Program
 {
     public static void Main(string[] args)
@@ -19,4 +19,3 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                    });
     }
 }
-}

Demo/RouteHelperExtensions.cs

@@ -5,8 +5,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Net.Http.Headers;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 public static class RouteHelperExtensions
 {
     public static RewriteOptions AddRedirectToWWwIfPasswordlessDomain(this RewriteOptions options)
@@ -35,4 +35,3 @@ public virtual void ApplyRule(RewriteContext context)
         }
     }
 }
-}

Demo/Startup.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -9,8 +10,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 public class Startup
 {
     public Startup(IConfiguration configuration)
@@ -85,4 +86,3 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         });
     }
 }
-}

Demo/TestController.cs

@@ -3,16 +3,18 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Fido2NetLib;
 using Fido2NetLib.Development;
 using Fido2NetLib.Objects;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 public class TestController : Controller
 {
     /* CONFORMANCE TESTING ENDPOINTS */
@@ -207,4 +209,3 @@ public class TEST_MakeCredentialParams
         public AuthenticationExtensionsClientOutputs Extensions { get; set; }
     }
 }
-}

Demo/UrlHelperExtensions.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace Fido2Demo
-{
+namespace Fido2Demo;
+
 public static class UrlHelperExtensions
 {
     public static string ToGithub(this IUrlHelper url, string path)
     {
         return "https://github.com/abergs/fido2-net-lib/blob/master/" + path;
     }
 }
-}

Src/Fido2.AspNet/DateTimeUtilities.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 internal static class DateTimeUtilities
 {
     /// <summary>
@@ -32,4 +28,3 @@ public static DateTimeOffset GetNextIncrement(this DateTimeOffset startTime, Tim
     }
 
 }
-}

Src/Fido2.AspNet/DistributedCacheMetadataService.cs

@@ -4,13 +4,14 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 public class DistributedCacheMetadataService : IMetadataService
 {
     protected readonly IDistributedCache _distributedCache;
@@ -208,4 +209,3 @@ public async Task<MetadataBLOBPayloadEntry> GetEntryAsync(Guid aaguid, Cancellat
         return memCacheEntry;
     }
 }
-}

Src/Fido2.AspNet/Fido2NetLibBuilderExtensions.cs

@@ -1,13 +1,15 @@
 using System;
 using System.Net.Http;
+
 using Fido2NetLib;
+
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.Extensions.DependencyInjection
-{
+namespace Microsoft.Extensions.DependencyInjection;
+
 public static class Fido2NetLibBuilderExtensions
 {
     public static IFido2NetLibBuilder AddFido2(this IServiceCollection services, IConfiguration configuration)
@@ -118,4 +120,3 @@ public Fido2NetLibBuilder(IServiceCollection services)
     /// </value>
     public IServiceCollection Services { get; }
 }
-}

Src/Fido2.AspNet/NullMetadataService.cs

@@ -2,9 +2,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Fido2NetLib
-{
-    internal class NullMetadataService : IMetadataService
+namespace Fido2NetLib;
+
+internal sealed class NullMetadataService : IMetadataService
 {
     public Task<MetadataBLOBPayloadEntry> GetEntryAsync(Guid aaguid, CancellationToken cancellationToken = default)
     {
@@ -16,4 +16,3 @@ public bool ConformanceTesting()
         return false;
     }
 }
-}

Src/Fido2.Models/AssertionOptions.cs

@@ -6,8 +6,8 @@
 using Fido2NetLib.Objects;
 using Fido2NetLib.Serialization;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 /// <summary>
 /// Sent to the browser when we want to Assert credentials and authenticate a user
 /// </summary>
@@ -76,4 +76,3 @@ public static AssertionOptions FromJson(string json)
         return JsonSerializer.Deserialize(json, FidoModelSerializerContext.Default.AssertionOptions);
     }
 }
-}

Src/Fido2.Models/AuthenticatorAssertionRawResponse.cs

@@ -4,8 +4,8 @@
 
 using Fido2NetLib.Objects;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 /// <summary>
 /// Transport class for AssertionResponse
 /// </summary>
@@ -48,4 +48,3 @@ public class AssertionResponse
         public byte[] UserHandle { get; set; }
     }
 }
-}

Src/Fido2.Models/AuthenticatorAttestationRawResponse.cs

@@ -2,8 +2,8 @@
 
 using Fido2NetLib.Objects;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 public sealed class AuthenticatorAttestationRawResponse
 {
     [JsonConverter(typeof(Base64UrlConverter))]
@@ -34,4 +34,3 @@ public sealed class ResponseData
         public byte[] ClientDataJson { get; set; }
     }
 }
-}

Src/Fido2.Models/Base64Url.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Buffers;
 using System.Buffers.Text;
-using System.Text.Unicode;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 /// <summary>
 /// Helper class to handle Base64Url. Based on Carbon.Jose source code.
 /// </summary>
@@ -146,4 +145,3 @@ public static byte[] DecodeUtf8(ReadOnlySpan<byte> text)
         return result;
     }
 }
-}

Src/Fido2.Models/COSETypes.cs

@@ -1,6 +1,5 @@
-
-namespace Fido2NetLib.Objects
-{
+namespace Fido2NetLib.Objects;
+
 /// <summary>
 /// CBOR Object Signing and Encryption RFC8152 https://tools.ietf.org/html/rfc8152
 /// </summary>
@@ -190,4 +189,3 @@ public enum EllipticCurve
         P256K = 8
     }
 }
-}

Src/Fido2.Models/Converters/Base64Converter.cs

@@ -2,8 +2,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 /// <summary>
 /// Custom Converter for encoding/encoding byte[] using Base64Url instead of default Base64.
 /// </summary>
@@ -26,4 +26,3 @@ public override void Write(Utf8JsonWriter writer, byte[] value, JsonSerializerOp
         writer.WriteStringValue(Base64Url.Encode(value));
     }
 }
-}

Src/Fido2.Models/Converters/EnumNameMapper.cs

@@ -4,8 +4,8 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 public static class EnumNameMapper<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] TEnum>
     where TEnum: struct, Enum
 {
@@ -78,4 +78,3 @@ private static Dictionary<TEnum, string> GetIdToNameMap()
         return dic;
     }
 }
-}

Src/Fido2.Models/Converters/FidoEnumConverter.cs

@@ -3,8 +3,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
 
 public sealed class FidoEnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T> : JsonConverter<T>
     where T: struct, Enum
@@ -28,4 +27,3 @@ public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions
         writer.WriteStringValue(EnumNameMapper<T>.GetName(value));
     }
 }
-}

Src/Fido2.Models/CredentialCreateOptions.cs

@@ -6,8 +6,8 @@
 using Fido2NetLib.Objects;
 using Fido2NetLib.Serialization;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 public sealed class CredentialCreateOptions : Fido2ResponseBase
 {
     /// <summary>
@@ -263,4 +263,3 @@ public class Fido2User
     [JsonPropertyName("displayName")]
     public string DisplayName { get; set; }
 }
-}

Src/Fido2.Models/Fido2Configuration.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 public class Fido2Configuration
 {
     private HashSet<string> _origins;
@@ -114,4 +114,3 @@ public HashSet<string> FullyQualifiedOrigins
         AuthenticatorStatus.REVOKED
     };
 }
-}

Src/Fido2.Models/Fido2ResponseBase.cs

@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 
-namespace Fido2NetLib
-{
+namespace Fido2NetLib;
+
 public abstract class Fido2ResponseBase
 {
     [JsonPropertyName("status")]
@@ -10,4 +10,3 @@ public abstract class Fido2ResponseBase
     [JsonPropertyName("errorMessage")]
     public string ErrorMessage { get; set; }
 }
-}