Added carriage return and linefeed characters to disallowed row key chars

Fixes #10

Author: ChrisSimmons

src/Serilog.Sinks.AzureTableStorage/Sinks/AzureTableStorageWithProperties/AzureTableStorageEntityFactory.cs

@@ -28,7 +28,7 @@ namespace Serilog.Sinks.AzureTableStorage
 	public static class AzureTableStorageEntityFactory
 	{
 		// Valid RowKey name characters
-		static readonly Regex _rowKeyNotAllowedMatch = new Regex(@"(\\|/|#|\?)");
+		static readonly Regex _rowKeyNotAllowedMatch = new Regex(@"(\\|/|#|\n|\r|\?)");
 
 		// Azure tables support a maximum of 255 properties. PartitionKey, RowKey and Timestamp
 		// bring the maximum to 252.

test/Serilog.Sinks.AzureTableStorageWithProperties.Tests/AzureTableStorageWithPropertiesSinkTests.cs

@@ -75,7 +75,30 @@ public void WhenALoggerWritesToTheSinkItIsRetrievableFromTheTableWithProperties(
 		}
 
         [Fact]
-        public void WhenALoggerWritesToTheSinkWithANewlineInTheTemplateItIsRetrievable()
+        public void WhenALoggerWritesToTheSinkWithAWindowsNewlineInTheTemplateItIsRetrievable()
+        {
+            // Prompted from https://github.com/serilog/serilog-sinks-azuretablestorage/issues/10
+            var storageAccount = CloudStorageAccount.DevelopmentStorageAccount;
+            var tableClient = storageAccount.CreateCloudTableClient();
+            var table = tableClient.GetTableReference("LogEventEntity");
+
+            table.DeleteIfExists();
+
+            var logger = new LoggerConfiguration()
+                .WriteTo.AzureTableStorageWithProperties(storageAccount)
+                .CreateLogger();
+
+            const string messageTemplate = "Line 1\r\nLine2";
+
+            logger.Information(messageTemplate);
+
+            var result = table.ExecuteQuery(new TableQuery().Take(1)).FirstOrDefault();
+
+            Assert.NotNull(result);
+        }
+
+        [Fact]
+        public void WhenALoggerWritesToTheSinkWithALineFeedInTheTemplateItIsRetrievable()
         {
             // Prompted from https://github.com/serilog/serilog-sinks-azuretablestorage/issues/10
             var storageAccount = CloudStorageAccount.DevelopmentStorageAccount;
@@ -97,6 +120,29 @@ public void WhenALoggerWritesToTheSinkWithANewlineInTheTemplateItIsRetrievable()
             Assert.NotNull(result);
         }
 
+        [Fact]
+        public void WhenALoggerWritesToTheSinkWithACarriageReturnInTheTemplateItIsRetrievable()
+        {
+            // Prompted from https://github.com/serilog/serilog-sinks-azuretablestorage/issues/10
+            var storageAccount = CloudStorageAccount.DevelopmentStorageAccount;
+            var tableClient = storageAccount.CreateCloudTableClient();
+            var table = tableClient.GetTableReference("LogEventEntity");
+
+            table.DeleteIfExists();
+
+            var logger = new LoggerConfiguration()
+                .WriteTo.AzureTableStorageWithProperties(storageAccount)
+                .CreateLogger();
+
+            const string messageTemplate = "Line 1\rLine2";
+
+            logger.Information(messageTemplate);
+
+            var result = table.ExecuteQuery(new TableQuery().Take(1)).FirstOrDefault();
+
+            Assert.NotNull(result);
+        }
+
         [Fact]
         public void WhenALoggerWritesToTheSinkItStoresTheCorrectTypesForScalar()
 		{