diff --git a/EFCore/src/MySql.Data.EFCore.Design/MySql.Data.EntityFrameworkCore.Design.csproj b/EFCore/src/MySql.Data.EFCore.Design/MySql.Data.EntityFrameworkCore.Design.csproj index 08f3bd3f9..3e43673f0 100644 --- a/EFCore/src/MySql.Data.EFCore.Design/MySql.Data.EntityFrameworkCore.Design.csproj +++ b/EFCore/src/MySql.Data.EFCore.Design/MySql.Data.EntityFrameworkCore.Design.csproj @@ -2,9 +2,9 @@ Design-time Entity Framework Core Functionality for MySQL Server. - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452;netstandard1.3 $(NoWarn);CS1591 diff --git a/EFCore/src/MySql.Data.EFCore/Frameworks/efcore10/Properties/AssemblyInfo.cs b/EFCore/src/MySql.Data.EFCore/Frameworks/efcore10/Properties/AssemblyInfo.cs index 01a37868c..2212b0950 100644 --- a/EFCore/src/MySql.Data.EFCore/Frameworks/efcore10/Properties/AssemblyInfo.cs +++ b/EFCore/src/MySql.Data.EFCore/Frameworks/efcore10/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// Copyright © 2017, 2018 Oracle and/or its affiliates. All rights reserved. +// Copyright © 2017, 2019 Oracle and/or its affiliates. All rights reserved. // // MySQL Connector/NET is licensed under the terms of the GPLv2 // , like most @@ -24,5 +24,5 @@ [assembly: DesignTimeProviderServices( typeName: "MySql.Data.EntityFrameworkCore.Design.Internal.MySQLDesignTimeServices", - assemblyName: "MySql.Data.EntityFrameworkCore.Design, Version=6.10.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d", + assemblyName: "MySql.Data.EntityFrameworkCore.Design, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d", packageName: "MySql.Data.EntityFrameworkCore.Design")] diff --git a/EFCore/src/MySql.Data.EFCore/MySql.Data.EntityFrameworkCore.csproj b/EFCore/src/MySql.Data.EFCore/MySql.Data.EntityFrameworkCore.csproj index 3442d2dfb..b187709bf 100644 --- a/EFCore/src/MySql.Data.EFCore/MySql.Data.EntityFrameworkCore.csproj +++ b/EFCore/src/MySql.Data.EFCore/MySql.Data.EntityFrameworkCore.csproj @@ -2,9 +2,9 @@ MySql.Data.EntityFrameworkCore for Entity Framework. - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle netstandard2.0;net452;netstandard1.3;net461; $(NoWarn);CS1591 diff --git a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj index 3bb3523b7..7f170915c 100644 --- a/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj +++ b/EFCore/tests/MySql.EFCore.Basic.Tests/MySql.EntityFrameworkCore.Basic.Tests.csproj @@ -2,8 +2,8 @@ MySql.EntityFrameworkCore.Basic.Tests Class Library - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. - 6.10.8 + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. + 6.10.9 Oracle netcoreapp2.2;netcoreapp1.1;net452;net461; MySql.EntityFrameworkCore.Basic.Tests diff --git a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj index 99b4a548f..2aa5e5016 100644 --- a/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj +++ b/EFCore/tests/MySql.EFCore.Design.Tests/MySql.EntityFrameworkCore.Design.Tests.csproj @@ -2,8 +2,8 @@ MySql.EntityFrameworkCore.Design.Tests Class Library - Copyright © 2018, Oracle and/or its affiliates. All rights reserved. - 6.10.8 + Copyright © 2019, Oracle and/or its affiliates. All rights reserved. + 6.10.9 Oracle netcoreapp2.2;netcoreapp1.1;net452;net461; MySql.EntityFrameworkCore.Design.Tests diff --git a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj index 1270104ab..4553c2fec 100644 --- a/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj +++ b/EFCore/tests/MySql.EFCore.Migrations.Tests/MySql.EntityFrameworkCore.Migrations.Tests.csproj @@ -2,8 +2,8 @@ MySql.EntityFrameworkCore.Migrations.Tests Class Library - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. - 6.10.8 + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. + 6.10.9 Oracle netcoreapp2.2;netcoreapp1.1;net452;net461; MySql.EntityFrameworkCore.Migrations.Tests diff --git a/EntityFramework6/src/MySql.Data.Entity.EF6.csproj b/EntityFramework6/src/MySql.Data.Entity.EF6.csproj index c3f516aa3..e46c2dcfd 100644 --- a/EntityFramework6/src/MySql.Data.Entity.EF6.csproj +++ b/EntityFramework6/src/MySql.Data.Entity.EF6.csproj @@ -2,9 +2,9 @@ MySql.Data.Entity.EF6 - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452 $(NoWarn);CS1591 diff --git a/EntityFramework6/tests/MySql.EntityFramework6.Basic.Tests/MySql.EntityFramework6.Basic.Tests.csproj b/EntityFramework6/tests/MySql.EntityFramework6.Basic.Tests/MySql.EntityFramework6.Basic.Tests.csproj index 9cf19762c..014a1e591 100644 --- a/EntityFramework6/tests/MySql.EntityFramework6.Basic.Tests/MySql.EntityFramework6.Basic.Tests.csproj +++ b/EntityFramework6/tests/MySql.EntityFramework6.Basic.Tests/MySql.EntityFramework6.Basic.Tests.csproj @@ -4,7 +4,7 @@ MySql.Data.EF6.CodeFirst.Tests Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452 MySql.EntityFramework6.Basic.Tests diff --git a/EntityFramework6/tests/MySql.EntityFramework6.CodeFirst.Tests/MySql.EntityFramework6.CodeFirst.Tests.csproj b/EntityFramework6/tests/MySql.EntityFramework6.CodeFirst.Tests/MySql.EntityFramework6.CodeFirst.Tests.csproj index 20c3105e8..acf60737e 100644 --- a/EntityFramework6/tests/MySql.EntityFramework6.CodeFirst.Tests/MySql.EntityFramework6.CodeFirst.Tests.csproj +++ b/EntityFramework6/tests/MySql.EntityFramework6.CodeFirst.Tests/MySql.EntityFramework6.CodeFirst.Tests.csproj @@ -4,7 +4,7 @@ MySql.Data.EF6.CodeFirst.Tests Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452 MySql.EntityFramework6.CodeFirst.Tests diff --git a/EntityFramework6/tests/MySql.EntityFramework6.Migrations.Tests/MySql.EntityFramework6.Migrations.Tests.csproj b/EntityFramework6/tests/MySql.EntityFramework6.Migrations.Tests/MySql.EntityFramework6.Migrations.Tests.csproj index 55b461f3a..710b11615 100644 --- a/EntityFramework6/tests/MySql.EntityFramework6.Migrations.Tests/MySql.EntityFramework6.Migrations.Tests.csproj +++ b/EntityFramework6/tests/MySql.EntityFramework6.Migrations.Tests/MySql.EntityFramework6.Migrations.Tests.csproj @@ -4,7 +4,7 @@ MySql.Data.EF6.Migrations.Tests Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452 MySql.EntityFramework6.Migrations.Tests diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj index d422d5d19..e5b2b17ba 100644 --- a/MySQL.Data/src/MySql.Data.csproj +++ b/MySQL.Data/src/MySql.Data.csproj @@ -2,9 +2,9 @@ MySql.Data.MySqlClient .Net Core Class Library - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle MySql.Data netcoreapp2.2;net452;netstandard1.3;netstandard2.0 diff --git a/MySQL.Data/src/Properties/VersionInfo.cs b/MySQL.Data/src/Properties/VersionInfo.cs index e3d649491..3fbdfb269 100644 --- a/MySQL.Data/src/Properties/VersionInfo.cs +++ b/MySQL.Data/src/Properties/VersionInfo.cs @@ -1,4 +1,4 @@ -// Copyright � 2004, 2018 Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2004, 2019 Oracle and/or its affiliates. All rights reserved. // // MySQL Connector/NET is licensed under the terms of the GPLv2 // , like most @@ -34,6 +34,6 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("6.10.8")] -[assembly: AssemblyInformationalVersion("6.10.8")] +[assembly: AssemblyVersion("6.10.9")] +[assembly: AssemblyInformationalVersion("6.10.9")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/MySQL.Data/tests/ConnectionTests.cs b/MySQL.Data/tests/ConnectionTests.cs index a46c407bd..cc3f6d165 100644 --- a/MySQL.Data/tests/ConnectionTests.cs +++ b/MySQL.Data/tests/ConnectionTests.cs @@ -575,7 +575,7 @@ public void ConnectAttributes() [Trait("Category", "Security")] public void PasswordExpiration() { - if (Fixture.Version < new Version(5, 6, 6)) return; + if ((Fixture.Version < new Version(5, 6, 6)) || (Fixture.Version >= new Version(8, 0, 17))) return; const string expireduser = "expireduser"; const string expiredhost = "localhost"; @@ -705,6 +705,8 @@ public void CanConnectUsingFileBasedCertificate() [Fact] public void IPv6Connection() { + if (Fixture.Version < new Version(5, 6, 6)) return; + MySqlConnectionStringBuilder sb = new MySqlConnectionStringBuilder(Connection.ConnectionString); sb.Server = "::1"; using(MySqlConnection conn = new MySqlConnection(sb.ToString())) diff --git a/MySQL.Data/tests/DateTimeTests.cs b/MySQL.Data/tests/DateTimeTests.cs index afd6ec3f1..5df0770fe 100644 --- a/MySQL.Data/tests/DateTimeTests.cs +++ b/MySQL.Data/tests/DateTimeTests.cs @@ -1,4 +1,4 @@ -// Copyright © 2013, 2018, Oracle and/or its affiliates. All rights reserved. +// Copyright © 2013, 2019, Oracle and/or its affiliates. All rights reserved. // // MySQL Connector/NET is licensed under the terms of the GPLv2 // , like most @@ -254,7 +254,7 @@ public void MySqlDateTimeFormatting() { DateTime dt = DateTime.Now; MySqlDateTime mdt = new MySqlDateTime(dt); - Assert.Equal(dt.ToString(), mdt.ToString()); + Assert.Equal(dt.ToString(CultureInfo.InvariantCulture), mdt.ToString()); } /// diff --git a/MySQL.Data/tests/MySql.Data.Security.Tests.csproj b/MySQL.Data/tests/MySql.Data.Security.Tests.csproj index 96af254a9..9420ffabd 100644 --- a/MySQL.Data/tests/MySql.Data.Security.Tests.csproj +++ b/MySQL.Data/tests/MySql.Data.Security.Tests.csproj @@ -3,8 +3,8 @@ Codestin Search App MySql.Data.Security.Tests Class Library - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. - 6.10.8 + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. + 6.10.9 Oracle Oracle MySql.Data.Security.Tests diff --git a/MySQL.Data/tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests.csproj index 1b5010d22..488de1fd9 100644 --- a/MySQL.Data/tests/MySql.Data.Tests.csproj +++ b/MySQL.Data/tests/MySql.Data.Tests.csproj @@ -3,8 +3,8 @@ Codestin Search App MySql.Data.Tests Class Library - Copyright © 2016, 2018, Oracle and/or its affiliates. All rights reserved. - 6.10.8 + Copyright © 2016, 2019, Oracle and/or its affiliates. All rights reserved. + 6.10.9 Oracle Oracle MySql.Data.Tests diff --git a/MySql.Web/src/MySql.Web.csproj b/MySql.Web/src/MySql.Web.csproj index 29310f082..d6cdf4dd6 100644 --- a/MySql.Web/src/MySql.Web.csproj +++ b/MySql.Web/src/MySql.Web.csproj @@ -2,9 +2,9 @@ MySql.Web - Copyright © 2016, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright © 2016, 2019 Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452 $(NoWarn);CS1591 diff --git a/MySql.Web/tests/MySql.Web.Tests.csproj b/MySql.Web/tests/MySql.Web.Tests.csproj index 989a84778..8c0461495 100644 --- a/MySql.Web/tests/MySql.Web.Tests.csproj +++ b/MySql.Web/tests/MySql.Web.Tests.csproj @@ -2,9 +2,9 @@ MySql.Web.Tests - Copyright © 2016, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright © 2016, 2019 Oracle and/or its affiliates. All rights reserved. en-US - 6.10.8 + 6.10.9 Oracle net452 MySql.Web.Tests diff --git a/README b/README index 8709df670..58b45e7cf 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ doubt, this particular copy of the software is released under the version 2 of the GNU General Public License. MySQL Connector/Net is brought to you by Oracle. -Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2004, 2019 Oracle and/or its affiliates. All rights reserved. License information can be found in the COPYING file. diff --git a/Release Notes.txt b/Release Notes.txt index a5827d9ca..dbc6305b1 100644 --- a/Release Notes.txt +++ b/Release Notes.txt @@ -4,12 +4,12 @@ Welcome to the release notes for Connector/Net 6.10 What's new in 6.10 -------------------- -Connector/Net has added the support for .NET Core 1.1 & 2.0, which enables +Connector/Net has added the support for .NET Core 1.1 & 2.x, which enables MySQL Connector/Net 6.10.x to be run in all the platforms supported for this framework (Windows, Linux and OSx). Compression support is also included in the new core driver version. -In this version users can start using Entity Framework Core 1.1 and/or 2.0 in -their .net core applications with a MySQL database. +In this version users can start using Entity Framework Core 1.1 and/or 2.x in +their .NET Core applications with a MySQL database.