Commit d03089e

committed

#7 - Rework platform abstractions for .netcore to allow windowsauth module

1 parent 470fa04 commit d03089eCopy full SHA for d03089e

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,19 @@ static AuthenticationPluginManager()`
`36`	`36`	`{`
`37`	`37`	`plugins["mysql_native_password"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.MySqlNativePasswordPlugin");`
`38`	`38`	`plugins["sha256_password"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.Sha256AuthenticationPlugin");`
`39`		`-#if !CF && !RT&&!NETSTANDARD1_3`
	`39`	`+#if !CF && !RT`
`40`	`40`	`plugins["authentication_windows_client"] = new PluginInfo("MySql.Data.MySqlClient.Authentication.MySqlWindowsAuthenticationPlugin");`
	`41`	`+#if !NETSTANDARD1_3`
`41`	`42`	`if (MySqlConfiguration.Settings != null && MySqlConfiguration.Settings.AuthenticationPlugins != null)`
`42`	`43`	`{`
`43`	`44`	`foreach (AuthenticationPluginConfigurationElement e in MySqlConfiguration.Settings.AuthenticationPlugins)`
`44`	`45`	`plugins[e.Name] = new PluginInfo(e.Type);`
`45`	`46`	`}`
`46`	`47`	`#endif`
`47`		`- }`
	`48`	`+#endif`
	`49`	`+ }`
`48`	`50`
`49`		`- public static MySqlAuthenticationPlugin GetPlugin(string method)`
	`51`	`+ public static MySqlAuthenticationPlugin GetPlugin(string method)`
`50`	`52`	`{`
`51`	`53`	`if (!plugins.ContainsKey(method))`
`52`	`54`	`throw new MySqlException(String.Format(Resources.AuthenticationMethodNotSupported, method));`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,10 @@ internal class MySqlWindowsAuthenticationPlugin : MySqlAuthenticationPlugin`
`47`	`47`	`protected override void CheckConstraints()`
`48`	`48`	`{`
`49`	`49`	`string platform = String.Empty;`
`50`		`-#if !RT && !NETSTANDARD1_3`
`51`		`- int p = (int)Environment.OSVersion.Platform;`
`52`		`- if ((p == 4) \|\| (p == 128))`
	`50`	`+#if !RT`
	`51`	`+ if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`53`	`52`	`platform = "Unix";`
`54`		`- else if (Environment.OSVersion.Platform==PlatformID.MacOSX)`
	`53`	`+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`55`	`54`	`platform = "Mac OS/X";`
`56`	`55`
`57`	`56`	`if (!String.IsNullOrEmpty(platform))`

Comments

(0)