Update Microsoft.Data.SqlClient to v5.0.1

Packages.props

@@ -6,8 +6,8 @@
 		<PackageReference Update="System.IO.Packaging" Version="4.7.0" />
 		<PackageReference Update="System.Runtime.Loader" Version="4.3.0" />
 		<PackageReference Update="System.Composition" Version="1.4.1" />
-		<PackageReference Update="System.Security.Permissions" Version="4.7.0" />
-		<PackageReference Update="System.Text.Encoding.CodePages" Version="4.7.1" />
+		<PackageReference Update="System.Security.Permissions" Version="5.0.0" />
+		<PackageReference Update="System.Text.Encoding.CodePages" Version="5.0.0" />
 		<PackageReference Update="System.Text.Encodings.Web" Version="4.7.2" />
 		<PackageReference Update="System.Reactive.Core" Version="5.0.0" />
 
@@ -19,14 +19,14 @@
 		<PackageReference Update="Microsoft.Azure.Management.Sql" Version="1.41.0-preview" />
 
 		<PackageReference Update="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="1.1.1" />
-		<PackageReference Update="Microsoft.Data.SqlClient" Version="3.1.1" />
-		<PackageReference Update="Microsoft.SqlServer.SqlManagementObjects" Version="161.47021.0" />
-		<PackageReference Update="Microsoft.SqlServer.Management.SmoMetadataProvider" Version="161.47008.0" />
-		<PackageReference Update="Microsoft.SqlServer.DACFx" Version="160.6295.0-preview" />
+		<PackageReference Update="Microsoft.Data.SqlClient" Version="5.0.1" />
+		<PackageReference Update="Microsoft.SqlServer.SqlManagementObjects" Version="170.8.0" />
+		<PackageReference Update="Microsoft.SqlServer.Management.SmoMetadataProvider" Version="170.8.0" />
+		<PackageReference Update="Microsoft.SqlServer.DacFx" Version="161.6337.0-preview" />
 		<PackageReference Update="Microsoft.Azure.Kusto.Data" Version="9.0.4" />
 		<PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4" />
 		<PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.1.9]" />
-		<PackageReference Update="Microsoft.SqlServer.Migration.Assessment" Version="1.0.20220816.40" />
+		<PackageReference Update="Microsoft.SqlServer.Migration.Assessment" Version="1.0.20221014.16" />
 		<PackageReference Update="Microsoft.SqlServer.Management.SqlParser" Version="160.22519.0" />
 		<PackageReference Update="Microsoft.Azure.OperationalInsights" Version="1.0.0" />
 		<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
@@ -45,4 +45,4 @@
 		<PackageReference Update="coverlet.collector" Version="3.1.2" />
 		<PackageReference Update="coverlet.msbuild" Version="3.1.2" />
 	</ItemGroup>
-</Project>
+</Project>

src/Microsoft.Kusto.ServiceLayer/Connection/ConnectionProviderOptionsHelper.cs

@@ -91,14 +91,6 @@ internal static ConnectionProviderOptions BuildConnectionProviderOptions()
                         GroupName = "Initialization"
                     },
                     new ConnectionOption
-                    {
-                        Name = "asynchronousProcessing",
-                        DisplayName = "Asynchronous processing enabled",
-                        Description = "When true, enables usage of the Asynchronous functionality in the .Net Framework Data Provider",
-                        ValueType = ConnectionOption.ValueTypeBoolean,
-                        GroupName = "Initialization"
-                    },
-                    new ConnectionOption
                     {
                         Name = "connectTimeout",
                         DisplayName = "Connect timeout",

src/Microsoft.Kusto.ServiceLayer/Microsoft.Kusto.ServiceLayer.csproj

@@ -31,8 +31,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.OperationalInsights" />
-    <PackageReference Include="Microsoft.SqlServer.DACFx" />
+    <PackageReference Include="Microsoft.SqlServer.DacFx" />
     <PackageReference Include="Microsoft.SqlServer.Management.SmoMetadataProvider" />
+    <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
     <PackageReference Include="System.Text.Encoding.CodePages" />
     <PackageReference Include="Microsoft.Azure.Kusto.Data" />
     <PackageReference Include="System.Net.Http" />

src/Microsoft.SqlTools.Hosting/Utility/GeneralRequestDetails.cs

@@ -86,7 +86,7 @@ private static bool TryParseEnum<T>(Type t, string value, out object enumValue)
                 enumValue = Enum.Parse(t, value);
                 return true;
             }
-            catch(Exception)
+            catch (Exception)
             {
                 enumValue = default(T);
                 return false;

src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/BatchParserSqlCmd.cs

@@ -155,12 +155,7 @@ private string GetFilePath(string fileName)
                     }
 
                 }
-                if (fullFileName == null)
-                {
-                    fullFileName = Path.GetFullPath(fileName);
-                }
-
-                return fullFileName;
+                return fullFileName ?? Path.GetFullPath(fileName);
             }
             catch (ArgumentException)
             {

src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/ExecutionEngineCode/ScriptExecutionArgs.cs

@@ -128,15 +128,7 @@ internal int StartingLine
 
         internal Dictionary<string, string> Variables
         {
-            get
-            {
-                if (cmdVariables == null)
-                {
-                    cmdVariables = new Dictionary<string, string>(StringComparer.CurrentCultureIgnoreCase);
-                }
-
-                return cmdVariables;
-            }
+            get => cmdVariables ??= new Dictionary<string, string>(StringComparer.CurrentCultureIgnoreCase);
         }
         #endregion
     }

src/Microsoft.SqlTools.ManagedBatchParser/BatchParser/Parser.cs

@@ -608,18 +608,10 @@ private string ParsePassword()
         }
 
         internal void RaiseError(ErrorCode errorCode, string message = null)
-        {
-            RaiseError(errorCode, LookaheadToken, message);
-        }
+            => RaiseError(errorCode, LookaheadToken, message);
 
         internal static void RaiseError(ErrorCode errorCode, Token token, string message = null)
-        {
-            if (message == null)
-            {
-                message = string.Format(CultureInfo.CurrentCulture, SR.BatchParser_IncorrectSyntax, token.Text);
-            }
-            throw new BatchParserException(errorCode, token, message);
-        }
+            => throw new BatchParserException(errorCode, token, message ?? string.Format(CultureInfo.CurrentCulture, SR.BatchParser_IncorrectSyntax, token.Text));
 
         internal string ResolveVariables(Token inputToken, int offset, List<VariableReference> variableRefs)
         {

src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<!-- Targeting netstandard2.0 so that other things such as PS cmdlets can use this which need to support a wider range of machines -->
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<!-- Targeting both net6.0 and net472 so that other things such as PS cmdlets can use this which need to support a wider range of machines -->
+		<TargetFrameworks>net6.0;net472</TargetFrameworks>
+		<LangVersion>9.0</LangVersion>
 		<Nullable>disable</Nullable>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>

src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableConnectionHelper.cs

@@ -276,10 +276,8 @@ public static object ExecuteNonQuery(
                 Debug.Assert(conn.State == ConnectionState.Open, "connection passed to ExecuteNonQuery should be open.");
 
                 cmd = conn.CreateCommand();
-                if (initializeCommand == null)
-                {
-                    initializeCommand = SetCommandTimeout;
-                }
+
+                initializeCommand ??= SetCommandTimeout;
                 initializeCommand(cmd);
 
                 cmd.CommandText = commandText;
@@ -331,10 +329,8 @@ public static object ExecuteScalar(
                 Debug.Assert(conn.State == ConnectionState.Open, "connection passed to ExecuteScalar should be open.");
 
                 cmd = conn.CreateCommand();
-                if (initializeCommand == null)
-                {
-                    initializeCommand = SetCommandTimeout;
-                }
+
+                initializeCommand ??= SetCommandTimeout;
                 initializeCommand(cmd);
 
                 cmd.CommandText = commandText;
@@ -384,11 +380,7 @@ public static void ExecuteReader(
             {
                 cmd = conn.CreateCommand();
 
-                if (initializeCommand == null)
-                {
-                    initializeCommand = SetCommandTimeout;
-                }
-
+                initializeCommand ??= SetCommandTimeout;
                 initializeCommand(cmd);
 
                 cmd.CommandText = commandText;

src/Microsoft.SqlTools.ManagedBatchParser/ReliableConnection/ReliableSqlConnection.cs

@@ -478,10 +478,7 @@ private void VerifyConnectionOpen(IDbCommand command)
         {
             // Verify whether or not the connection is valid and is open. This code may be retried therefore
             // it is important to ensure that a connection is re-established should it have previously failed.
-            if (command.Connection == null)
-            {
-                command.Connection = this;
-            }
+            command.Connection ??= this;
 
             if (command.Connection.State != ConnectionState.Open)
             {

src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionProviderOptionsHelper.cs

@@ -91,14 +91,6 @@ internal static ConnectionProviderOptions BuildConnectionProviderOptions()
                         GroupName = "Initialization"
                     },
                     new ConnectionOption
-                    {
-                        Name = "asynchronousProcessing",
-                        DisplayName = "Asynchronous processing enabled",
-                        Description = "When true, enables usage of the Asynchronous functionality in the .Net Framework Data Provider",
-                        ValueType = ConnectionOption.ValueTypeBoolean,
-                        GroupName = "Initialization"
-                    },
-                    new ConnectionOption
                     {
                         Name = "connectTimeout",
                         DisplayName = "Connect timeout",
@@ -152,10 +144,14 @@ internal static ConnectionProviderOptions BuildConnectionProviderOptions()
                     {
                         Name = "encrypt",
                         DisplayName = "Encrypt",
-                        Description =
-                        "When true, SQL Server uses SSL encryption for all data sent between the client and server if the servers has a certificate installed",
+                        Description = "When set, SQL Server uses provided setting for SSL encryption for all data sent between the client and server.",
+                        ValueType = ConnectionOption.ValueTypeCategory,
                         GroupName = "Security",
-                        ValueType = ConnectionOption.ValueTypeBoolean
+                        CategoryValues = new CategoryValue[] {
+                            new CategoryValue { DisplayName = "Optional", Name = "Optional" },
+                            new CategoryValue { DisplayName = "Mandatory", Name = "Mandatory" },
+                            new CategoryValue { DisplayName = "Strict", Name = "Strict" }
+                        }
                     },
                     new ConnectionOption
                     {
@@ -174,6 +170,14 @@ internal static ConnectionProviderOptions BuildConnectionProviderOptions()
                         ValueType = ConnectionOption.ValueTypeBoolean
                     },
                     new ConnectionOption
+                    {
+                        Name = "hostNameInCertificate",
+                        DisplayName = "HostNameInCertificate",
+                        Description = "Specifies host name in certificate to be used for certificate validation, when encryption is enabled.",
+                        GroupName = "Security",
+                        ValueType = ConnectionOption.ValueTypeString,
+                    },
+                    new ConnectionOption
                     {
                         Name = "attachedDBFileName",
                         DisplayName = "Attached DB file name",

src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs

@@ -410,7 +410,8 @@ public virtual async Task<ConnectionCompleteParams> Connect(ConnectParams connec
                 if (response?.ErrorNumber == 40613)
                 {
                     counter++;
-                    if(counter != MaxServerlessReconnectTries) {
+                    if (counter != MaxServerlessReconnectTries)
+                    {
                         Logger.Information($"Database for connection {connectionInfo.OwnerUri} is paused, retrying connection. Attempt #{counter}");
                     }
                 }
@@ -1299,14 +1300,26 @@ public static SqlConnectionStringBuilder CreateConnectionStringBuilder(Connectio
 
                 connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl;
             }
-            if (connectionDetails.Encrypt.HasValue)
+
+            if (!string.IsNullOrEmpty(connectionDetails.Encrypt))
             {
-                connectionBuilder.Encrypt = connectionDetails.Encrypt.Value;
+                connectionBuilder.Encrypt = connectionDetails.Encrypt.ToLowerInvariant() switch
+                {
+                    "optional" or "false" or "no" => SqlConnectionEncryptOption.Optional,
+                    "mandatory" or "true" or "yes" => SqlConnectionEncryptOption.Mandatory,
+                    "strict" => SqlConnectionEncryptOption.Strict,
+                    _ => throw new ArgumentException(SR.ConnectionServiceConnStringInvalidEncryptOption(connectionDetails.Encrypt))
+                };
             }
+
             if (connectionDetails.TrustServerCertificate.HasValue)
             {
                 connectionBuilder.TrustServerCertificate = connectionDetails.TrustServerCertificate.Value;
             }
+            if (!string.IsNullOrEmpty(connectionDetails.HostNameInCertificate))
+            {
+                connectionBuilder.HostNameInCertificate = connectionDetails.HostNameInCertificate;
+            }
             if (connectionDetails.PersistSecurityInfo.HasValue)
             {
                 connectionBuilder.PersistSecurityInfo = connectionDetails.PersistSecurityInfo.Value;
@@ -1471,8 +1484,9 @@ public ConnectionDetails ParseConnectionString(string connectionString)
                 ColumnEncryptionSetting = builder.ColumnEncryptionSetting.ToString(),
                 EnclaveAttestationProtocol = builder.AttestationProtocol == SqlConnectionAttestationProtocol.NotSpecified ? null : builder.AttestationProtocol.ToString(),
                 EnclaveAttestationUrl = builder.EnclaveAttestationUrl,
-                Encrypt = builder.Encrypt,
+                Encrypt = builder.Encrypt.ToString(),
                 FailoverPartner = builder.FailoverPartner,
+                HostNameInCertificate = builder.HostNameInCertificate,
                 LoadBalanceTimeout = builder.LoadBalanceTimeout,
                 MaxPoolSize = builder.MaxPoolSize,
                 MinPoolSize = builder.MinPoolSize,

src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetails.cs

@@ -147,13 +147,13 @@ public string EnclaveAttestationUrl
         }
 
         /// <summary>
-        /// Gets or sets a Boolean value that indicates whether SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed.
+        /// Gets or sets a <see cref="string"/> value that indicates encryption mode that SQL Server should use to perform SSL encryption for all the data sent between the client and server. Supported values are: Optional, Mandatory, Strict.
         /// </summary>
-        public bool? Encrypt
+        public string Encrypt
         {
             get
             {
-                return GetOptionValue<bool?>("encrypt");
+                return GetOptionValue<string>("encrypt");
             }
 
             set
@@ -178,6 +178,22 @@ public bool? TrustServerCertificate
             }
         }
 
+        /// <summary>
+        /// Gets or sets a value that indicates the host name in the certificate to be used for certificate validation when encryption is enabled.
+        /// </summary>
+        public string HostNameInCertificate
+        {
+            get
+            {
+                return GetOptionValue<string>("hostNameInCertificate");
+            }
+
+            set
+            {
+                SetOptionValue("hostNameInCertificate", value);
+            }
+        }
+
         /// <summary>
         /// Gets or sets a Boolean value that indicates if security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state.
         /// </summary>

src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetailsExtensions.cs

@@ -27,6 +27,7 @@ public static ConnectionDetails Clone(this ConnectionDetails details)
                 EnclaveAttestationUrl = details.EnclaveAttestationUrl,
                 Encrypt = details.Encrypt,
                 TrustServerCertificate = details.TrustServerCertificate,
+                HostNameInCertificate = details.HostNameInCertificate,
                 PersistSecurityInfo = details.PersistSecurityInfo,
                 ConnectTimeout = details.ConnectTimeout,
                 ConnectRetryCount = details.ConnectRetryCount,

src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs

@@ -9641,6 +9641,11 @@ public static string ConnectionServiceConnStringInvalidColumnEncryptionSetting(s
             return Keys.GetString(Keys.ConnectionServiceConnStringInvalidColumnEncryptionSetting, columnEncryptionSetting);
         }
 
+        public static string ConnectionServiceConnStringInvalidEncryptOption(string encrypt)
+        {
+            return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEncryptOption, encrypt);
+        }
+
         public static string ConnectionServiceConnStringInvalidEnclaveAttestationProtocol(string enclaveAttestationProtocol)
         {
             return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol);
@@ -10062,6 +10067,9 @@ public class Keys
             public const string ConnectionServiceConnStringInvalidColumnEncryptionSetting = "ConnectionServiceConnStringInvalidColumnEncryptionSetting";
 
 
+            public const string ConnectionServiceConnStringInvalidEncryptOption = "ConnectionServiceConnStringInvalidEncryptOption";
+
+
             public const string ConnectionServiceConnStringInvalidEnclaveAttestationProtocol = "ConnectionServiceConnStringInvalidEnclaveAttestationProtocol";
 
 

src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx

@@ -144,6 +144,11 @@
     <value>Invalid value &apos;{0}&apos; for ComlumEncryption. Valid values are &apos;Enabled&apos; and &apos;Disabled&apos;.</value>
     <comment>.
  Parameters: 0 - columnEncryptionSetting (string) </comment>
+  </data>
+  <data name="ConnectionServiceConnStringInvalidEncryptOption" xml:space="preserve">
+    <value>Invalid value &apos;{0}&apos; for Encrypt. Valid values are &apos;Optional&apos;, &apos;Mandatory&apos;, &apos;Strict&apos;, &apos;True&apos;, &apos;False&apos;, &apos;Yes&apos; and &apos;No&apos;.</value>
+    <comment>.
+ Parameters: 0 - encrypt (string) </comment>
   </data>
   <data name="ConnectionServiceConnStringInvalidEnclaveAttestationProtocol" xml:space="preserve">
     <value>Invalid value &apos;{0}&apos; for EnclaveAttestationProtocol. Valid values are &apos;AAS&apos; and &apos;HGS&apos;.</value>

src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings

@@ -35,6 +35,8 @@ ConnectionServiceConnStringInvalidAuthType(string authType) = Invalid value '{0}
 
 ConnectionServiceConnStringInvalidColumnEncryptionSetting(string columnEncryptionSetting) = Invalid value '{0}' for ComlumEncryption. Valid values are 'Enabled' and 'Disabled'.
 
+ConnectionServiceConnStringInvalidEncryptOption(string encrypt) = Invalid value '{0}' for Encrypt. Valid values are 'Optional', 'Mandatory', 'Strict', 'True', 'False', 'Yes' and 'No'.
+
 ConnectionServiceConnStringInvalidEnclaveAttestationProtocol(string enclaveAttestationProtocol) = Invalid value '{0}' for EnclaveAttestationProtocol. Valid values are 'AAS' and 'HGS'.
 
 ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination = The Attestation Protocol and Enclave Attestation URL requires Always Encrypted to be set to Enabled.