Switch back to previous CSharp syntax style

Author: danielmarbach

src/NServiceBus.Storage.MongoDB.AcceptanceTests/When_custom_provider_registered.cs

@@ -55,23 +55,24 @@ public Task Handle(StartSaga1 message, IMessageHandlerContext context)
 
         public class CustomProvider(Context testContext) : IMongoClientProvider
         {
-            [field: AllowNull, MaybeNull]
             public IMongoClient Client
             {
                 get
                 {
-                    if (field is not null)
+                    if (client is not null)
                     {
-                        return field;
+                        return client;
                     }
 
                     var containerConnectionString = Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
 
-                    field = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
+                    client = string.IsNullOrWhiteSpace(containerConnectionString) ? new MongoClient() : new MongoClient(containerConnectionString);
                     testContext.ProviderWasCalled = true;
-                    return field;
+                    return client;
                 }
             }
+
+            IMongoClient? client;
         }
 
         public class JustASagaData : ContainSagaData

src/NServiceBus.Storage.MongoDB.Tests/ClientProvider.cs

@@ -1,4 +1,6 @@
-namespace NServiceBus.Storage.MongoDB.Tests;
+#nullable enable
+
+namespace NServiceBus.Storage.MongoDB.Tests;
 
 using System;
 using global::MongoDB.Driver;
@@ -9,9 +11,9 @@ public static IMongoClient Client
     {
         get
         {
-            if (field != null)
+            if (client != null)
             {
-                return field;
+                return client;
             }
 
             MongoPersistence.SafeRegisterDefaultGuidSerializer();
@@ -20,11 +22,13 @@ public static IMongoClient Client
             var containerConnectionString =
                 Environment.GetEnvironmentVariable("NServiceBusStorageMongoDB_ConnectionString");
 
-            field = string.IsNullOrWhiteSpace(containerConnectionString)
+            client = string.IsNullOrWhiteSpace(containerConnectionString)
                 ? new MongoClient()
                 : new MongoClient(containerConnectionString);
 
-            return field;
+            return client;
         }
     }
+
+    static IMongoClient? client;
 }

src/NServiceBus.Storage.MongoDB.Tests/Sagas/SagaTestsConfiguration.cs

@@ -20,22 +20,24 @@ public SagaMetadataCollection SagaMetadataCollection
     {
         get
         {
-            if (field != null)
+            if (sagaMetadataCollection != null)
             {
-                return field;
+                return sagaMetadataCollection;
             }
 
             var sagaTypes = Assembly.GetExecutingAssembly().GetTypes().Where(t =>
                 typeof(Saga).IsAssignableFrom(t) || typeof(IFinder).IsAssignableFrom(t)).ToArray();
-            field = new SagaMetadataCollection();
-            field.Initialize(sagaTypes);
+            sagaMetadataCollection = new SagaMetadataCollection();
+            sagaMetadataCollection.Initialize(sagaTypes);
 
-            return field;
+            return sagaMetadataCollection;
         }
 
-        set;
+        set => sagaMetadataCollection = value;
     }
 
+    SagaMetadataCollection sagaMetadataCollection;
+
     readonly MemberMapCache memberMapCache;
 
     public SagaTestsConfiguration(string versionElementName, Func<Type, string> collectionNamingConvention,

src/NServiceBus.Storage.MongoDB/Configuration/DefaultMongoClientProvider.cs

@@ -1,17 +1,17 @@
 namespace NServiceBus.Storage.MongoDB;
 
-using System.Diagnostics.CodeAnalysis;
 using global::MongoDB.Driver;
 
 sealed class DefaultMongoClientProvider : IMongoClientProvider
 {
-    [field: AllowNull, MaybeNull]
     public IMongoClient Client
     {
         get
         {
-            field ??= new MongoClient();
-            return field;
+            client ??= new MongoClient();
+            return client;
         }
     }
+
+    MongoClient? client;
 }

src/NServiceBus.Storage.MongoDB/Outbox/OutboxPersistenceConfiguration.cs

@@ -6,17 +6,19 @@ sealed class OutboxPersistenceConfiguration
 {
     public TimeSpan TimeToKeepDeduplicationData
     {
-        get => field;
+        get => timeToKeepDeduplicationData;
         set
         {
             ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(value, TimeSpan.Zero);
 
             var seconds = Math.Ceiling(value.TotalSeconds);
-            field = TimeSpan.FromSeconds(seconds);
+            timeToKeepDeduplicationData = TimeSpan.FromSeconds(seconds);
         }
-    } = TimeSpan.FromDays(7);
+    }
 
     public bool ReadFallbackEnabled { get; set; } = true;
 
     public string PartitionKey { get; set; } = null!; // will be set by defaults
+
+    TimeSpan timeToKeepDeduplicationData = TimeSpan.FromDays(7);
 }