Skip to content

Commit fbcfc1b

Browse files
authored
Merge pull request #371 from ckadluba/azure-tennant-tests-fixes
Updated EOL .NET framework and README correction
2 parents a32d579 + 35479ea commit fbcfc1b

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ Because of the way external configuration has been implemented in various .NET f
8888
| Your Framework | TFM | Project Types | External Configuration |
8989
| --- | --- | --- | --- |
9090
| .NET Framework 4.5.2 | `net452` | app or library | _System.Configuration_ |
91-
| .NET Framework 4.6.1+ | `net461` | app or library | _System.Configuration_ |
92-
| .NET Framework 4.6.1+ | `net461` | app or library | _Microsoft.Extensions.Configuration_ |
91+
| .NET Framework 4.6.2+ | `net462` | app or library | _System.Configuration_ |
92+
| .NET Framework 4.6.2+ | `net462` | app or library | _Microsoft.Extensions.Configuration_ |
9393
| .NET Standard 2.0 | `netstandard2.0` | library only | _Microsoft.Extensions.Configuration_ |
9494
| .NET Core 3.1+ | `netcoreapp3.1` | app or library | _System.Configuration_ |
9595
| .NET Core 3.1+ | `netcoreapp3.1` | app or library | _Microsoft.Extensions.Configuration_ |
9696

97-
Support for .NET Framework 4.5.2 is tied to the Windows 8.1 lifecycle with support scheduled to end in January 2023.
97+
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/).
9898

9999
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.
100100

@@ -247,6 +247,7 @@ Basic settings of the sink are configured using the properties in a `MSSqlServer
247247
* `EagerlyEmitFirstEvent`
248248
* `UseAzureManagedIdentity`
249249
* `AzureServiceTokenProviderResource`
250+
* `AzureTenantId`
250251

251252
### TableName
252253

sample/AppConfigDemo/AppConfigDemo.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>AppConfigDemo</RootNamespace>
1010
<AssemblyName>AppConfigDemo</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
@@ -126,4 +126,4 @@
126126
</PropertyGroup>
127127
<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'))" />
128128
</Target>
129-
</Project>
129+
</Project>

src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>A Serilog sink that writes events to Microsoft SQL Server</Description>
55
<VersionPrefix>5.7.0</VersionPrefix>
66
<Authors>Michiel van Oudheusden;Christian Kadluba;Serilog Contributors</Authors>
7-
<TargetFrameworks>netstandard2.0;net452;net461;net472;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;net452;net462;net472;netcoreapp3.1</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Serilog.Sinks.MSSqlServer</AssemblyName>
@@ -67,7 +67,7 @@
6767
<Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
6868
<Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStub.cs" />
6969
</ItemGroup>
70-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
70+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
7171
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
7272
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
7373
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Threading.Tasks;
44

55
// This is an empty stub implementaion of IAzureManagedServiceAuthenticator for the target frameworks
6-
// that don't support Azure Managed Identities (net452, net461, netstandard2.0, netcoreapp2.0).
6+
// that don't support Azure Managed Identities (net452, net462, netstandard2.0, netcoreapp2.0).
77
namespace Serilog.Sinks.MSSqlServer.Platform
88
{
99
[SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Empty stub but has to implement interface therefore parameters are not used.")]

0 commit comments

Comments
 (0)