Merge remote-tracking branch 'remotes/origin/7.0-dev' into 7.0-WL-10080

Author: Roberto Garcia

CHANGES

@@ -1,6 +1,6 @@
 7.0.7
-- MySqlX: Fixed configuration handling paths in Linux and MacOS.
-- MySqlX: Fixed Dispose error in Linux and MacOS.
+- MySqlX: Fixed configuration handling paths in Linux and MacOS (Oracle Bug #25423724).
+- MySqlX: Fixed Dispose error in Linux and MacOS (Oracle Bug #25423700).
 - MySqlX: Added support for IPv6.
 
 

Source/MySql.Data/ResourcesX.Designer.cs

@@ -39,7 +39,7 @@
     "nowarn": [ "CS1591" ]
   }, 
   "dependencies": {
-    "Google.Protobuf": "3.1.0",
+    "Google.Protobuf": "3.0.0",
     "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
   },
   "frameworks": {

Source/MySql.Data/project.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "xunit": "2.2.0-*",
-    "Google.Protobuf": "3.1.0",
+    "Google.Protobuf": "3.0.0",
     "MySql.Data": {
       "target": "project"
     }