Fix NRT errors and enable TreatWarningsAsErrors

build/common.props

@@ -16,6 +16,7 @@
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageOutputPath>$(SolutionDir)artifacts</PackageOutputPath>
     <PackageIcon>foundatio-icon.png</PackageIcon>
@@ -37,7 +38,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.201" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.200" PrivateAssets="All" />
     <PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
   </ItemGroup>

samples/Foundatio.AzureStorage.Dequeue/Program.cs

@@ -60,7 +60,7 @@
     Console.WriteLine("Press Ctrl+C to stop...");
     Console.WriteLine();
 
-    await DequeueMessages(connectionString, queueName, mode, count);
+    await DequeueMessages(connectionString, queueName!, mode, count);
     return 0;
 });
 
@@ -120,14 +120,14 @@ static async Task DequeueMessages(string connectionString, string queueName, Azu
                 processed++;
 
                 logger.LogInformation("Dequeued message {MessageId}: '{Message}' from '{Source}' at {Timestamp}",
-                    entry.Id, entry.Value.Message, entry.Value.Source, entry.Value.Timestamp);
+                    entry.Id, entry.Value?.Message, entry.Value?.Source, entry.Value?.Timestamp);
 
                 logger.LogInformation("  CorrelationId: '{CorrelationId}'", entry.CorrelationId ?? "<none>");
 
                 if (entry.Properties != null && entry.Properties.Count > 0)
                 {
                     logger.LogInformation("  Properties: [{Properties}]",
-                        string.Join(", ", entry.Properties.Select(p => $"{p.Key}={p.Value}")));
+                        String.Join(", ", entry.Properties.Select(p => $"{p.Key}={p.Value}")));
                 }
                 else
                 {

samples/Foundatio.AzureStorage.Enqueue/Program.cs

@@ -79,14 +79,14 @@
     Console.WriteLine($"Mode: {mode}");
     Console.WriteLine();
 
-    await EnqueueMessages(connectionString, queueName, message, correlationId, properties, mode, count);
+    await EnqueueMessages(connectionString, queueName!, message!, correlationId, properties!, mode, count);
     return 0;
 });
 
 // Parse and invoke
 return await rootCommand.Parse(args).InvokeAsync();
 
-static async Task EnqueueMessages(string connectionString, string queueName, string message, string correlationId, string[] properties, AzureStorageQueueCompatibilityMode mode, int count)
+static async Task EnqueueMessages(string connectionString, string queueName, string message, string? correlationId, string[] properties, AzureStorageQueueCompatibilityMode mode, int count)
 {
     using var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole().SetMinimumLevel(LogLevel.Information));
     var logger = loggerFactory.CreateLogger("Enqueue");
@@ -122,15 +122,17 @@ static async Task EnqueueMessages(string connectionString, string queueName, str
 
         var entryOptions = new QueueEntryOptions
         {
-            CorrelationId = correlationId,
-            Properties = queueProperties.Count > 0 ? queueProperties : null
+            CorrelationId = correlationId
         };
 
+        if (queueProperties.Count > 0)
+            entryOptions.Properties = queueProperties;
+
         var messageId = await queue.EnqueueAsync(sampleMessage, entryOptions);
 
         logger.LogInformation("Enqueued message {MessageId}: '{Message}' with CorrelationId: '{CorrelationId}' Properties: [{Properties}]",
             messageId, sampleMessage.Message, correlationId ?? "<none>",
-            string.Join(", ", queueProperties.Select(p => $"{p.Key}={p.Value}")));
+            String.Join(", ", queueProperties.Select(p => $"{p.Key}={p.Value}")));
     }
 
     logger.LogInformation("Successfully enqueued {Count} message(s)", count);

samples/Foundatio.AzureStorage.Enqueue/SampleMessage.cs

@@ -4,7 +4,7 @@ namespace Foundatio.AzureStorage.Samples;
 
 public record SampleMessage
 {
-    public string Message { get; init; } = string.Empty;
+    public string Message { get; init; } = String.Empty;
     public DateTime Timestamp { get; init; } = DateTime.UtcNow;
-    public string Source { get; init; } = string.Empty;
+    public string Source { get; init; } = String.Empty;
 }

src/Foundatio.AzureStorage/Foundatio.AzureStorage.csproj

@@ -7,7 +7,7 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.27.0" />
     <PackageReference Include="Azure.Storage.Queues" Version="12.25.0" />
 
-    <PackageReference Include="Foundatio" Version="13.0.0-beta3.32" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio" Version="13.0.0-beta3.36" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>

src/Foundatio.AzureStorage/Queues/AzureStorageQueue.cs

@@ -71,7 +71,7 @@ await Task.WhenAll(
         }
     }
 
-    protected override async Task<string> EnqueueImplAsync(T data, QueueEntryOptions options)
+    protected override async Task<string?> EnqueueImplAsync(T data, QueueEntryOptions options)
     {
         if (!await OnEnqueuingAsync(data, options).AnyContext())
             return null;
@@ -110,7 +110,7 @@ protected override async Task<string> EnqueueImplAsync(T data, QueueEntryOptions
         return response.Value.MessageId;
     }
 
-    protected override async Task<IQueueEntry<T>> DequeueImplAsync(CancellationToken linkedCancellationToken)
+    protected override async Task<IQueueEntry<T>?> DequeueImplAsync(CancellationToken linkedCancellationToken)
     {
         _logger.LogTrace("Checking for message: IsCancellationRequested={IsCancellationRequested} VisibilityTimeout={VisibilityTimeout}", linkedCancellationToken.IsCancellationRequested, _options.WorkItemTimeout);
 
@@ -177,41 +177,48 @@ protected override async Task<IQueueEntry<T>> DequeueImplAsync(CancellationToken
             message.MessageId, insertedOn, nowUtc, queueTime.TotalMilliseconds, linkedCancellationToken.IsCancellationRequested);
         Interlocked.Increment(ref _dequeuedCount);
 
-        T data;
-        string correlationId = null;
-        IDictionary<string, string> properties = null;
+        T? data;
+        string? correlationId = null;
+        IDictionary<string, string>? properties = null;
 
         try
         {
             if (_options.CompatibilityMode == AzureStorageQueueCompatibilityMode.Default)
             {
                 try
                 {
-                    // Unwrap envelope to extract metadata
                     var envelope = _serializer.Deserialize<QueueMessageEnvelope<T>>(message.Body.ToArray());
-                    data = envelope.Data;
-                    correlationId = envelope.CorrelationId;
-                    properties = envelope.Properties;
+                    if (envelope is not null)
+                    {
+                        data = envelope.Data;
+                        correlationId = envelope.CorrelationId;
+                        properties = envelope.Properties;
+                    }
+                    else
+                    {
+                        data = _serializer.Deserialize<T>(message.Body.ToArray());
+                    }
                 }
                 catch (Exception ex)
                 {
-                    // Fallback: try legacy format (raw T) for messages written before the envelope format.
-                    // If this also fails, let the exception propagate to the outer catch which will dead-letter it.
                     _logger.LogWarning(ex, "Failed to deserialize message {MessageId} as envelope format, attempting legacy format fallback", message.MessageId);
                     data = _serializer.Deserialize<T>(message.Body.ToArray());
                 }
             }
             else
             {
-                // Legacy mode: deserialize data directly (no envelope)
                 data = _serializer.Deserialize<T>(message.Body.ToArray());
             }
         }
         catch (Exception ex)
         {
             _logger.LogWarning(ex, "Error deserializing message {MessageId} (attempt {DequeueCount}), abandoning for retry", message.MessageId, message.DequeueCount);
+            data = null;
+        }
 
-            var poisonEntry = new AzureStorageQueueEntry<T>(message, null, null, null, this);
+        if (data is null)
+        {
+            var poisonEntry = new AzureStorageQueueEntry<T>(message, null, null, default!, this);
             await AbandonAsync(poisonEntry).AnyContext();
             return null;
         }
@@ -419,7 +426,7 @@ protected override void StartWorkingImpl(Func<IQueueEntry<T>, CancellationToken,
             {
                 _logger.LogTrace("WorkerLoop Signaled {QueueName}", _options.Name);
 
-                IQueueEntry<T> queueEntry = null;
+                IQueueEntry<T>? queueEntry = null;
                 try
                 {
                     queueEntry = await DequeueImplAsync(linkedCancellationToken.Token).AnyContext();
@@ -498,15 +505,15 @@ internal record QueueMessageEnvelope<T> where T : class
     /// <summary>
     /// Correlation ID for distributed tracing
     /// </summary>
-    public string CorrelationId { get; init; }
+    public string? CorrelationId { get; init; }
 
     /// <summary>
     /// Custom properties/metadata
     /// </summary>
-    public IDictionary<string, string> Properties { get; init; }
+    public IDictionary<string, string>? Properties { get; init; }
 
     /// <summary>
     /// The actual message payload
     /// </summary>
-    public T Data { get; init; }
+    public required T Data { get; init; }
 }

src/Foundatio.AzureStorage/Queues/AzureStorageQueueEntry.cs

@@ -14,7 +14,7 @@ public class AzureStorageQueueEntry<T> : QueueEntry<T> where T : class
     /// </summary>
     public string PopReceipt { get; internal set; }
 
-    public AzureStorageQueueEntry(QueueMessage message, string correlationId, IDictionary<string, string> properties, T data, IQueue<T> queue)
+    public AzureStorageQueueEntry(QueueMessage message, string? correlationId, IDictionary<string, string>? properties, T data, IQueue<T> queue)
         : base(message.MessageId, correlationId, data, queue, message.InsertedOn?.UtcDateTime ?? DateTime.MinValue, (int)message.DequeueCount)
     {
         UnderlyingMessage = message;

src/Foundatio.AzureStorage/Queues/AzureStorageQueueOptions.cs

@@ -25,7 +25,7 @@ public enum AzureStorageQueueCompatibilityMode
 
 public class AzureStorageQueueOptions<T> : SharedQueueOptions<T> where T : class
 {
-    public string ConnectionString { get; set; }
+    public string? ConnectionString { get; set; }
 
     /// <summary>
     /// The interval to wait between polling for new messages when the queue is empty.
@@ -71,14 +71,14 @@ public class AzureStorageQueueOptions<T> : SharedQueueOptions<T> where T : class
     /// };
     /// </code>
     /// </example>
-    public Action<RetryOptions> ConfigureRetry { get; set; }
+    public Action<RetryOptions>? ConfigureRetry { get; set; }
 }
 
 public class AzureStorageQueueOptionsBuilder<T> : SharedQueueOptionsBuilder<T, AzureStorageQueueOptions<T>, AzureStorageQueueOptionsBuilder<T>> where T : class
 {
     public AzureStorageQueueOptionsBuilder<T> ConnectionString(string connectionString)
     {
-        ArgumentException.ThrowIfNullOrEmpty(connectionString);
+        ArgumentException.ThrowIfNullOrWhiteSpace(connectionString);
 
         Target.ConnectionString = connectionString;
         return this;

src/Foundatio.AzureStorage/Storage/AzureFileStorage.cs

@@ -58,10 +58,10 @@ public AzureFileStorage(Builder<AzureFileStorageOptionsBuilder, AzureFileStorage
     public BlobContainerClient Container => _container;
 
     [Obsolete($"Use {nameof(GetFileStreamAsync)} with {nameof(StreamMode)} instead to define read or write behavior of stream")]
-    public Task<Stream> GetFileStreamAsync(string path, CancellationToken cancellationToken = default)
+    public Task<Stream?> GetFileStreamAsync(string path, CancellationToken cancellationToken = default)
         => GetFileStreamAsync(path, StreamMode.Read, cancellationToken);
 
-    public async Task<Stream> GetFileStreamAsync(string path, StreamMode streamMode, CancellationToken cancellationToken = default)
+    public async Task<Stream?> GetFileStreamAsync(string path, StreamMode streamMode, CancellationToken cancellationToken = default)
     {
         ArgumentException.ThrowIfNullOrEmpty(path);
 
@@ -91,7 +91,7 @@ public async Task<Stream> GetFileStreamAsync(string path, StreamMode streamMode,
         }
     }
 
-    public async Task<FileSpec> GetFileInfoAsync(string path)
+    public async Task<FileSpec?> GetFileInfoAsync(string path)
     {
         ArgumentException.ThrowIfNullOrEmpty(path);
 
@@ -255,7 +255,7 @@ public async Task<bool> DeleteFileAsync(string path, CancellationToken cancellat
         }
     }
 
-    public async Task<int> DeleteFilesAsync(string searchPattern = null, CancellationToken cancellationToken = default)
+    public async Task<int> DeleteFilesAsync(string? searchPattern = null, CancellationToken cancellationToken = default)
     {
         var files = await GetFileListAsync(searchPattern, cancellationToken: cancellationToken).AnyContext();
         int count = 0;
@@ -273,7 +273,7 @@ public async Task<int> DeleteFilesAsync(string searchPattern = null, Cancellatio
         return count;
     }
 
-    public async Task<PagedFileListResult> GetPagedFileListAsync(int pageSize = 100, string searchPattern = null, CancellationToken cancellationToken = default)
+    public async Task<PagedFileListResult> GetPagedFileListAsync(int pageSize = 100, string? searchPattern = null, CancellationToken cancellationToken = default)
     {
         if (pageSize <= 0)
             return PagedFileListResult.Empty;
@@ -283,7 +283,7 @@ public async Task<PagedFileListResult> GetPagedFileListAsync(int pageSize = 100,
         return result;
     }
 
-    private async Task<NextPageResult> GetFiles(string searchPattern, int page, int pageSize, CancellationToken cancellationToken)
+    private async Task<NextPageResult> GetFiles(string? searchPattern, int page, int pageSize, CancellationToken cancellationToken)
     {
         int pagingLimit = pageSize;
         int skip = (page - 1) * pagingLimit;
@@ -307,7 +307,7 @@ private async Task<NextPageResult> GetFiles(string searchPattern, int page, int
         };
     }
 
-    private async Task<List<FileSpec>> GetFileListAsync(string searchPattern = null, int? limit = null, int? skip = null, CancellationToken cancellationToken = default)
+    private async Task<List<FileSpec>> GetFileListAsync(string? searchPattern = null, int? limit = null, int? skip = null, CancellationToken cancellationToken = default)
     {
         if (limit is <= 0)
             return new List<FileSpec>();
@@ -368,16 +368,16 @@ private static FileSpec ToFileInfo(string path, BlobProperties properties)
 
     private static string NormalizePath(string path)
     {
-        return path?.Replace('\\', '/');
+        return path.Replace('\\', '/');
     }
 
     private record SearchCriteria
     {
-        public string Prefix { get; set; }
-        public Regex Pattern { get; set; }
+        public string Prefix { get; set; } = String.Empty;
+        public Regex? Pattern { get; set; }
     }
 
-    private SearchCriteria GetRequestCriteria(string searchPattern)
+    private SearchCriteria GetRequestCriteria(string? searchPattern)
     {
         if (String.IsNullOrEmpty(searchPattern))
             return new SearchCriteria { Prefix = String.Empty };
@@ -387,7 +387,7 @@ private SearchCriteria GetRequestCriteria(string searchPattern)
         bool hasWildcard = wildcardPos >= 0;
 
         string prefix = normalizedSearchPattern;
-        Regex patternRegex = null;
+        Regex? patternRegex = null;
 
         if (hasWildcard)
         {

src/Foundatio.AzureStorage/Storage/AzureFileStorageOptions.cs

@@ -5,7 +5,7 @@ namespace Foundatio.Storage;
 
 public class AzureFileStorageOptions : SharedOptions
 {
-    public string ConnectionString { get; set; }
+    public string? ConnectionString { get; set; }
     public string ContainerName { get; set; } = "storage";
 
     /// <summary>
@@ -22,14 +22,14 @@ public class AzureFileStorageOptions : SharedOptions
     /// };
     /// </code>
     /// </example>
-    public Action<RetryOptions> ConfigureRetry { get; set; }
+    public Action<RetryOptions>? ConfigureRetry { get; set; }
 }
 
 public class AzureFileStorageOptionsBuilder : SharedOptionsBuilder<AzureFileStorageOptions, AzureFileStorageOptionsBuilder>
 {
     public AzureFileStorageOptionsBuilder ConnectionString(string connectionString)
     {
-        ArgumentException.ThrowIfNullOrEmpty(connectionString);
+        ArgumentException.ThrowIfNullOrWhiteSpace(connectionString);
 
         Target.ConnectionString = connectionString;
         return this;

tests/Directory.Build.props

@@ -12,7 +12,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageReference Include="GitHubActionsTestLogger" Version="3.0.3" PrivateAssets="All" />
 
-    <PackageReference Include="Foundatio.TestHarness" Version="13.0.0-beta3.32" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio.TestHarness" Version="13.0.0-beta3.36" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>