设置mysql驱动源

Author: nnhy

XCode.MySql/XCode.MySql.csproj

@@ -36,11 +36,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\XCode\XCode.csproj" />
+    <PackageReference Include="MySql.Data" Version="9.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <!-- 按需求禁用 MySqlConnector：原先会导致同时下载并优先尝试使用 MySqlConnector 工厂
-    <PackageReference Include="MySqlConnector" Version="2.4.0" />
-    -->
+    <ProjectReference Include="..\XCode\XCode.csproj" />
   </ItemGroup>
 </Project>

XCode/DataAccessLayer/XDbConnectionStringBuilder.cs

@@ -1,72 +1,59 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife;
+namespace XCode.DataAccessLayer;
 
-namespace XCode.DataAccessLayer
+/// <summary>连接字符串构造器</summary>
+public class ConnectionStringBuilder(String connStr)
 {
-    /// <summary>连接字符串构造器</summary>
-    public class ConnectionStringBuilder /*: Dictionary<String, String>*/
+    #region 属性
+    private readonly IDictionary<String, String> _dic = connStr.SplitAsDictionary("=", ";", true);
+
+    /// <summary>获取 或 设置 设置项</summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public String this[String key] { get => _dic[key]; set => _dic[key] = value; }
+
+    /// <summary>连接字符串</summary>
+    public String ConnectionString => _dic.Join(";", kv => $"{kv.Key}={kv.Value}");
+    #endregion
+
+    #region 方法
+    /// <summary>获取连接字符串中的项</summary>
+    /// <param name="key"></param>
+    /// <param name="value">数值</param>
+    /// <returns></returns>
+    public Boolean TryGetValue(String key, out String value) => _dic.TryGetValue(key, out value);
+
+    /// <summary>获取并删除连接字符串中的项</summary>
+    /// <param name="key"></param>
+    /// <param name="value">数值</param>
+    /// <returns></returns>
+    public Boolean TryGetAndRemove(String key, out String value)
     {
-        #region 属性
-        private readonly IDictionary<String, String> _dic;
+        value = String.Empty;
 
-        /// <summary>获取 或 设置 设置项</summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public String this[String key] { get => _dic?[key]; set => _dic[key] = value; }
-        #endregion
+        if (_dic == null || !_dic.TryGetValue(key, out value)) return false;
 
-        #region 构造
-        /// <summary>实例化</summary>
-        public ConnectionStringBuilder(String connStr) => _dic = connStr.SplitAsDictionary("=", ";", true);
-        #endregion
+        _dic.Remove(key);
 
-        #region 连接字符串
-        /// <summary>连接字符串</summary>
-        public String ConnectionString => _dic?.Join(";", kv => $"{kv.Key}={kv.Value}");
-        #endregion
-
-        #region 方法
-        /// <summary>获取连接字符串中的项</summary>
-        /// <param name="key"></param>
-        /// <param name="value">数值</param>
-        /// <returns></returns>
-        public Boolean TryGetValue(String key, out String value) => _dic.TryGetValue(key, out value);
-
-        /// <summary>获取并删除连接字符串中的项</summary>
-        /// <param name="key"></param>
-        /// <param name="value">数值</param>
-        /// <returns></returns>
-        public Boolean TryGetAndRemove(String key, out String value)
-        {
-            value = null;
-
-            if (_dic == null || !_dic.TryGetValue(key, out value)) return false;
-
-            _dic.Remove(key);
-
-            return true;
-        }
-
-        /// <summary>尝试添加项，如果存在则失败</summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public Boolean TryAdd(String key,String value)
-        {
-            if (_dic.ContainsKey(key)) return false;
+        return true;
+    }
 
-            _dic[key] = value;
+    /// <summary>尝试添加项，如果存在则失败</summary>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public Boolean TryAdd(String key, String value)
+    {
+        if (_dic.ContainsKey(key)) return false;
 
-            return true;
-        }
-        #endregion
+        _dic[key] = value;
 
-        #region 辅助
-        /// <summary>已重载。</summary>
-        /// <returns></returns>
-        public override String ToString() => ConnectionString;
-        #endregion
+        return true;
     }
+    #endregion
+
+    #region 辅助
+    /// <summary>已重载。</summary>
+    /// <returns></returns>
+    public override String ToString() => ConnectionString;
+    #endregion
 }