From f03d4c80ff8e7ab95e4817d3ed6ff0e15f8176be Mon Sep 17 00:00:00 2001
From: Christian Kadluba <10721825+ckadluba@users.noreply.github.com>
Date: Fri, 31 Dec 2021 01:56:32 +0100
Subject: [PATCH] Fixed target framework dependent test includes (exevute a lot
 more tests than before).

---
 .../GlobalSuppressions.cs                     |  2 +-
 .../Serilog.Sinks.MSSqlServer.Tests.csproj    | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/GlobalSuppressions.cs b/test/Serilog.Sinks.MSSqlServer.Tests/GlobalSuppressions.cs
index 27e8ada0..7aa910bb 100644
--- 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
index b7f42160..7b8faa89 100644
--- a/test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj
+++ b/test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net452;net462;netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>Serilog.Sinks.MSSqlServer.Tests</AssemblyName>
@@ -18,10 +18,7 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Dapper.StrongName" Version="1.50.5" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
     <PackageReference Include="Moq" Version="4.14.1" />
     <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
@@ -47,6 +44,14 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <Compile Include="Configuration\Extensions\System.Configuration\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
     <Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
     <Compile Include="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStubTests.cs" />
   </ItemGroup>
@@ -60,13 +65,10 @@
     <PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.core" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <Compile Remove="**\*.*" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="TestUtils\**\*.cs" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"/>
+    <Compile Remove="Configuration\Extensions\System.Configuration\**\*.cs" />
+    <Compile Remove="Configuration\Implementations\System.Configuration\**\*.cs" />
+    <Compile Remove="Sinks\MSSqlServer\Platform\AzureManagedServiceAuthenticatorStubTests.cs" />
     <Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
     <Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
     <Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />