Merge pull request #30 from NLog/mailkit-v2

Mailkit v2 - Version 3
NLog · Aug 27, 2018 · ebf994b · ebf994b
2 parents 6258b2e + a267f2e
commit ebf994b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/NLog.MailKit/NLog.MailKit.csproj b/src/NLog.MailKit/NLog.MailKit.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard1.5;net40;netstandard2.0</TargetFrameworks>
-    <Version>2.2</Version>
+    <TargetFrameworks>netstandard1.3;netstandard1.5;net45;netstandard2.0</TargetFrameworks>
+    <Version>3.0</Version>
     <Authors>Julian Verdurmen</Authors>
     <Company>NLog</Company>
-    <Description>NLog Mail Target for .NET Core &amp; .NET Standard, and .NET 4+ using MailKit.
+    <Description>NLog Mail Target for .NET Core &amp; .NET Standard, and .NET 4.5+ using MailKit.
 
 This package add the mail target to NLog and has the same options as the original Mail Target.
 
-If the mail target was already available on your platform (.NET Standard 2+, .NET 4+),
+If the mail target was already available on your platform (.NET Standard 2+, .NET 4.5),
 this package will overwrite the original Mail Target.
 
 Compared to the original MailTarget, the following options aren't implemented:
@@ -26,6 +26,7 @@ Compared to the original MailTarget, the following options aren't implemented:
     <AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
     <PackageReleaseNotes>
+      3.0: MailKit 2.0, Update NLog. Minimal support for .NET moved from 4.0 to 4.5
       2.2 NLog 4.5, updated mailkit, netstandard1.3
 
       2.1.1 Remove dependency to NLog 5
@@ -49,18 +50,9 @@ Small breaking change, SmtpAuthenticationMode has been moved to this dll.
     <DefineConstants>RELEASE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="1.22.0" />
+    <PackageReference Include="MailKit" Version="2.0.6" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <PackageReference Include="NLog" Version="4.5.0" />
-  </ItemGroup>
-   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="NLog" Version="4.5.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
-    <PackageReference Include="NLog" Version="4.5.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="NLog" Version="4.5.0" />
+  <ItemGroup>
+    <PackageReference Include="NLog" Version="4.5.9" />
   </ItemGroup>
 </Project>
diff --git a/test/NLog.MailKit.Tests/NLog.MailKit.Tests.csproj b/test/NLog.MailKit.Tests/NLog.MailKit.Tests.csproj
@@ -5,10 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="SmtpServer" Version="2.2.0" />
-    <PackageReference Include="xunit" Version="2.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>