Merge branch '6.9' of myrepo.no.oracle.com:connector-net into 6.9

Author: davaldezr

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, 2017 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 

Source/MySql.Data/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2017 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2018 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -38,6 +38,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.9.10")]
-[assembly: AssemblyInformationalVersion("6.9.10")]
+[assembly: AssemblyVersion("6.9.11")]
+[assembly: AssemblyInformationalVersion("6.9.11")]
 [assembly: NeutralResourcesLanguage("en-US")]

Tests/MySql.Data.Tests/MySql.Data.Tests.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\packages\XunitXml.TestLogger.2.0.0\build\net45\XunitXml.TestLogger.props" Condition="Exists('..\..\packages\XunitXml.TestLogger.2.0.0\build\net45\XunitXml.TestLogger.props')" />
  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
  <Choose>
  <When Condition="$(SolutionName) == 'MySQLClient-4.0'">
@@ -281,6 +282,7 @@
  <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
  </PropertyGroup>
  <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+ <Error Condition="!Exists('..\..\packages\XunitXml.TestLogger.2.0.0\build\net45\XunitXml.TestLogger.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\XunitXml.TestLogger.2.0.0\build\net45\XunitXml.TestLogger.props'))" />
  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.

Tests/MySql.Data.Tests/packages.config

@@ -2,4 +2,5 @@
 <packages>
  <package id="xunit" version="1.9.2" targetFramework="net46" />
  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
+ <package id="XunitXml.TestLogger" version="2.0.0" targetFramework="net45" />
 </packages>