Merge pull request #384 from serilog/dev

ckadluba · web-flow · commit 0dcf2d173d0e · 2022-02-14T15:17:05.000+01:00
Release 5.7.0
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -14,7 +14,9 @@ If you are opening a feature request, you can ignore this template. Bug reports
 
 >> Target framework and operating system:
 
-[ ] .NET Core 2.0
+[ ] .NET Core 6
+[ ] .NET Core 3.1
+[ ] .NET Framework 4.8
 [ ] .NET Framework 4.7
 [ ] .NET Framework 4.6.x
 [ ] .NET Framework 4.5.x
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+# 5.7.0
+* Fixed a wrong information in README.md regarding SQL Server compatibility (thanks to @domagojmedo).
+* Fixed bug #382 System.FormatExceotion due to invalid format strings when using SelfLog (thanks to @sommmen)
+* New sink option to configure tenant when using Azure managed identities (thanks to @mattosaurus).
+* Updated .NET target frameworks (obsolete .NET Core 2.0 and 2.1, added .NET Core 3.1 LTS).
+
 # 5.6.1
 * Added support for reserved columns (thanks to @susanneschuster).
 * Fixes in README.
@@ -24,7 +30,7 @@
 # 5.4.0
 * Added support for Azure Managed Identities for Resources authentication (thanks to @darrenschwarz for the contribution).
 * New interface using `SinkOptions` parameter. Marked old interfaces obsolete.
-* Implemented Enhancement #182: configurable property names for custom columns (thanks to  @rocknet for the contribution).
+* Implemented Enhancement #182: configurable property names for custom columns (thanks to @rocknet for the contribution).
 * Lots of refactoring and new unit tests.
 
 # 5.3.0  
diff --git a/README.md b/README.md
@@ -88,13 +88,13 @@ Because of the way external configuration has been implemented in various .NET f
 | Your Framework | TFM | Project Types | External Configuration |
 | --- | --- | --- |  --- |
 | .NET Framework 4.5.2 | `net452` | app or library | _System.Configuration_ |
-| .NET Framework 4.6.1+ | `net461` | app or library | _System.Configuration_ |
-| .NET Framework 4.6.1+ | `net461` | app or library | _Microsoft.Extensions.Configuration_ |
+| .NET Framework 4.6.2+ | `net462` | app or library | _System.Configuration_ |
+| .NET Framework 4.6.2+ | `net462` | app or library | _Microsoft.Extensions.Configuration_ |
 | .NET Standard 2.0 | `netstandard2.0` | library only | _Microsoft.Extensions.Configuration_ |
-| .NET Core 2.0+ | `netcoreapp2.0` | app or library | _System.Configuration_ |
-| .NET Core 2.0+ | `netcoreapp2.0` | app or library | _Microsoft.Extensions.Configuration_ |
+| .NET Core 3.1+ | `netcoreapp3.1` | app or library | _System.Configuration_ |
+| .NET Core 3.1+ | `netcoreapp3.1` | app or library | _Microsoft.Extensions.Configuration_ |
 
-Support for .NET Framework 4.5.2 is tied to the Windows 8.1 lifecycle with support scheduled to end in January 2023.
+Support for .NET Framework 4.5.2 is tied to the Windows 8.1 lifecycle with support scheduled to end in April 2022 (https://devblogs.microsoft.com/dotnet/net-framework-4-5-2-4-6-4-6-1-will-reach-end-of-support-on-april-26-2022/).
 
 Although it's possible to use both XML and _M.E.C_ configuration with certain frameworks, this is not supported, unintended consequences are possible, and a warning will be emitted to `SelfLog`. If you actually require multiple configuration sources, the _M.E.C_ builder-pattern is designed to support this, and your syntax will be consistent across configuration sources.
 
@@ -247,6 +247,7 @@ Basic settings of the sink are configured using the properties in a `MSSqlServer
 * `EagerlyEmitFirstEvent`
 * `UseAzureManagedIdentity`
 * `AzureServiceTokenProviderResource`
+* `AzureTenantId`
 
 ### TableName
 
@@ -285,7 +286,24 @@ See [Azure AD-managed identities for Azure resources documentation](https://docs
 
 ### AzureServiceTokenProviderResource
 
-Specifies the token provider resource to be used for aquiring an authentication token when using Azure Managed Identities for authenticating with an Azure SQL server. This setting is only used if `UseAzureManagedIdentity` is set to `true`.
+Specifies the token provider resource to be used for aquiring an authentication token when using Azure Managed Identities for authenticating with an Azure SQL server. This setting is only used if `UseAzureManagedIdentity` is set to `true`. For Azure SQL databases this value will always be `https://database.windows.net/`.
+
+### AzureTenantId
+
+Specifies the tenant ID of the the tenant the Azure SQL database exists in. This only needs to be set if the user authenticating against the database is in a different tenant to the database. This will most likely be the case when you are debugging locally and authenticating as yourself rather than the app to be deployed to.
+
+```
+ .WriteTo.MSSqlServer(
+	Environment.GetEnvironmentVariable("LogConnection"),
+	sinkOptions: new MSSqlServerSinkOptions()
+	{
+		TableName = "_Log",
+		UseAzureManagedIdentity = true,
+		AzureServiceTokenProviderResource = "https://database.windows.net/",
+		AzureTenantId = Environment.GetEnvironmentVariable("AZURE_TENANT_ID")
+	}
+```
+
 
 ## ColumnOptions Object
 
@@ -736,7 +754,7 @@ Extracting and querying the property column directly can be helpful when looking
 
 ### LogEvent JSON
 
-This capability requires SQL 2012 or newer. Given the following JSON properties:
+This capability requires SQL 2016 or newer. Given the following JSON properties:
 
 ```json
 {
diff --git a/sample/AppConfigDemo/AppConfigDemo.csproj b/sample/AppConfigDemo/AppConfigDemo.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AppConfigDemo</RootNamespace>
     <AssemblyName>AppConfigDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -126,4 +126,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsSinkOptionsProvider.cs b/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsSinkOptionsProvider.cs
@@ -38,6 +38,7 @@ private static void ReadAzureManagedIdentitiesOptions(IConfigurationSection conf
         {
             SetProperty.IfNotNull<bool>(config["useAzureManagedIdentity"], val => sinkOptions.UseAzureManagedIdentity = val);
             SetProperty.IfNotNull<string>(config["azureServiceTokenProviderResource"], val => sinkOptions.AzureServiceTokenProviderResource = val);
+            SetProperty.IfNotNull<string>(config["azureTenantId"], val => sinkOptions.AzureTenantId = val);
         }
     }
 }
diff --git a/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/MSSqlServerConfigurationSection.cs b/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/MSSqlServerConfigurationSection.cs
@@ -191,6 +191,13 @@ public ValueConfigElement AzureServiceTokenProviderResource
         {
             get => (ValueConfigElement)base[nameof(AzureServiceTokenProviderResource)];
         }
+
+
+        [ConfigurationProperty(nameof(AzureTenantId))]
+        public ValueConfigElement AzureTenantId
+        {
+            get => (ValueConfigElement)base[nameof(AzureTenantId)];
+        }
     }
 }
 
diff --git a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>A Serilog sink that writes events to Microsoft SQL Server</Description>
-    <VersionPrefix>5.6.1</VersionPrefix>
+    <VersionPrefix>5.7.0</VersionPrefix>
     <Authors>Michiel van Oudheusden;Christian Kadluba;Serilog Contributors</Authors>
-    <TargetFrameworks>netstandard2.0;net452;net461;net472;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452;net462;net472;netcoreapp3.1</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Sinks.MSSqlServer</AssemblyName>
@@ -67,8 +67,7 @@
     <Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
     <Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStub.cs" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
@@ -79,7 +78,7 @@
     <Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStub.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'net472' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net472' ">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.4.0" />
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/ColumnOptions/FinalizeConfigurationForSinkConstructor.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/ColumnOptions/FinalizeConfigurationForSinkConstructor.cs
@@ -68,7 +68,7 @@ internal void FinalizeConfigurationForSinkConstructor()
             // PK must always be NON-NULL
             if (PrimaryKey != null && PrimaryKey.AllowNull == true)
             {
-                SelfLog.WriteLine($"Warning: Primary key must be NON-NULL, changing AllowNull property for {PrimaryKey.ColumnName} column.");
+                SelfLog.WriteLine("Warning: Primary key must be NON-NULL, changing AllowNull property for {0} column.", PrimaryKey.ColumnName);
                 PrimaryKey.AllowNull = false;
             }
 
@@ -81,7 +81,7 @@ private static void ColumnstoreCompatibilityCheck(SqlColumn column)
                 throw new ArgumentException($"Columnstore indexes do not support data type \"{column.DataType}\" declared for column \"{column.ColumnName}\".");
 
             if (column.DataLength == -1 && SqlDataTypes.DataLengthRequired.Contains(column.DataType))
-                SelfLog.WriteLine($"Warning: SQL2017 or newer required to use columnstore index with MAX length column \"{column.ColumnName}\".");
+                SelfLog.WriteLine("Warning: SQL2017 or newer required to use columnstore index with MAX length column \"{0}\".", column.ColumnName);
         }
     }
 }
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Dependencies/SinkDependenciesFactory.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Dependencies/SinkDependenciesFactory.cs
@@ -22,7 +22,8 @@ internal static SinkDependencies Create(
                     sinkOptions?.UseAzureManagedIdentity ?? default,
                     new AzureManagedServiceAuthenticator(
                         sinkOptions?.UseAzureManagedIdentity ?? default,
-                        sinkOptions.AzureServiceTokenProviderResource));
+                        sinkOptions.AzureServiceTokenProviderResource,
+                        sinkOptions.AzureTenantId));
             var logEventDataGenerator =
                 new LogEventDataGenerator(columnOptions,
                     new StandardColumnDataGenerator(columnOptions, formatProvider,
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSinkOptions.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSinkOptions.cs
@@ -71,5 +71,10 @@ internal MSSqlServerSinkOptions(
         /// Azure service token provider to be used for Azure Managed Identities
         /// </summary>
         public string AzureServiceTokenProviderResource { get; set; }
+
+        /// <summary>
+        /// ID of the tenant where the Azure resource exists
+        /// </summary>
+        public string AzureTenantId { get; set; }
     }
 }
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs
@@ -8,9 +8,10 @@ internal class AzureManagedServiceAuthenticator : IAzureManagedServiceAuthentica
     {
         private readonly bool _useAzureManagedIdentity;
         private readonly string _azureServiceTokenProviderResource;
+        private readonly string _tenantId;
         private readonly AzureServiceTokenProvider _azureServiceTokenProvider;
 
-        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource)
+        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource, string tenantId = null)
         {
             if (useAzureManagedIdentity && string.IsNullOrWhiteSpace(azureServiceTokenProviderResource))
             {
@@ -19,6 +20,7 @@ public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azu
 
             _useAzureManagedIdentity = useAzureManagedIdentity;
             _azureServiceTokenProviderResource = azureServiceTokenProviderResource;
+            _tenantId = tenantId;
             _azureServiceTokenProvider = new AzureServiceTokenProvider();
         }
 
@@ -29,7 +31,7 @@ public Task<string> GetAuthenticationToken()
                 return Task.FromResult((string)null);
             }
 
-            return _azureServiceTokenProvider.GetAccessTokenAsync(_azureServiceTokenProviderResource);
+            return _azureServiceTokenProvider.GetAccessTokenAsync(_azureServiceTokenProviderResource, _tenantId);
         }
     }
 }
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs
@@ -3,16 +3,17 @@
 using System.Threading.Tasks;
 
 // This is an empty stub implementaion of IAzureManagedServiceAuthenticator for the target frameworks
-// that don't support Azure Managed Identities (net452, net461, netstandard2.0, netcoreapp2.0).
+// that don't support Azure Managed Identities (net452, net462, netstandard2.0, netcoreapp2.0).
 namespace Serilog.Sinks.MSSqlServer.Platform
 {
     [SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Empty stub but has to implement interface therefore parameters are not used.")]
     internal class AzureManagedServiceAuthenticator : IAzureManagedServiceAuthenticator
     {
         private readonly bool _useAzureManagedIdentity;
         private readonly string _azureServiceTokenProviderResource;
+        private readonly string _tenantId;
 
-        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource)
+        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource, string tenantId = null)
         {
             if (useAzureManagedIdentity)
             {
@@ -22,6 +23,7 @@ public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azu
 
             _useAzureManagedIdentity = useAzureManagedIdentity;
             _azureServiceTokenProviderResource = azureServiceTokenProviderResource;
+            _tenantId = tenantId;
         }
 
         public Task<string> GetAuthenticationToken() => Task.FromResult((string)null);
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs
@@ -69,7 +69,7 @@ public void WriteEvent(LogEvent logEvent)
             }
             catch (Exception ex)
             {
-                SelfLog.WriteLine("Unable to write log event to the database due to following error: {1}", ex.Message);
+                SelfLog.WriteLine("Unable to write log event to the database due to following error: {0}", ex.Message);
                 throw;
             }
         }
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlTableCreator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlTableCreator.cs
@@ -42,7 +42,7 @@ public void CreateTable(DataTable dataTable)
             }
             catch (Exception ex)
             {
-                SelfLog.WriteLine($"Exception creating table {_tableName}:\n{ex}");
+                SelfLog.WriteLine("Exception creating table {0}:\n{1}", _tableName, ex.ToString());
             }
         }
     }
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsSinkOptionsProviderTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsSinkOptionsProviderTests.cs
@@ -150,5 +150,20 @@ public void ConfigureSinkOptionsSetsAzureServiceTokenProviderResource()
             // Assert
             Assert.Equal(azureServiceTokenProviderResource, result.AzureServiceTokenProviderResource);
         }
+
+        [Fact]
+        public void ConfigureSinkOptionsSetsAzureTenantId()
+        {
+            // Arrange
+            const string azureTenantId = "00000000-0000-0000-0000-000000000000";
+            _configurationSectionMock.Setup(s => s["azureTenantId"]).Returns(azureTenantId);
+            var sut = new MicrosoftExtensionsSinkOptionsProvider();
+
+            // Act
+            var result = sut.ConfigureSinkOptions(new MSSqlServerSinkOptions(), _configurationSectionMock.Object);
+
+            // Assert
+            Assert.Equal(azureTenantId, result.AzureTenantId);
+        }
     }
 }
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/GlobalSuppressions.cs b/test/Serilog.Sinks.MSSqlServer.Tests/GlobalSuppressions.cs
@@ -8,4 +8,4 @@
 [assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "Supplying string literals and not using resources is accepted within this project.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer.Tests")]
 [assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Member names must match SQL server master DB objects.", Scope = "type", Target = "~T:Serilog.Sinks.MSSqlServer.Tests.TestUtils.sp_pkey")]
 [assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Member names must match SQL server master DB objects.", Scope = "type", Target = "~T:Serilog.Sinks.MSSqlServer.Tests.TestUtils.SysIndex_CCI")]
-[assembly: SuppressMessage("Globalization", "CA1307:Specify StringComparison", Justification = "In net452 there is no Contains() overload that accepts a StringComparison specifier", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Tests.TestUtils.DatabaseTestsBase.VerifyLogMessageWasWritten(System.String)")]
+[assembly: SuppressMessage("Globalization", "CA1307:Specify StringComparison", Justification = "In net452 there is no Contains() overload that accepts a StringComparison specifier", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer.Tests")]
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj b/test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStubTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStubTests.cs
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorTests.cs

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ private static void ReadAzureManagedIdentitiesOptions(IConfigurationSection conf`
`38`	`38`	`{`
`39`	`39`	`SetProperty.IfNotNull<bool>(config["useAzureManagedIdentity"], val => sinkOptions.UseAzureManagedIdentity = val);`
`40`	`40`	`SetProperty.IfNotNull<string>(config["azureServiceTokenProviderResource"], val => sinkOptions.AzureServiceTokenProviderResource = val);`
	`41`	`+ SetProperty.IfNotNull<string>(config["azureTenantId"], val => sinkOptions.AzureTenantId = val);`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,13 @@ public ValueConfigElement AzureServiceTokenProviderResource`
`191`	`191`	`{`
`192`	`192`	`get => (ValueConfigElement)base[nameof(AzureServiceTokenProviderResource)];`
`193`	`193`	`}`
	`194`	`+`
	`195`	`+`
	`196`	`+ [ConfigurationProperty(nameof(AzureTenantId))]`
	`197`	`+ public ValueConfigElement AzureTenantId`
	`198`	`+ {`
	`199`	`+ get => (ValueConfigElement)base[nameof(AzureTenantId)];`
	`200`	`+ }`
`194`	`201`	`}`
`195`	`202`	`}`
`196`	`203`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ internal void FinalizeConfigurationForSinkConstructor()`
`68`	`68`	`// PK must always be NON-NULL`
`69`	`69`	`if (PrimaryKey != null && PrimaryKey.AllowNull == true)`
`70`	`70`	`{`
`71`		`- SelfLog.WriteLine($"Warning: Primary key must be NON-NULL, changing AllowNull property for {PrimaryKey.ColumnName} column.");`
	`71`	`+ SelfLog.WriteLine("Warning: Primary key must be NON-NULL, changing AllowNull property for {0} column.", PrimaryKey.ColumnName);`
`72`	`72`	`PrimaryKey.AllowNull = false;`
`73`	`73`	`}`
`74`	`74`
`@@ -81,7 +81,7 @@ private static void ColumnstoreCompatibilityCheck(SqlColumn column)`
`81`	`81`	`throw new ArgumentException($"Columnstore indexes do not support data type \"{column.DataType}\" declared for column \"{column.ColumnName}\".");`
`82`	`82`
`83`	`83`	`if (column.DataLength == -1 && SqlDataTypes.DataLengthRequired.Contains(column.DataType))`
`84`		`- SelfLog.WriteLine($"Warning: SQL2017 or newer required to use columnstore index with MAX length column \"{column.ColumnName}\".");`
	`84`	`+ SelfLog.WriteLine("Warning: SQL2017 or newer required to use columnstore index with MAX length column \"{0}\".", column.ColumnName);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,10 @@ internal MSSqlServerSinkOptions(`
`71`	`71`	`/// Azure service token provider to be used for Azure Managed Identities`
`72`	`72`	`/// </summary>`
`73`	`73`	`public string AzureServiceTokenProviderResource { get; set; }`
	`74`	`+`
	`75`	`+ /// <summary>`
	`76`	`+ /// ID of the tenant where the Azure resource exists`
	`77`	`+ /// </summary>`
	`78`	`+ public string AzureTenantId { get; set; }`
`74`	`79`	`}`
`75`	`80`	`}`