Merge pull request #22 from Azure-Player/ver-5

Version 5.0.0

Release-Notes.md

@@ -1,3 +1,9 @@
+## [5.0.0] - 2024-09-04
+- Updated to use .NET Framework 4.8 (Windows 10/11)
+- Removed old connection method window
+- Replaced `System.Data.SqlClient` with `Microsoft.Data.SqlClient`
+- Added new authentication method: **Entra with MFA**
+
 ## [4.3.0] - 2020-08-06
 * Added space before OR/AND in a condition statement (#9)
 * Change: List of tables is sorted now (#2)

ScdMergeWizard/Components/MyRichTextBox.cs

@@ -31,7 +31,7 @@ public Color LineNumbersColor
 
 
         public delegate void RichTextBoxTextChangedHandler(object sender, EventArgs e);
-        public event RichTextBoxTextChangedHandler TextChanged;
+        public event RichTextBoxTextChangedHandler RichTextChanged;
 
 
         public MyRichTextBox()
@@ -45,9 +45,9 @@ public MyRichTextBox()
 
         void richTextBox1_TextChanged(object sender, EventArgs e)
         {
-            if (TextChanged != null)
+            if (RichTextChanged != null)
             {
-                TextChanged(sender, e);
+                RichTextChanged(sender, e);
             }
             //TextChanged2 += new RichTextBoxTextChangedHandler(MyRichTextBox_TextChanged2);
         }

ScdMergeWizard/Database/DbHelper.cs

@@ -87,42 +87,6 @@ public static MyDbColumn[] GetColumns(MyBaseDbConnection conn, string query)
             return columns.ToArray();
         }
 
-        public static string GetBuiltConnectionString(string inputConnectionString)
-        {
-            MSDASC.DataLinks oDL = null;
-            string res = string.Empty;
-
-            try
-            {
-                oDL = new MSDASC.DataLinksClass();
-                ADODB.Connection conn = new ADODB.ConnectionClass();
-
-                conn.ConnectionString = inputConnectionString;
-                object oConn = (object)conn;
-                if (oDL.PromptEdit(ref oConn))
-                    res = conn.ConnectionString;
-            }
-            catch
-            {
-                try
-                {
-                    ADODB._Connection oConn = (ADODB._Connection)oDL.PromptNew();
-                    if (oConn != null)
-                        res = oConn.ConnectionString.ToString();
-                }
-                catch (Exception ex)
-                {
-                    MyExceptionHandler.NewEx(ex);
-                }
-            }
-
-            return string.IsNullOrEmpty(res) ? null : res;
-        }
-
-        //public static MyBaseDbConnection CreateConnection(string connectionString)
-        //{
-        //    return new Database.MyAdoDbConnection(connectionString);
-        //}
         public static MyBaseDbConnection CreateConnection(string connectionString)
         {
             if (!connectionString.ToLower().StartsWith("provider="))

ScdMergeWizard/Database/MyAdoDbConnection.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Data;
 using System.Data.Common;
 using System.Configuration;