Bumped version to 3.1.1

jstedfast · Jan 30, 2022 · 7f3affd · 7f3affd
1 parent f6f4a4e
commit 7f3affd
Show file tree

Hide file tree

Showing 17 changed files with 130 additions and 143 deletions.
diff --git a/Documentation/Documentation.shfbproj b/Documentation/Documentation.shfbproj
@@ -71,7 +71,7 @@
       <NamespaceSummaryItem name="MailKit.Search" isDocumented="True">The &lt;b&gt;MailKit.Search&lt;/b&gt; namespace provides classes that are necessary for searching folders for messages matching a set of criteria.</NamespaceSummaryItem>
       <NamespaceSummaryItem name="MailKit.Security" isDocumented="True">The &lt;b&gt;MailKit.Security&lt;/b&gt; namespace provides implementations of various SASL authentication mechanisms used by the IMAP, POP3 and SMTP clients.</NamespaceSummaryItem>
     </NamespaceSummaries>
-    <CopyrightText>Copyright &amp;#169%3b 2013-2021 Jeffrey Stedfast</CopyrightText>
+    <CopyrightText>Copyright &amp;#169%3b 2013-2022 Jeffrey Stedfast</CopyrightText>
     <WorkingPath>obj\</WorkingPath>
     <FooterText>&amp;lt%3b!-- Global site tag %28gtag.js%29 - Google Analytics --&amp;gt%3b
 &amp;lt%3bscript src=&amp;quot%3bhttps://www.googletagmanager.com/gtag/js%3fid=UA-63841238-1&amp;quot%3b&amp;gt%3b&amp;lt%3b/script&amp;gt%3b

diff --git a/MailKit/MailKit.csproj b/MailKit/MailKit.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>An Open Source cross-platform .NET mail-client library that is based on MimeKit and optimized for mobile devices.</Description>
     <AssemblyTitle>MailKit</AssemblyTitle>
-    <VersionPrefix>3.1.0</VersionPrefix>
+    <VersionPrefix>3.1.1</VersionPrefix>
     <Authors>Jeffrey Stedfast</Authors>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net452;net46;net47;net48;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/MailKit/MailKitLite.csproj b/MailKit/MailKitLite.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>An Open Source cross-platform .NET mail-client library that is based on MimeKit and optimized for mobile devices.</Description>
     <AssemblyTitle>MailKit</AssemblyTitle>
-    <VersionPrefix>3.1.0</VersionPrefix>
+    <VersionPrefix>3.1.1</VersionPrefix>
     <Authors>Jeffrey Stedfast</Authors>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net452;net46;net47;net48;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/MailKit/MailService.cs b/MailKit/MailService.cs
@@ -434,8 +434,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
 			case "imap.gmail.com":
 				switch (issuer) {
 				case GMailCertificateIssuer:
-					return (serial == "2265A3434A5225380A00000001224DAF" && fingerprint == "52A853B1121A4B1A7C5DBDBFD6CE39F068888A2B") // Expires 1/31/2022 3:11:05 AM
-						|| (serial == "00EC67725FAF05E6FD0A0000000125FF83" && fingerprint == "FF388B1BC174CBC3069B8709AB0CD93AF8077E94") // Expires 2/20/2022 10:08:30 PM
+					return (serial == "00EC67725FAF05E6FD0A0000000125FF83" && fingerprint == "FF388B1BC174CBC3069B8709AB0CD93AF8077E94") // Expires 2/20/2022 10:08:30 PM
 						|| (serial == "046BC24DECDA5A6B0A0000000127DC6E" && fingerprint == "084398CE28512023437CC8B417230F82B39CACDA") // Expires 3/2/2022 5:19:16 PM
 						|| (serial == "6A3FFF463AE7156B0A000000012B7FF0" && fingerprint == "8E7E263CC155C62F07F7B5EEFBF1534EDDE18890"); // Expires 3/21/2022 3:44:38 AM
 				default:
@@ -444,8 +443,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
 			case "pop.gmail.com":
 				switch (issuer) {
 				case GMailCertificateIssuer:
-					return (serial == "32D8D7A3EB3680B80A00000001224DB8" && fingerprint == "664F07AEDFC6D1BB25669D6470CC84371F30146D") // Expires 1/31/2022 3:11:21 AM
-						|| (serial == "309330098BF137760A0000000125FF88" && fingerprint == "30E95BB5541E924141CAEAB01B48FF20B308ED3C") // Expires 2/20/2022 10:08:45 PM
+					return (serial == "309330098BF137760A0000000125FF88" && fingerprint == "30E95BB5541E924141CAEAB01B48FF20B308ED3C") // Expires 2/20/2022 10:08:45 PM
 						|| (serial == "053FC7A9BF15DCD90A0000000127DC72" && fingerprint == "DD6D24F2EC8DDB330C092C4E09340B3803B08062") // Expires 3/2/2022 5:19:31 PM
 						|| (serial == "5280627D1577C4340A000000012B7FF3" && fingerprint == "043B07F8568296BF0732922EA2F2B1D5225799B5"); // Expires 3/21/2022 3:44:52 AM
 				default:
@@ -454,8 +452,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
 			case "smtp.gmail.com":
 				switch (issuer) {
 				case GMailCertificateIssuer:
-					return (serial == "00BDF6AD1401715D6B0A00000001224DCA" && fingerprint == "4B4948C238114FC92F31C59E5B85C73D1E47BADB") // Expires 1/31/2022 3:12:48 AM
-						|| (serial == "00F3402FC1B5A7247E0A0000000125FFA2" && fingerprint == "2B4D501A49992D659F9FFBA5D18D09E431BA9CEB") // Expires 2/20/2022 10:10:08 PM
+					return (serial == "00F3402FC1B5A7247E0A0000000125FFA2" && fingerprint == "2B4D501A49992D659F9FFBA5D18D09E431BA9CEB") // Expires 2/20/2022 10:10:08 PM
 						|| (serial == "00FDAE95407FD0D7510A0000000127DC80" && fingerprint == "C350243812AB4D6EDCBB59ED90B3139EB96957F8") // Expires 3/2/2022 5:20:56 PM
 						|| (serial == "0FC2B2627A5FF8FC0A000000012B7FFE" && fingerprint == "1A22D54BAFDC0916547CB0D80F39EA88954C8F5B"); // Expires 3/21/2022 3:46:10 AM
 				default:
@@ -464,8 +461,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
 			case "outlook.com":
 				switch (issuer) {
 				case OutlookCertificateIssuer:
-					return (serial == "0CCAC32B0EF281026392B8852AB15642" && fingerprint == "CBAA1582F1E49AD1D108193B5D38B966BE4993C6") // Expires 1/21/2022 6:59:59 PM
-						|| (serial == "0CE67C905DDE83B20E77606A636AB967" && fingerprint == "E295CCF7F125F70907C2E7F97EF0F5E7D5704DE6") // Expires 10/23/2022 7:59:59 PM
+					return (serial == "0CE67C905DDE83B20E77606A636AB967" && fingerprint == "E295CCF7F125F70907C2E7F97EF0F5E7D5704DE6") // Expires 10/23/2022 7:59:59 PM
 						|| (serial == "010CB801C9719EE668C7A803EFD5D8C4" && fingerprint == "5223FB99040188673B9847FAF8EAC3531F0FE55B") // Expires 12/12/2022 6:59:59 PM
 						|| (serial == "08349B4851225195DE03A3515F5600BE" && fingerprint == "02D13AF3D6DF147C2573AE8793AB8FBE8461E4CD") // Expires 12/12/2022 6:59:59 PM
 						|| (serial == "0B9E5C99FC34EBBF53EECD242509420C" && fingerprint == "C013CFEFD55B3D38101DAB624C89A0E046A8A587") // Expires 12/22/2022 6:59:59 PM
@@ -479,6 +475,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
 						|| (serial == "052EAC2D0BB68BA1A27E236FF6A48EDE" && fingerprint == "1F84128281B98D0A7AD21C17A9E7CFE150AE24E1") // Expires 12/22/2022 6:59:59 PM
 						|| (serial == "05CF601FAD764AE86FD1CC173DBE358B" && fingerprint == "33CBCB82CA0697FAEB87DBE6766E22E8B0729D5E") // Expires 12/22/2022 6:59:59 PM
 						|| (serial == "0CF35BFC2811106763FF7B797DCF1BFF" && fingerprint == "47CB819B4CC48DB9E63F09B25EDE1A20B834A151") // Expires 12/22/2022 6:59:59 PM
+						|| (serial == "017AD2ED2E361E76CEC93AB14218851D" && fingerprint == "B22A5C780B64C7A6915493760FDEE2D9709E79F1") // Expires 12/22/2022 6:59:59 PM
 						|| (serial == "09248624EDC9886EBC1013A9C06E13FE" && fingerprint == "8A92F2C7BFA8B78E453D00E65EAA5F7C0D89FDEA") // Expires 12/22/2022 11:59:59 PM
 						|| (serial == "0F71C8C0B67D41BC5A0CE715334711E3" && fingerprint == "405D32901FC1E18E6BCE2B4C53A6788DE9702598") // Expires 12/23/2022 6:59:59 PM
 						|| (serial == "08D3CAD9D9C04D44DC4795B0F94ABF48" && fingerprint == "F2E96865A36C2EDA003F021907F32539C1C9FD97"); // Expires 12/23/2022 6:59:59 PM
@@ -494,8 +491,7 @@ internal static bool IsKnownMailServerCertificate (X509Certificate2 certificate)
 			case "legacy.pop.mail.yahoo.com":
 				switch (issuer) {
 				case YahooCertificateIssuer:
-					return (serial == "09CC4977A4C14D4388D90CF6676385FE" && fingerprint == "7BA05AF724299FF0688842ADEF2837DE25F3C4FD") // Expires 12/22/2021 6:59:59 PM
-						|| (serial == "03B1E9610E0E209A4EA8FC192EBF55D7" && fingerprint == "7C32F642167257B00E55A9C5DC3E35F1719193BD"); // Expires 5/18/2022 11:59:59 PM
+					return (serial == "03B1E9610E0E209A4EA8FC192EBF55D7" && fingerprint == "7C32F642167257B00E55A9C5DC3E35F1719193BD"); // Expires 5/18/2022 11:59:59 PM
 				default:
 					return false;
 				}

diff --git a/MailKit/Properties/AssemblyInfo.cs b/MailKit/Properties/AssemblyInfo.cs
@@ -79,6 +79,6 @@
 //
 // If there have only been bug fixes, bump the Micro Version and/or the Build Number
 //    in the AssemblyFileVersion attribute.
-[assembly: AssemblyInformationalVersion ("3.1.0.0")]
-[assembly: AssemblyFileVersion ("3.1.0.0")]
+[assembly: AssemblyInformationalVersion ("3.1.1.0")]
+[assembly: AssemblyFileVersion ("3.1.1.0")]
 [assembly: AssemblyVersion ("3.1.0.0")]
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,12 @@
 # Release Notes
 
+### MailKit 3.1.1 (2022-01-30)
+
+* Reduced string allocations in Pop3Engine's capability parser.
+* Updated GMail and Outlook.com SSL certificates.
+* Modified SmtpClient to try and use the system hostname in EHLO/HELO commands.
+  (issue [#1314](https://github.com/jstedfast/MailKit/issues/1314))
+
 ### MailKit 3.1.0 (2022-01-14)
 
 * Fixed NTLM to always prefer the supplied domain over the TargetName or TargetInfo.DomainName.

diff --git a/nuget/MailKit.nuspec b/nuget/MailKit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>MailKit</id>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <title>MailKit</title>
     <authors>Jeffrey Stedfast</authors>
     <owners>Jeffrey Stedfast</owners>
@@ -26,13 +26,9 @@ Features include:
     </description>
     <summary>An Open Source .NET mail-client library for Windows, Mac, Linux, and mobile platforms such as iOS and Android.</summary>
     <releaseNotes>
-* Fixed NTLM to always prefer the supplied domain over the TargetName or TargetInfo.DomainName. (issue #582)
-* Updated GMail and Outlook.com SSL certificate info.
-* Added a new SslCipherSuite property to each client that allows developers to get information about the SSL/TLS cipher suite that was negotiated with the server. (pull #1312)
-* Reduced string allocations in SmtpClient's EHLO capability parsing logic.
-* Default ProtocolLogger.RedactSecrets to true for added added security.
-* Added work-around for parsing malformed GMail ENVELOPE responses that reverse the name and address components of the Sender address. (pull #1319)
-* Added net6.0 to the list of TargetFrameworks.
+* Reduced string allocations in Pop3Engine's capability parser.
+* Updated GMail and Outlook.com SSL certificates.
+* Modified SmtpClient to try and use the system hostname in EHLO/HELO commands. (issue #1314)
     </releaseNotes>
     <copyright>.NET Foundation and Contributors</copyright>
     <language>en-US</language>
@@ -65,28 +61,28 @@ Features include:
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework="net452">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="net46">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="net47">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="net48">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="net5.0">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
       <group targetFramework="netstandard2.1">
-        <dependency id="MimeKit" version="3.1.0" />
+        <dependency id="MimeKit" version="3.1.1" />
       </group>
     </dependencies>
   </metadata>

diff --git a/nuget/MailKitLite.nuspec b/nuget/MailKitLite.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>MailKitLite</id>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <title>MailKit</title>
     <authors>Jeffrey Stedfast</authors>
     <owners>Jeffrey Stedfast</owners>
@@ -26,13 +26,9 @@ Features include:
     </description>
     <summary>An Open Source .NET mail-client library for Windows, Mac, Linux, and mobile platforms such as iOS and Android.</summary>
     <releaseNotes>
-* Fixed NTLM to always prefer the supplied domain over the TargetName or TargetInfo.DomainName. (issue #582)
-* Updated GMail and Outlook.com SSL certificate info.
-* Added a new SslCipherSuite property to each client that allows developers to get information about the SSL/TLS cipher suite that was negotiated with the server. (pull #1312)
-* Reduced string allocations in SmtpClient's EHLO capability parsing logic.
-* Default ProtocolLogger.RedactSecrets to true for added added security.
-* Added work-around for parsing malformed GMail ENVELOPE responses that reverse the name and address components of the Sender address. (pull #1319)
-* Added net6.0 to the list of TargetFrameworks.
+* Reduced string allocations in Pop3Engine's capability parser.
+* Updated GMail and Outlook.com SSL certificates.
+* Modified SmtpClient to try and use the system hostname in EHLO/HELO commands. (issue #1314)
     </releaseNotes>
     <copyright>.NET Foundation and Contributors</copyright>
     <language>en-US</language>
@@ -65,28 +61,28 @@ Features include:
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework="net452">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="net46">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="net47">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="net48">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="net5.0">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
       <group targetFramework="netstandard2.1">
-        <dependency id="MimeKitLite" version="3.1.0" />
+        <dependency id="MimeKitLite" version="3.1.1" />
       </group>
     </dependencies>
   </metadata>

diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
@@ -48,7 +48,7 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="3.1.0" />
+    <PackageReference Include="MailKit" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
@@ -72,7 +72,7 @@
     <Reference Include="MonoTouch.Dialog-1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="3.1.0" />
+    <PackageReference Include="MailKit" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json">

diff --git a/samples/ImapClientDemo/ImapClientDemo/App.config b/samples/ImapClientDemo/ImapClientDemo/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"/>
   </runtime>
 </configuration>
diff --git a/samples/ImapClientDemo/ImapClientDemo/ImapClientDemo.csproj b/samples/ImapClientDemo/ImapClientDemo/ImapClientDemo.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ImapClientDemo</RootNamespace>
     <AssemblyName>ImapClientDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -46,7 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="3.1.0" />
+    <PackageReference Include="MailKit" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FolderSelectedEventArgs.cs" />
@@ -86,6 +87,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -125,4 +127,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>