From 6c64b9ecc862acb0247180b2d64af241eff8c272 Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <ejlskov@hotmail.com>
Date: Tue, 17 Dec 2024 07:51:36 +0100
Subject: [PATCH 1/5] Support special casing with Fabric endpoints

---
 .../src/Microsoft/Data/Common/AdapterUtil.cs              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 3f23a186f8..df91d3841f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -750,16 +750,20 @@ internal static Version GetAssemblyVersion()
 
         private const string ONDEMAND_PREFIX = "-ondemand";
         private const string AZURE_SYNAPSE = "-ondemand.sql.azuresynapse.";
+        private const string FABRIC_DATAWAREHOUSE = ".datawarehouse.fabric.microsoft.com";
 
         internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
         {
-            return IsEndpoint(dataSource, ONDEMAND_PREFIX) || dataSource.Contains(AZURE_SYNAPSE);
+            return IsEndpoint(dataSource, ONDEMAND_PREFIX) 
+                || dataSource.Contains(AZURE_SYNAPSE)
+                || dataSource.Contains(FABRIC_DATAWAREHOUSE);
         }
 
         internal static readonly string[] s_azureSqlServerEndpoints = { StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint),
                                                                         StringsHelper.GetString(Strings.AZURESQL_GermanEndpoint),
                                                                         StringsHelper.GetString(Strings.AZURESQL_UsGovEndpoint),
-                                                                        StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint)};
+                                                                        StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint),
+                                                                        ".database.fabric.microsoft.com"};
 
         internal static bool IsAzureSqlServerEndpoint(string dataSource)
         {

From 4cd0183c5cc0f68629608e6642b18cfd99c43d4f Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <eej@delegate.dk>
Date: Fri, 7 Mar 2025 10:19:44 +0100
Subject: [PATCH 2/5] Ad more endpoints

Remove localization
---
 .../netfx/src/Microsoft.Data.SqlClient.csproj |   1 +
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  20 ++-
 .../src/Resources/Strings.Designer.cs         | 148 +++++++-----------
 .../src/Resources/Strings.cs.resx             |  20 +--
 .../src/Resources/Strings.de.resx             |  20 +--
 .../src/Resources/Strings.es.resx             |  18 +--
 .../src/Resources/Strings.fr.resx             |  18 +--
 .../src/Resources/Strings.it.resx             |  18 +--
 .../src/Resources/Strings.ja.resx             |  18 +--
 .../src/Resources/Strings.ko.resx             |  18 +--
 .../src/Resources/Strings.pl.resx             |  18 +--
 .../src/Resources/Strings.pt-BR.resx          |  18 +--
 .../src/Resources/Strings.resx                |  18 +--
 .../src/Resources/Strings.ru.resx             |  18 +--
 .../src/Resources/Strings.tr.resx             |  18 +--
 .../src/Resources/Strings.zh-Hans.resx        |  18 +--
 .../src/Resources/Strings.zh-Hant.resx        |  18 +--
 17 files changed, 113 insertions(+), 312 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index e1ddaa6926..08e251a0c5 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -856,6 +856,7 @@
     <Compile Include="$(CommonSourceRoot)System\IO\StreamExtensions.netfx.cs">
       <Link>System\IO\StreamExtensions.netfx.cs</Link>
     </Compile>
+    <Compile Include="..\..\src\Resources\Strings.Designer.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\Microsoft\Data\Common\NameValuePermission.cs" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index df91d3841f..d470185eb9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -750,19 +750,25 @@ internal static Version GetAssemblyVersion()
 
         private const string ONDEMAND_PREFIX = "-ondemand";
         private const string AZURE_SYNAPSE = "-ondemand.sql.azuresynapse.";
-        private const string FABRIC_DATAWAREHOUSE = ".datawarehouse.fabric.microsoft.com";
+        private const string FABRIC_DATAWAREHOUSE = "datawarehouse.fabric.microsoft.com";
+        private const string PBI_DATAWAREHOUSE = "datawarehouse.pbidedicated.microsoft.com";
+        private const string PBI_DATAWAREHOUSE2 = ".pbidedicated.microsoft.com";
+        private const string PBI_DATAWAREHOUSE3 = ".pbidedicated.windows.net";
 
         internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
         {
-            return IsEndpoint(dataSource, ONDEMAND_PREFIX) 
+            return IsEndpoint(dataSource, ONDEMAND_PREFIX)
                 || dataSource.Contains(AZURE_SYNAPSE)
-                || dataSource.Contains(FABRIC_DATAWAREHOUSE);
+                || dataSource.Contains(FABRIC_DATAWAREHOUSE)
+                || dataSource.Contains(PBI_DATAWAREHOUSE)
+                || dataSource.Contains(PBI_DATAWAREHOUSE2)
+                || dataSource.Contains(PBI_DATAWAREHOUSE3);
         }
 
-        internal static readonly string[] s_azureSqlServerEndpoints = { StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint),
-                                                                        StringsHelper.GetString(Strings.AZURESQL_GermanEndpoint),
-                                                                        StringsHelper.GetString(Strings.AZURESQL_UsGovEndpoint),
-                                                                        StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint),
+        internal static readonly string[] s_azureSqlServerEndpoints = { ".database.windows.net",
+                                                                        ".database.cloudapi.de",
+                                                                        ".database.usgovcloudapi.net",
+                                                                        ".database.chinacloudapi.cn",
                                                                         ".database.fabric.microsoft.com"};
 
         internal static bool IsAzureSqlServerEndpoint(string dataSource)
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 21303d710b..0b2964474b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -39,7 +39,7 @@ internal Strings() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", typeof(Strings).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Resources.Strings", typeof(Strings).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -240,15 +240,6 @@ internal static string ADP_ComputerNameEx {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Update requires a connection..
-        /// </summary>
-        internal static string ADP_ConnecitonRequired_UpdateRows {
-            get {
-                return ResourceManager.GetString("ADP_ConnecitonRequired_UpdateRows", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The connection was not closed. {0}.
         /// </summary>
@@ -348,6 +339,15 @@ internal static string ADP_ConnectionRequired_Update {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Update requires a connection..
+        /// </summary>
+        internal static string ADP_ConnectionRequired_UpdateRows {
+            get {
+                return ResourceManager.GetString("ADP_ConnectionRequired_UpdateRows", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The connection&apos;s current state: {0}..
         /// </summary>
@@ -1923,42 +1923,6 @@ internal static string AttestationTokenSignatureValidationFailed {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to .database.chinacloudapi.cn.
-        /// </summary>
-        internal static string AZURESQL_ChinaEndpoint {
-            get {
-                return ResourceManager.GetString("AZURESQL_ChinaEndpoint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .database.windows.net.
-        /// </summary>
-        internal static string AZURESQL_GenericEndpoint {
-            get {
-                return ResourceManager.GetString("AZURESQL_GenericEndpoint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .database.cloudapi.de.
-        /// </summary>
-        internal static string AZURESQL_GermanEndpoint {
-            get {
-                return ResourceManager.GetString("AZURESQL_GermanEndpoint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .database.usgovcloudapi.net.
-        /// </summary>
-        internal static string AZURESQL_UsGovEndpoint {
-            get {
-                return ResourceManager.GetString("AZURESQL_UsGovEndpoint", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to There is more than one table with the same name &apos;{0}&apos; (even if namespace is different)..
         /// </summary>
@@ -2313,9 +2277,9 @@ internal static string DataCategory_Behavior {
         /// <summary>
         ///   Looks up a localized string similar to Connection Resiliency.
         /// </summary>
-        internal static string DataCategory_ConnectionResilency {
+        internal static string DataCategory_ConnectionResiliency {
             get {
-                return ResourceManager.GetString("DataCategory_ConnectionResilency", resourceCulture);
+                return ResourceManager.GetString("DataCategory_ConnectionResiliency", resourceCulture);
             }
         }
         
@@ -2826,9 +2790,9 @@ internal static string DataColumn_NullValues {
         /// <summary>
         ///   Looks up a localized string similar to Ordinal &apos;{0}&apos; exceeds the maximum number..
         /// </summary>
-        internal static string DataColumn_OrdinalExceedMaximun {
+        internal static string DataColumn_OrdinalExceedMaximum {
             get {
-                return ResourceManager.GetString("DataColumn_OrdinalExceedMaximun", resourceCulture);
+                return ResourceManager.GetString("DataColumn_OrdinalExceedMaximum", resourceCulture);
             }
         }
         
@@ -3699,9 +3663,9 @@ internal static string DataMerge_PrimaryKeyMismatch {
         /// <summary>
         ///   Looks up a localized string similar to Relation {0} cannot be merged, because keys have mismatch columns..
         /// </summary>
-        internal static string DataMerge_ReltionKeyColumnsMismatch {
+        internal static string DataMerge_RelationKeyColumnsMismatch {
             get {
-                return ResourceManager.GetString("DataMerge_ReltionKeyColumnsMismatch", resourceCulture);
+                return ResourceManager.GetString("DataMerge_RelationKeyColumnsMismatch", resourceCulture);
             }
         }
         
@@ -6372,18 +6336,18 @@ internal static string Expr_ComputeNotAggregate {
         /// <summary>
         ///   Looks up a localized string similar to Cannot convert from {0} to {1}..
         /// </summary>
-        internal static string Expr_DatatypeConvertion {
+        internal static string Expr_DatatypeConversion {
             get {
-                return ResourceManager.GetString("Expr_DatatypeConvertion", resourceCulture);
+                return ResourceManager.GetString("Expr_DatatypeConversion", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Cannot convert value &apos;{0}&apos; to Type: {1}..
         /// </summary>
-        internal static string Expr_DatavalueConvertion {
+        internal static string Expr_DatavalueConversion {
             get {
-                return ResourceManager.GetString("Expr_DatavalueConvertion", resourceCulture);
+                return ResourceManager.GetString("Expr_DatavalueConversion", resourceCulture);
             }
         }
         
@@ -6426,9 +6390,9 @@ internal static string Expr_ExpressionUnbound {
         /// <summary>
         ///   Looks up a localized string similar to Filter expression &apos;{0}&apos; does not evaluate to a Boolean term..
         /// </summary>
-        internal static string Expr_FilterConvertion {
+        internal static string Expr_FilterConversion {
             get {
-                return ResourceManager.GetString("Expr_FilterConvertion", resourceCulture);
+                return ResourceManager.GetString("Expr_FilterConversion", resourceCulture);
             }
         }
         
@@ -7200,9 +7164,9 @@ internal static string MissingClaimInAttestationToken {
         /// <summary>
         ///   Looks up a localized string similar to Simple type &apos;{0}&apos; has already be declared with different &apos;{1}&apos;..
         /// </summary>
-        internal static string NamedSimpleType_InvalidDuplicateNamedSimpleTypeDelaration {
+        internal static string NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration {
             get {
-                return ResourceManager.GetString("NamedSimpleType_InvalidDuplicateNamedSimpleTypeDelaration", resourceCulture);
+                return ResourceManager.GetString("NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration", resourceCulture);
             }
         }
         
@@ -9057,9 +9021,9 @@ internal static string Snix_PreLogin {
         /// <summary>
         ///   Looks up a localized string similar to The client was unable to establish a connection because of an error during connection initialization process before login. Possible causes include the following:  the client tried to connect to an unsupported version of SQL Server; the server was too busy to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server..
         /// </summary>
-        internal static string Snix_PreLoginBeforeSuccessfullWrite {
+        internal static string Snix_PreLoginBeforeSuccessfulWrite {
             get {
-                return ResourceManager.GetString("Snix_PreLoginBeforeSuccessfullWrite", resourceCulture);
+                return ResourceManager.GetString("Snix_PreLoginBeforeSuccessfulWrite", resourceCulture);
             }
         }
         
@@ -9503,18 +9467,16 @@ internal static string SQL_ContextConnectionIsInUse {
                 return ResourceManager.GetString("SQL_ContextConnectionIsInUse", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to Connecting to the context connection using Microsoft.Data.SqlClient is not supported..
         /// </summary>
-        internal static string SQL_ContextConnectionIsUnsupported
-        {
-            get
-            {
+        internal static string SQL_ContextConnectionIsUnsupported {
+            get {
                 return ResourceManager.GetString("SQL_ContextConnectionIsUnsupported", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to The requested operation requires a SqlClr context, which is only available when running in the Sql Server process..
         /// </summary>
@@ -9902,6 +9864,15 @@ internal static string SQL_InvalidUdt3PartNameFormat {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid attempt to get JsonDocument on column &apos;{0}&apos;. JsonDocument is only supported for columns of type json..
+        /// </summary>
+        internal static string SQL_JsonDocumentNotSupportedOnColumnType {
+            get {
+                return ResourceManager.GetString("SQL_JsonDocumentNotSupportedOnColumnType", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cannot authenticate using Kerberos. Ensure Kerberos has been initialized on the client with &apos;kinit&apos; and a Service Principal Name has been registered for the SQL Server to allow Kerberos authentication..
         /// </summary>
@@ -10513,16 +10484,7 @@ internal static string SQL_StreamNotSupportOnColumnType {
                 return ResourceManager.GetString("SQL_StreamNotSupportOnColumnType", resourceCulture);
             }
         }
-
-        /// <summary>
-        ///    Looks up a localized string similar to Invalid attempt to get JsonDocument on column &apos;{0}&apos;. JsonDocument is only supported for columns of type json.
-        /// </summary>
-        internal static string SQL_JsonDocumentNotSupportedOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_JsonDocumentNotSupportedOnColumnType", resourceCulture);
-            }
-        }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to The Stream does not support reading..
         /// </summary>
@@ -11129,9 +11091,9 @@ internal static string SQLCR_NoCRAckAtReconnection {
         /// <summary>
         ///   Looks up a localized string similar to The server did not preserve the exact client TDS version requested during a recovery attempt, connection recovery is not possible..
         /// </summary>
-        internal static string SQLCR_TDSVestionNotPreserved {
+        internal static string SQLCR_TDSVersionNotPreserved {
             get {
-                return ResourceManager.GetString("SQLCR_TDSVestionNotPreserved", resourceCulture);
+                return ResourceManager.GetString("SQLCR_TDSVersionNotPreserved", resourceCulture);
             }
         }
         
@@ -12000,7 +11962,7 @@ internal static string SQLROR_InvalidRoutingInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Two or more redirections have occurred. Only one redirection per login is allowed..
+        ///   Looks up a localized string similar to Too many redirections have occurred. Only {0} redirections per login is allowed..
         /// </summary>
         internal static string SQLROR_RecursiveRoutingNotSupported {
             get {
@@ -12173,9 +12135,9 @@ internal static string SqlUdtReason_MultivaluedAssemblyId {
         /// <summary>
         ///   Looks up a localized string similar to The type of field &apos;{0}&apos; is marked as explicit layout which is not allowed in Native format.
         /// </summary>
-        internal static string SqlUdtReason_NativeFormatExplictLayoutNotAllowed {
+        internal static string SqlUdtReason_NativeFormatExplicitLayoutNotAllowed {
             get {
-                return ResourceManager.GetString("SqlUdtReason_NativeFormatExplictLayoutNotAllowed", resourceCulture);
+                return ResourceManager.GetString("SqlUdtReason_NativeFormatExplicitLayoutNotAllowed", resourceCulture);
             }
         }
         
@@ -12308,27 +12270,27 @@ internal static string SSPIInvalidHandleType {
         /// <summary>
         ///   Looks up a localized string similar to Cannot get value because it is DBNull..
         /// </summary>
-        internal static string StrongTyping_CananotAccessDBNull {
+        internal static string StrongTyping_CannotAccessDBNull {
             get {
-                return ResourceManager.GetString("StrongTyping_CananotAccessDBNull", resourceCulture);
+                return ResourceManager.GetString("StrongTyping_CannotAccessDBNull", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove relation since it is built in to this dataSet..
+        ///   Looks up a localized string similar to Cannot remove column since it is built in to this dataSet..
         /// </summary>
-        internal static string StrongTyping_CananotRemoveRelation {
+        internal static string StrongTyping_CannotRemoveColumn {
             get {
-                return ResourceManager.GetString("StrongTyping_CananotRemoveRelation", resourceCulture);
+                return ResourceManager.GetString("StrongTyping_CannotRemoveColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove column since it is built in to this dataSet..
+        ///   Looks up a localized string similar to Cannot remove relation since it is built in to this dataSet..
         /// </summary>
-        internal static string StrongTyping_CannotRemoveColumn {
+        internal static string StrongTyping_CannotRemoveRelation {
             get {
-                return ResourceManager.GetString("StrongTyping_CannotRemoveColumn", resourceCulture);
+                return ResourceManager.GetString("StrongTyping_CannotRemoveRelation", resourceCulture);
             }
         }
         
@@ -13937,9 +13899,9 @@ internal static string Xml_SimpleTypeNotSupported {
         /// <summary>
         ///   Looks up a localized string similar to Cannot determine the DataSet Element. IsDataSet attribute exist more than once..
         /// </summary>
-        internal static string Xml_TooManyIsDataSetAtributeInSchema {
+        internal static string Xml_TooManyIsDataSetAttributeInSchema {
             get {
-                return ResourceManager.GetString("Xml_TooManyIsDataSetAtributeInSchema", resourceCulture);
+                return ResourceManager.GetString("Xml_TooManyIsDataSetAttributeInSchema", resourceCulture);
             }
         }
         
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index dab58a9365..3227276c47 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Neshodné typy SourceColumn {0} z(e) {1} a DataColumn {2} z(e) {3} nelze převést.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>V objektu DataTable {1} pro vlastnost SourceColumn {2} chybí objekt DataColumn {0}.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Definuje chování v období blokování pro fond připojení.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Definuje, zda je povolené ukládání metadat dotazu do mezipaměti.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Byla překročena maximální velikost vyrovnávací paměti: {0}</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
+  </data>
+</root>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 0425bb294c..72acfe8e47 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Nicht konvertierbarer Typenkonflikt zwischen SourceColumn '{0}' von {1} und DataColumn '{2}' von {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>DataColumn '{0}' in der DataTable '{1}' für SourceColumn '{2}' ist nicht vorhanden.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Definiert das Verhalten im Blockierungszeitraum für einen Verbindungspool.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Definiert, ob das Zwischenspeichern von Abfragemetadaten aktiviert ist.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Maximale Puffergröße überschritten: {0}</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
+  </data>
+</root>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 7f89500911..0dbea94135 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Falta de coincidencia entre los tipos que no se pueden convertir SourceColumn '{0}' de {1} y DataColumn '{2}' de {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>Falta DataColumn '{0}' en DataTable '{1}' para SourceColumn '{2}'.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Define el comportamiento del período de bloqueo para un grupo de conexiones.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Define si está habilitado el almacenamiento en caché de los metadatos de consulta.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Se ha superado el tamaño máximo del búfer: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index c95a42c730..0ceeff2997 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Incompatibilité de type ne pouvant pas être converti entre SourceColumn '{0}' de {1} et DataColumn '{2}' de {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>DataColumn '{0}' manquant dans DataTable '{1}' pour SourceColumn '{2}'.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Définit le comportement de la période de blocage pour un pool de connexions.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Définit si la mise en cache des métadonnées de requête est activée.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Taille maximale de la mémoire tampon dépassée : {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 5ddc1291a8..27f7ccc617 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Impossibile eseguire la conversione. Il tipo della proprietà SourceColumn "{0}" di {1} non corrisponde a quello della proprietà DataColumn "{2}" di {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>DataColumn '{0}' mancante nella DataTable '{1}' per la SourceColumn '{2}'.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Consente di definire il comportamento del periodo di blocco per un pool di connessioni.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Consente di definire se la memorizzazione nella cache dei metadati della query è abilitata.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Superata la dimensione massima del buffer: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index 9840274792..da1656a564 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>SourceColumn '{1}' の '{0}' と {3} の DataColumn '{2}' の間に変換不可能な型の不一致があります。</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>SourceColumn '{2}' の DataTable '{1}' に DataColumn '{0}' が見つかりません。</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>接続プールのためのブロック期間ビヘイビアーを定義します。</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>クエリ メタデータ キャッシュが有効であるかどうかを定義します。</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>バッファーの最大サイズを超えました: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index f54f0b071a..7ba68c63bb 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>{1}의 SourceColumn '{0}'과(와) {3}의 DataColumn '{2}'의 유형이 일치하지 않습니다.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>SourceColumn '{2}'에 DataColumn '{0}'이(가) 없습니다.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>SourceColumn '{2}'의 DataTable '{1}'에 DataColumn '{0}'이(가) 없습니다.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>연결 풀에 대한 차단 기간 동작을 정의합니다.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>쿼리 메타데이터 캐싱을 사용하는지를 정의합니다.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>버퍼 최대 크기 초과: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>SourceColumn '{2}'에 DataColumn '{0}'이(가) 없습니다.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index dcc5e877ca..eca9a12445 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Niezgodność typów niemożliwych do konwersji między elementem SourceColumn {0} z {1} a elementem DataColumn {2} z {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Brak elementu DataColumn {0} dla elementu SourceColumn {2}.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>Brak elementu DataColumn {0} w elemencie DataTable {1} dla elementu SourceColumn {2}.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Definiuje zachowanie okresu blokowania dla puli połączeń.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Określa, czy jest włączone buforowanie metadanych zapytań.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Przekroczono maksymalny rozmiar buforu: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>Brak elementu DataColumn {0} dla elementu SourceColumn {2}.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 1240bdc2b8..c905755c9c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Tipos não conversíveis incompatíveis entre SourceColumn '{0}' de {1} e DataColumn '{2}' de {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' de SourceColumn '{2}' inexistente.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>DataColumn '{0}' em DataTable '{1}' de SourceColumn '{2}' inexistente.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Define o comportamento de período de bloqueio para um pool de conexões.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Define se o cache de metadados de consulta está habilitado.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Tamanho máximo do buffer excedido: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>DataColumn '{0}' de SourceColumn '{2}' inexistente.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index 4da621f979..6220147015 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Inconvertible type mismatch between SourceColumn '{0}' of {1} and the DataColumn '{2}' of {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Missing the DataColumn '{0}' for the SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>Missing the DataColumn '{0}' in the DataTable '{1}' for the SourceColumn '{2}'.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Defines the blocking period behavior for a connection pool.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Defines whether query metadata caching is enabled.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Buffer maximum size exceeded: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>Missing the DataColumn '{0}' for the SourceColumn '{2}'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 92d4fad694..b4d9b09370 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>Не поддающееся преобразованию несоответствие типов между SourceColumn "{0}" из {1} и DataColumn "{2}" из {3}.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Отсутствует DataColumn "{0}" для данного SourceColumn "{2}".</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>В DataTable "{1}" отсутствует DataColumn "{0}" для данного SourceColumn "{2}".</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Задает поведение периода блокировки для пула подключений.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Определяет, включено ли кэширование метаданных запросов.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Превышен максимальный размер буфера: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>Отсутствует DataColumn "{0}" для данного SourceColumn "{2}".</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index 07d172298f..d4789372b9 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>'{1}' / {0} öğesine ait SourceColumn ile '{3}' / {2} öğesine ait DataColumn arasında dönüştürülemez tür uyuşmazlığı.</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>SourceColumn '{2}' için DataColumn '{0}' eksik.</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>SourceColumn '{2}' için DataTable '{1}' içinde DataColumn '{0}' eksik.</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>Bir bağlantı havuzundaki bağlantılar için engelleme dönemi davranışını tanımlar.</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>Sorgu meta verilerini önbelleğe almanın etkin olup olmadığını tanımlar.</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Arabellek boyut üst sınırı aşıldı: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>SourceColumn '{2}' için DataColumn '{0}' eksik.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 82aa2d0e70..168b1bc1a1 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>{1} 的 SourceColumn“{0}”和 {3} 的 DataColumn“{2}”之间无法转换的类型不匹配。</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>缺少 SourceColumn“{2}”的 DataColumn“{0}”。</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>DataTable“{1}”中缺少 SourceColumn“{2}”的 DataColumn“{0}”。</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>定义针对连接池的暂停时段行为。</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>定义是否启用查询元数据缓存。</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>超出缓冲区最大大小： {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>缺少 SourceColumn“{2}”的 DataColumn“{0}”。</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 7364df016e..1195bc8c6e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -1845,9 +1845,6 @@
   <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
     <value>{1} 的 SourceColumn '{0}' 與 {3} 的 DataColumn '{2}' 之間發生不可轉換類型不符的問題。</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>遺漏 SourceColumn '{2}' 的 DataColumn '{0}'。</value>
-  </data>
   <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
     <value>在 DataTable '{1}' 中遺漏 SourceColumn '{2}' 的 DataColumn '{0}'。</value>
   </data>
@@ -4446,18 +4443,6 @@
   <data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
     <value>為連接集區定義封鎖期間行為。</value>
   </data>
-  <data name="AZURESQL_GenericEndpoint" xml:space="preserve">
-    <value>.database.windows.net</value>
-  </data>
-  <data name="AZURESQL_GermanEndpoint" xml:space="preserve">
-    <value>.database.cloudapi.de</value>
-  </data>
-  <data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
-    <value>.database.usgovcloudapi.net</value>
-  </data>
-  <data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
-    <value>.database.chinacloudapi.cn</value>
-  </data>
   <data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
     <value>定義是否啟用查詢中繼資料快取。</value>
   </data>
@@ -4752,4 +4737,7 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>已超過緩衝區大小上限: {0}</value>
   </data>
+  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
+    <value>遺漏 SourceColumn '{2}' 的 DataColumn '{0}'。</value>
+  </data>
 </root>
\ No newline at end of file

From 8a8eb3464fd239ee826377e928131dbe2a67c90e Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <eej@delegate.dk>
Date: Thu, 20 Mar 2025 08:02:56 +0100
Subject: [PATCH 3/5] Address PR feddback

---
 .../Microsoft.Data.SqlClient/SqlConnection.xml    |  1 +
 .../SqlConnectionStringBuilder.xml                |  1 +
 .../netfx/src/Microsoft.Data.SqlClient.csproj     |  1 -
 .../src/Microsoft/Data/Common/AdapterUtil.cs      | 15 ++++++++++-----
 .../tests/FunctionalTests/SqlConnectionTest.cs    | 15 ++++++++++++---
 .../SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs |  1 +
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index 9d77cb26d3..1c279f7a17 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -1872,6 +1872,7 @@
                         <item>.database.usgovcloudapi.net</item>
                         <item>.database.cloudapi.de</item>
                         <item>.database.windows.net</item>
+                        <item>.database.fabric.microsoft.com</item>
                       </list>
                     </item>
                     <item><c>Authentication</c> is one of the 'Active Directory' authentication types.</item>
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
index 89db9e0d12..ede06e0540 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -1638,6 +1638,7 @@
               <item>.database.usgovcloudapi.net</item>
               <item>.database.cloudapi.de</item>
               <item>.database.windows.net</item>
+              <item>.database.fabric.microsoft.com</item>
             </list>
           </item>
           <item>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 08e251a0c5..e1ddaa6926 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -856,7 +856,6 @@
     <Compile Include="$(CommonSourceRoot)System\IO\StreamExtensions.netfx.cs">
       <Link>System\IO\StreamExtensions.netfx.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\Resources\Strings.Designer.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\Microsoft\Data\Common\NameValuePermission.cs" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index d470185eb9..da8b65f837 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -754,6 +754,11 @@ internal static Version GetAssemblyVersion()
         private const string PBI_DATAWAREHOUSE = "datawarehouse.pbidedicated.microsoft.com";
         private const string PBI_DATAWAREHOUSE2 = ".pbidedicated.microsoft.com";
         private const string PBI_DATAWAREHOUSE3 = ".pbidedicated.windows.net";
+        private const string AZURE_SQL = ".database.windows.net";
+        private const string AZURE_SQL_GERMANY = ".database.cloudapi.de";
+        private const string AZURE_SQL_USGOV = ".database.usgovcloudapi.net";
+        private const string AZURE_SQL_CHINA = ".database.chinacloudapi.cn";
+        private const string AZURE_SQL_FABRIC = ".database.fabric.microsoft.com";
 
         internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
         {
@@ -765,11 +770,11 @@ internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
                 || dataSource.Contains(PBI_DATAWAREHOUSE3);
         }
 
-        internal static readonly string[] s_azureSqlServerEndpoints = { ".database.windows.net",
-                                                                        ".database.cloudapi.de",
-                                                                        ".database.usgovcloudapi.net",
-                                                                        ".database.chinacloudapi.cn",
-                                                                        ".database.fabric.microsoft.com"};
+        internal static readonly string[] s_azureSqlServerEndpoints = { AZURE_SQL,
+                                                                        AZURE_SQL_GERMANY,
+                                                                        AZURE_SQL_USGOV,
+                                                                        AZURE_SQL_CHINA,
+                                                                        AZURE_SQL_FABRIC };
 
         internal static bool IsAzureSqlServerEndpoint(string dataSource)
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
index 54b04234d6..75fb85b384 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
@@ -1082,10 +1082,15 @@ public void ConnectionRetryForNonAzureEndpoints()
             Assert.Equal(1, (int)field.GetValue(cn));
         }
 
-        [Fact]
-        public void ConnectionRetryForAzureDbEndpoints()
+        [Theory]
+        [InlineData("myserver.database.windows.net")]
+        [InlineData("myserver.database.cloudapi.de")]
+        [InlineData("myserver.database.usgovcloudapi.net")]
+        [InlineData("myserver.database.chinacloudapi.cn")]
+        [InlineData("myserver.database.fabric.microsoft.com")]
+        public void ConnectionRetryForAzureDbEndpoints(string serverName)
         {
-            SqlConnection cn = new SqlConnection("Data Source = someserver.database.windows.net");
+            SqlConnection cn = new SqlConnection($"Data Source = {serverName}");
             FieldInfo field = typeof(SqlConnection).GetField("_connectRetryCount", BindingFlags.Instance | BindingFlags.NonPublic);
             Assert.NotNull(field.GetValue(cn));
             Assert.Equal(2, (int)field.GetValue(cn));
@@ -1094,6 +1099,10 @@ public void ConnectionRetryForAzureDbEndpoints()
         [Theory]
         [InlineData("myserver-ondemand.sql.azuresynapse.net")]
         [InlineData("someserver-ondemand.database.windows.net")]
+        [InlineData("datawarehouse.fabric.microsoft.com")]
+        [InlineData("datawarehouse.pbidedicated.microsoft.com")]
+        [InlineData("someserver.pbidedicated.microsoft.com")]
+        [InlineData("someserver.pbidedicated.windows.net")]
         public void ConnectionRetryForAzureOnDemandEndpoints(string serverName)
         {
             SqlConnection cn = new SqlConnection($"Data Source = {serverName}");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
index 7124d33766..5559dbff8e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
@@ -13,6 +13,7 @@ public class PoolBlockPeriodTest
         private const string AzureChinaEnpointSample = "nonexistent.database.chinacloudapi.cn";
         private const string AzureUSGovernmentEndpointSample = "nonexistent.database.usgovcloudapi.net";
         private const string AzureGermanEndpointSample = "nonexistent.database.cloudapi.de";
+        private const string AzureFabricEndpointSample = "nonexistent.database.fabric.microsoft.com";
         private const string AzureEndpointMixedCaseSample = "nonexistent.database.WINDOWS.net";
         private const string NonExistentServer = "nonexistentserver";
         private const string PolicyKeyword = "PoolBlockingPeriod";

From a343d196e4813a94c85f157f15f0384a978dc83e Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <eej@delegate.dk>
Date: Thu, 20 Mar 2025 08:37:13 +0100
Subject: [PATCH 4/5] fix res

---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 0b2964474b..476f6eff24 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -39,7 +39,7 @@ internal Strings() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Resources.Strings", typeof(Strings).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Data.SqlClient.Resources.Strings", typeof(Strings).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

From 84c35883af4c8379408fc185dd5e5047000436e4 Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <eej@delegate.dk>
Date: Fri, 21 Mar 2025 09:52:25 +0100
Subject: [PATCH 5/5] revert Strings.Designer.cs changes

---
 .../src/Resources/Strings.Designer.cs         | 111 +++++++++---------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 476f6eff24..a143ee9479 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -240,6 +240,15 @@ internal static string ADP_ComputerNameEx {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Update requires a connection..
+        /// </summary>
+        internal static string ADP_ConnecitonRequired_UpdateRows {
+            get {
+                return ResourceManager.GetString("ADP_ConnecitonRequired_UpdateRows", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The connection was not closed. {0}.
         /// </summary>
@@ -339,15 +348,6 @@ internal static string ADP_ConnectionRequired_Update {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Update requires a connection..
-        /// </summary>
-        internal static string ADP_ConnectionRequired_UpdateRows {
-            get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_UpdateRows", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The connection&apos;s current state: {0}..
         /// </summary>
@@ -2277,9 +2277,9 @@ internal static string DataCategory_Behavior {
         /// <summary>
         ///   Looks up a localized string similar to Connection Resiliency.
         /// </summary>
-        internal static string DataCategory_ConnectionResiliency {
+        internal static string DataCategory_ConnectionResilency {
             get {
-                return ResourceManager.GetString("DataCategory_ConnectionResiliency", resourceCulture);
+                return ResourceManager.GetString("DataCategory_ConnectionResilency", resourceCulture);
             }
         }
         
@@ -2790,9 +2790,9 @@ internal static string DataColumn_NullValues {
         /// <summary>
         ///   Looks up a localized string similar to Ordinal &apos;{0}&apos; exceeds the maximum number..
         /// </summary>
-        internal static string DataColumn_OrdinalExceedMaximum {
+        internal static string DataColumn_OrdinalExceedMaximun {
             get {
-                return ResourceManager.GetString("DataColumn_OrdinalExceedMaximum", resourceCulture);
+                return ResourceManager.GetString("DataColumn_OrdinalExceedMaximun", resourceCulture);
             }
         }
         
@@ -3663,9 +3663,9 @@ internal static string DataMerge_PrimaryKeyMismatch {
         /// <summary>
         ///   Looks up a localized string similar to Relation {0} cannot be merged, because keys have mismatch columns..
         /// </summary>
-        internal static string DataMerge_RelationKeyColumnsMismatch {
+        internal static string DataMerge_ReltionKeyColumnsMismatch {
             get {
-                return ResourceManager.GetString("DataMerge_RelationKeyColumnsMismatch", resourceCulture);
+                return ResourceManager.GetString("DataMerge_ReltionKeyColumnsMismatch", resourceCulture);
             }
         }
         
@@ -6336,18 +6336,18 @@ internal static string Expr_ComputeNotAggregate {
         /// <summary>
         ///   Looks up a localized string similar to Cannot convert from {0} to {1}..
         /// </summary>
-        internal static string Expr_DatatypeConversion {
+        internal static string Expr_DatatypeConvertion {
             get {
-                return ResourceManager.GetString("Expr_DatatypeConversion", resourceCulture);
+                return ResourceManager.GetString("Expr_DatatypeConvertion", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Cannot convert value &apos;{0}&apos; to Type: {1}..
         /// </summary>
-        internal static string Expr_DatavalueConversion {
+        internal static string Expr_DatavalueConvertion {
             get {
-                return ResourceManager.GetString("Expr_DatavalueConversion", resourceCulture);
+                return ResourceManager.GetString("Expr_DatavalueConvertion", resourceCulture);
             }
         }
         
@@ -6390,9 +6390,9 @@ internal static string Expr_ExpressionUnbound {
         /// <summary>
         ///   Looks up a localized string similar to Filter expression &apos;{0}&apos; does not evaluate to a Boolean term..
         /// </summary>
-        internal static string Expr_FilterConversion {
+        internal static string Expr_FilterConvertion {
             get {
-                return ResourceManager.GetString("Expr_FilterConversion", resourceCulture);
+                return ResourceManager.GetString("Expr_FilterConvertion", resourceCulture);
             }
         }
         
@@ -7164,9 +7164,9 @@ internal static string MissingClaimInAttestationToken {
         /// <summary>
         ///   Looks up a localized string similar to Simple type &apos;{0}&apos; has already be declared with different &apos;{1}&apos;..
         /// </summary>
-        internal static string NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration {
+        internal static string NamedSimpleType_InvalidDuplicateNamedSimpleTypeDelaration {
             get {
-                return ResourceManager.GetString("NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration", resourceCulture);
+                return ResourceManager.GetString("NamedSimpleType_InvalidDuplicateNamedSimpleTypeDelaration", resourceCulture);
             }
         }
         
@@ -9021,9 +9021,9 @@ internal static string Snix_PreLogin {
         /// <summary>
         ///   Looks up a localized string similar to The client was unable to establish a connection because of an error during connection initialization process before login. Possible causes include the following:  the client tried to connect to an unsupported version of SQL Server; the server was too busy to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server..
         /// </summary>
-        internal static string Snix_PreLoginBeforeSuccessfulWrite {
+        internal static string Snix_PreLoginBeforeSuccessfullWrite {
             get {
-                return ResourceManager.GetString("Snix_PreLoginBeforeSuccessfulWrite", resourceCulture);
+                return ResourceManager.GetString("Snix_PreLoginBeforeSuccessfullWrite", resourceCulture);
             }
         }
         
@@ -9467,16 +9467,18 @@ internal static string SQL_ContextConnectionIsInUse {
                 return ResourceManager.GetString("SQL_ContextConnectionIsInUse", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to Connecting to the context connection using Microsoft.Data.SqlClient is not supported..
         /// </summary>
-        internal static string SQL_ContextConnectionIsUnsupported {
-            get {
+        internal static string SQL_ContextConnectionIsUnsupported
+        {
+            get
+            {
                 return ResourceManager.GetString("SQL_ContextConnectionIsUnsupported", resourceCulture);
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized string similar to The requested operation requires a SqlClr context, which is only available when running in the Sql Server process..
         /// </summary>
@@ -9864,15 +9866,6 @@ internal static string SQL_InvalidUdt3PartNameFormat {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to get JsonDocument on column &apos;{0}&apos;. JsonDocument is only supported for columns of type json..
-        /// </summary>
-        internal static string SQL_JsonDocumentNotSupportedOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_JsonDocumentNotSupportedOnColumnType", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Cannot authenticate using Kerberos. Ensure Kerberos has been initialized on the client with &apos;kinit&apos; and a Service Principal Name has been registered for the SQL Server to allow Kerberos authentication..
         /// </summary>
@@ -10484,7 +10477,16 @@ internal static string SQL_StreamNotSupportOnColumnType {
                 return ResourceManager.GetString("SQL_StreamNotSupportOnColumnType", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///    Looks up a localized string similar to Invalid attempt to get JsonDocument on column &apos;{0}&apos;. JsonDocument is only supported for columns of type json.
+        /// </summary>
+        internal static string SQL_JsonDocumentNotSupportedOnColumnType {
+            get {
+                return ResourceManager.GetString("SQL_JsonDocumentNotSupportedOnColumnType", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to The Stream does not support reading..
         /// </summary>
@@ -11091,9 +11093,9 @@ internal static string SQLCR_NoCRAckAtReconnection {
         /// <summary>
         ///   Looks up a localized string similar to The server did not preserve the exact client TDS version requested during a recovery attempt, connection recovery is not possible..
         /// </summary>
-        internal static string SQLCR_TDSVersionNotPreserved {
+        internal static string SQLCR_TDSVestionNotPreserved {
             get {
-                return ResourceManager.GetString("SQLCR_TDSVersionNotPreserved", resourceCulture);
+                return ResourceManager.GetString("SQLCR_TDSVestionNotPreserved", resourceCulture);
             }
         }
         
@@ -11962,7 +11964,7 @@ internal static string SQLROR_InvalidRoutingInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Too many redirections have occurred. Only {0} redirections per login is allowed..
+        ///   Looks up a localized string similar to Two or more redirections have occurred. Only one redirection per login is allowed..
         /// </summary>
         internal static string SQLROR_RecursiveRoutingNotSupported {
             get {
@@ -12135,9 +12137,9 @@ internal static string SqlUdtReason_MultivaluedAssemblyId {
         /// <summary>
         ///   Looks up a localized string similar to The type of field &apos;{0}&apos; is marked as explicit layout which is not allowed in Native format.
         /// </summary>
-        internal static string SqlUdtReason_NativeFormatExplicitLayoutNotAllowed {
+        internal static string SqlUdtReason_NativeFormatExplictLayoutNotAllowed {
             get {
-                return ResourceManager.GetString("SqlUdtReason_NativeFormatExplicitLayoutNotAllowed", resourceCulture);
+                return ResourceManager.GetString("SqlUdtReason_NativeFormatExplictLayoutNotAllowed", resourceCulture);
             }
         }
         
@@ -12270,27 +12272,27 @@ internal static string SSPIInvalidHandleType {
         /// <summary>
         ///   Looks up a localized string similar to Cannot get value because it is DBNull..
         /// </summary>
-        internal static string StrongTyping_CannotAccessDBNull {
+        internal static string StrongTyping_CananotAccessDBNull {
             get {
-                return ResourceManager.GetString("StrongTyping_CannotAccessDBNull", resourceCulture);
+                return ResourceManager.GetString("StrongTyping_CananotAccessDBNull", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove column since it is built in to this dataSet..
+        ///   Looks up a localized string similar to Cannot remove relation since it is built in to this dataSet..
         /// </summary>
-        internal static string StrongTyping_CannotRemoveColumn {
+        internal static string StrongTyping_CananotRemoveRelation {
             get {
-                return ResourceManager.GetString("StrongTyping_CannotRemoveColumn", resourceCulture);
+                return ResourceManager.GetString("StrongTyping_CananotRemoveRelation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove relation since it is built in to this dataSet..
+        ///   Looks up a localized string similar to Cannot remove column since it is built in to this dataSet..
         /// </summary>
-        internal static string StrongTyping_CannotRemoveRelation {
+        internal static string StrongTyping_CannotRemoveColumn {
             get {
-                return ResourceManager.GetString("StrongTyping_CannotRemoveRelation", resourceCulture);
+                return ResourceManager.GetString("StrongTyping_CannotRemoveColumn", resourceCulture);
             }
         }
         
@@ -13899,9 +13901,9 @@ internal static string Xml_SimpleTypeNotSupported {
         /// <summary>
         ///   Looks up a localized string similar to Cannot determine the DataSet Element. IsDataSet attribute exist more than once..
         /// </summary>
-        internal static string Xml_TooManyIsDataSetAttributeInSchema {
+        internal static string Xml_TooManyIsDataSetAtributeInSchema {
             get {
-                return ResourceManager.GetString("Xml_TooManyIsDataSetAttributeInSchema", resourceCulture);
+                return ResourceManager.GetString("Xml_TooManyIsDataSetAtributeInSchema", resourceCulture);
             }
         }
         
@@ -13924,3 +13926,4 @@ internal static string Xml_ValueOutOfRange {
         }
     }
 }
+