From ace54e1a9cfb5266d15e7856f9e071e58311e355 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jestedfa@microsoft.com>
Date: Mon, 18 Nov 2024 15:51:51 -0500
Subject: [PATCH] Drop support for net6.0 (Microsoft support ended Nov 12,
 2024)

https://learn.microsoft.com/en-us/lifecycle/products/microsoft-net-and-net-core
---
 MailKit/MailKit.csproj     |  4 ++--
 MailKit/MailKitLite.csproj |  4 ++--
 UnitTests/UnitTests.csproj |  2 +-
 nuget/MailKit.nuspec       | 10 +---------
 nuget/MailKitLite.nuspec   | 10 +---------
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/MailKit/MailKit.csproj b/MailKit/MailKit.csproj
index 4449f86ffe..f2cea8401d 100644
--- a/MailKit/MailKit.csproj
+++ b/MailKit/MailKit.csproj
@@ -6,12 +6,12 @@
     <VersionPrefix>4.8.0</VersionPrefix>
     <Authors>Jeffrey Stedfast</Authors>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AssemblyName>MailKit</AssemblyName>
     <PackageId>MailKit</PackageId>
-    <PackageTags>smtp;pop3;imap;mime;security;dkim;smime;s/mime;openpgp;pgp;mbox;mail;email;parser;tnef;net462;net47;net48;net6.0;net8.0;netstandard;netstandard2.0;netstandard2.1</PackageTags>
+    <PackageTags>smtp;pop3;imap;mime;security;dkim;smime;s/mime;openpgp;pgp;mbox;mail;email;parser;tnef;net462;net47;net48;net8.0;netstandard;netstandard2.0;netstandard2.1</PackageTags>
     <PackageProjectUrl>https://github.com/jstedfast/MailKit</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/jstedfast/MailKit/blob/master/License.md</PackageLicenseUrl>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
diff --git a/MailKit/MailKitLite.csproj b/MailKit/MailKitLite.csproj
index 1176376710..00adba2cd3 100644
--- a/MailKit/MailKitLite.csproj
+++ b/MailKit/MailKitLite.csproj
@@ -6,12 +6,12 @@
     <VersionPrefix>4.8.0</VersionPrefix>
     <Authors>Jeffrey Stedfast</Authors>
     <LangVersion>10</LangVersion>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AssemblyName>MailKitLite</AssemblyName>
     <PackageId>MailKitLite</PackageId>
-    <PackageTags>smtp;pop3;imap;mime;security;dkim;smime;s/mime;openpgp;pgp;mbox;mail;email;parser;tnef;net462;net47;net48;net6.0;net8.0;netstandard;netstandard2.0;netstandard2.1</PackageTags>
+    <PackageTags>smtp;pop3;imap;mime;security;dkim;smime;s/mime;openpgp;pgp;mbox;mail;email;parser;tnef;net462;net47;net48;net8.0;netstandard;netstandard2.0;netstandard2.1</PackageTags>
     <PackageProjectUrl>https://github.com/jstedfast/MailKit</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/jstedfast/MailKit/blob/master/License.md</PackageLicenseUrl>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index b3c653d539..2d06e85f70 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>10</LangVersion>
     <AssemblyName>UnitTests</AssemblyName>
     <DebugSymbols>true</DebugSymbols>
diff --git a/nuget/MailKit.nuspec b/nuget/MailKit.nuspec
index e328f65f58..1e43a9cb18 100644
--- a/nuget/MailKit.nuspec
+++ b/nuget/MailKit.nuspec
@@ -33,7 +33,7 @@ Features include:
     </releaseNotes>
     <copyright>.NET Foundation and Contributors</copyright>
     <language>en-US</language>
-    <tags>smtp pop3 imap mime security arc dkim smime s/mime openpgp pgp mbox mail email parser tnef net462 net47 net48 net6.0 netstandard netstandard2.0 netstandard2.1</tags>
+    <tags>smtp pop3 imap mime security arc dkim smime s/mime openpgp pgp mbox mail email parser tnef net462 net47 net48 net8.0 netstandard netstandard2.0 netstandard2.1</tags>
     <readme>docs\README.md</readme>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5.2" />
@@ -69,10 +69,6 @@ Features include:
         <dependency id="System.Threading.Tasks.Extensions" version="4.6.0" />
         <dependency id="MimeKit" version="4.8.0" />
       </group>
-      <group targetFramework="net6.0">
-        <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKit" version="4.8.0" />
-      </group>
       <group targetFramework="net8.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="MimeKit" version="4.8.0" />
@@ -113,10 +109,6 @@ Features include:
     <file src="..\MailKit\bin\Release\net48\MailKit.pdb" target="lib\net48\MailKit.pdb" />
     <file src="..\MailKit\bin\Release\net48\MailKit.xml" target="lib\net48\MailKit.xml" />
     <file src="..\MailKit\bin\Release\net48\MailKit.dll.config" target="lib\net48\MailKit.dll.config" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKit.dll" target="lib\net6.0\MailKit.dll" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKit.pdb" target="lib\net6.0\MailKit.pdb" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKit.xml" target="lib\net6.0\MailKit.xml" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKit.dll.config" target="lib\net6.0\MailKit.dll.config" />
     <file src="..\MailKit\bin\Release\net8.0\MailKit.dll" target="lib\net8.0\MailKit.dll" />
     <file src="..\MailKit\bin\Release\net8.0\MailKit.pdb" target="lib\net8.0\MailKit.pdb" />
     <file src="..\MailKit\bin\Release\net8.0\MailKit.xml" target="lib\net8.0\MailKit.xml" />
diff --git a/nuget/MailKitLite.nuspec b/nuget/MailKitLite.nuspec
index 2f169a8eb1..648fcf2bde 100644
--- a/nuget/MailKitLite.nuspec
+++ b/nuget/MailKitLite.nuspec
@@ -33,7 +33,7 @@ Features include:
     </releaseNotes>
     <copyright>.NET Foundation and Contributors</copyright>
     <language>en-US</language>
-    <tags>smtp pop3 imap mime security arc dkim smime s/mime openpgp pgp mbox mail email parser tnef net462 net47 net48 net6.0 netstandard netstandard2.0 netstandard2.1</tags>
+    <tags>smtp pop3 imap mime security arc dkim smime s/mime openpgp pgp mbox mail email parser tnef net462 net47 net48 net8.0 netstandard netstandard2.0 netstandard2.1</tags>
     <readme>docs\README.md</readme>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6.2" />
@@ -65,10 +65,6 @@ Features include:
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
         <dependency id="MimeKitLite" version="4.8.0" />
       </group>
-      <group targetFramework="net6.0">
-        <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKitLite" version="4.8.0" />
-      </group>
       <group targetFramework="net8.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="MimeKitLite" version="4.8.0" />
@@ -109,10 +105,6 @@ Features include:
     <file src="..\MailKit\bin\Release\net48\MailKitLite.pdb" target="lib\net48\MailKitLite.pdb" />
     <file src="..\MailKit\bin\Release\net48\MailKitLite.xml" target="lib\net48\MailKitLite.xml" />
     <file src="..\MailKit\bin\Release\net48\MailKitLite.dll.config" target="lib\net48\MailKitLite.dll.config" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKitLite.dll" target="lib\net6.0\MailKitLite.dll" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKitLite.pdb" target="lib\net6.0\MailKitLite.pdb" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKitLite.xml" target="lib\net6.0\MailKitLite.xml" />
-    <file src="..\MailKit\bin\Release\net6.0\MailKitLite.dll.config" target="lib\net6.0\MailKitLite.dll.config" />
     <file src="..\MailKit\bin\Release\net8.0\MailKitLite.dll" target="lib\net8.0\MailKitLite.dll" />
     <file src="..\MailKit\bin\Release\net8.0\MailKitLite.pdb" target="lib\net8.0\MailKitLite.pdb" />
     <file src="..\MailKit\bin\Release\net8.0\MailKitLite.xml" target="lib\net8.0\MailKitLite.xml" />