Updated to latest Cofoundry and fixed compatibility issues. Also updated to v2 of MailKit

HeyJoel · HeyJoel · commit a0c5ff39637f · 2018-02-15T17:05:27.000Z
diff --git a/src/Cofoundry.Plugins.Mail.MailKit/Bootstrap/MailKitDependencyRegistration.cs b/src/Cofoundry.Plugins.Mail.MailKit/Bootstrap/MailKitDependencyRegistration.cs
@@ -17,8 +17,8 @@ public void Register(IContainerRegister container)
             var overrideOptions = RegistrationOptions.Override();
 
             container
-                .RegisterType<IMailDispatchService, MailKitMailDispatchService>(overrideOptions)
-                .RegisterType<ISmtpClientConnectionConfiguration, SmtpClientConnectionConfiguration>()
+                .Register<IMailDispatchService, MailKitMailDispatchService>(overrideOptions)
+                .Register<ISmtpClientConnectionConfiguration, SmtpClientConnectionConfiguration>()
                 ; 
         }
     }
diff --git a/src/Cofoundry.Plugins.Mail.MailKit/Cofoundry.Plugins.Mail.MailKit.csproj b/src/Cofoundry.Plugins.Mail.MailKit/Cofoundry.Plugins.Mail.MailKit.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Cofoundry.Core" Version="0.2.0-beta0054" />
-    <PackageReference Include="MailKit" Version="1.20.0" />
+    <PackageReference Include="Cofoundry.Core" Version="0.2.0-beta0098" />
+    <PackageReference Include="MailKit" Version="2.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cofoundry.Plugins.Mail.MailKit/SmtpClientConnectionConfiguration.cs b/src/Cofoundry.Plugins.Mail.MailKit/SmtpClientConnectionConfiguration.cs
@@ -36,6 +36,8 @@ public virtual void Initialize(SmtpClient smtpClient)
             // Note: all samples disable the OAuth2/XOAUTH2 authentication mechanism. Will leave it out until we have a use case
             if (smtpClient.AuthenticationMechanisms.Contains(OAUTH2_MECHANISM))
             {
+                // since 2.0 this looks like it has been removed anyway
+                // https://github.com/jstedfast/MailKit/blob/master/ReleaseNotes.md#mailkit-200
                 smtpClient.AuthenticationMechanisms.Remove(OAUTH2_MECHANISM);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public void Register(IContainerRegister container)`
`17`	`17`	`var overrideOptions = RegistrationOptions.Override();`
`18`	`18`
`19`	`19`	`container`
`20`		`- .RegisterType<IMailDispatchService, MailKitMailDispatchService>(overrideOptions)`
`21`		`- .RegisterType<ISmtpClientConnectionConfiguration, SmtpClientConnectionConfiguration>()`
	`20`	`+ .Register<IMailDispatchService, MailKitMailDispatchService>(overrideOptions)`
	`21`	`+ .Register<ISmtpClientConnectionConfiguration, SmtpClientConnectionConfiguration>()`
`22`	`22`	`;`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ public virtual void Initialize(SmtpClient smtpClient)`
`36`	`36`	`// Note: all samples disable the OAuth2/XOAUTH2 authentication mechanism. Will leave it out until we have a use case`
`37`	`37`	`if (smtpClient.AuthenticationMechanisms.Contains(OAUTH2_MECHANISM))`
`38`	`38`	`{`
	`39`	`+ // since 2.0 this looks like it has been removed anyway`
	`40`	`+ // https://github.com/jstedfast/MailKit/blob/master/ReleaseNotes.md#mailkit-200`
`39`	`41`	`smtpClient.AuthenticationMechanisms.Remove(OAUTH2_MECHANISM);`
`40`	`42`	`}`
`41`	`43`