diff --git a/extensions/cms/package.json b/extensions/cms/package.json
index 4007f4650f..9a2a3b1335 100644
--- a/extensions/cms/package.json
+++ b/extensions/cms/package.json
@@ -237,10 +237,23 @@
"displayName": "%cms.connectionOptions.encrypt.displayName%",
"description": "%cms.connectionOptions.encrypt.description%",
"groupName": "%cms.connectionOptions.groupName.security%",
- "valueType": "boolean",
+ "valueType": "category",
"defaultValue": "true",
"objectType": null,
- "categoryValues": null,
+ "categoryValues": [
+ {
+ "displayName": "%cms.connectionOptions.encrypt.categoryValues.true%",
+ "name": "true"
+ },
+ {
+ "displayName": "%cms.connectionOptions.encrypt.categoryValues.strict%",
+ "name": "strict"
+ },
+ {
+ "displayName": "%cms.connectionOptions.encrypt.categoryValues.false%",
+ "name": "false"
+ }
+ ],
"isRequired": false,
"isArray": false,
"showOnConnectionDialog": true
diff --git a/extensions/cms/package.nls.json b/extensions/cms/package.nls.json
index cc04169dd9..94c6759bad 100644
--- a/extensions/cms/package.nls.json
+++ b/extensions/cms/package.nls.json
@@ -69,13 +69,16 @@
"cms.connectionOptions.columnEncryptionSetting.displayName": "Column encryption",
"cms.connectionOptions.columnEncryptionSetting.description": "Default column encryption setting for all the commands on the connection",
"cms.connectionOptions.encrypt.displayName": "Encrypt",
- "cms.connectionOptions.encrypt.description": "When true, SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed",
+ "cms.connectionOptions.encrypt.description": "When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' is supported on SQL Server 2022 onwards.",
+ "cms.connectionOptions.encrypt.categoryValues.strict": "Strict",
+ "cms.connectionOptions.encrypt.categoryValues.true": "Mandatory (True)",
+ "cms.connectionOptions.encrypt.categoryValues.false": "Optional (False)",
"cms.connectionOptions.persistSecurityInfo.displayName": "Persist security info",
"cms.connectionOptions.persistSecurityInfo.description": "When false, security-sensitive information, such as the password, is not returned as part of the connection",
"cms.connectionOptions.hostNameInCertificate.displayName": "Host name in certificate",
"cms.connectionOptions.hostNameInCertificate.description": "Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation.",
"cms.connectionOptions.trustServerCertificate.displayName": "Trust server certificate",
- "cms.connectionOptions.trustServerCertificate.description": "When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate",
+ "cms.connectionOptions.trustServerCertificate.description": "When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate. This property is not supported with Encrypt=Strict.",
"cms.connectionOptions.attachedDBFileName.displayName": "Attached DB file name",
"cms.connectionOptions.attachedDBFileName.description": "The name of the primary file, including the full path name, of an attachable database",
"cms.connectionOptions.contextConnection.displayName": "Context connection",
diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
index 07c1ed5b10..0d0b6dede6 100644
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -848,13 +848,37 @@
"displayName": "%mssql.connectionOptions.encrypt.displayName%",
"description": "%mssql.connectionOptions.encrypt.description%",
"groupName": "%mssql.connectionOptions.groupName.security%",
- "valueType": "boolean",
+ "valueType": "category",
"defaultValue": "true",
"objectType": null,
- "categoryValues": null,
+ "categoryValues": [
+ {
+ "displayName": "%mssql.connectionOptions.encrypt.categoryValues.true%",
+ "name": "true"
+ },
+ {
+ "displayName": "%mssql.connectionOptions.encrypt.categoryValues.strict%",
+ "name": "strict"
+ },
+ {
+ "displayName": "%mssql.connectionOptions.encrypt.categoryValues.false%",
+ "name": "false"
+ }
+ ],
"isRequired": false,
"isArray": false,
- "showOnConnectionDialog": true
+ "showOnConnectionDialog": true,
+ "onSelectionChange": [
+ {
+ "values": ["strict"],
+ "dependentOptionActions": [
+ {
+ "optionName": "trustServerCertificate",
+ "action": "hide"
+ }
+ ]
+ }
+ ]
},
{
"specialValueType": null,
diff --git a/extensions/mssql/package.nls.json b/extensions/mssql/package.nls.json
index 557522e261..e40599717d 100644
--- a/extensions/mssql/package.nls.json
+++ b/extensions/mssql/package.nls.json
@@ -118,13 +118,16 @@
"mssql.connectionOptions.enclaveAttestationUrl.displayName": "Enclave Attestation URL",
"mssql.connectionOptions.enclaveAttestationUrl.description": "Specifies an endpoint for attesting a server-side enclave used with Always Encrypted with secure enclaves",
"mssql.connectionOptions.encrypt.displayName": "Encrypt",
- "mssql.connectionOptions.encrypt.description": "When true, SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed",
+ "mssql.connectionOptions.encrypt.description": "When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' is supported on SQL Server 2022 onwards.",
+ "mssql.connectionOptions.encrypt.categoryValues.strict": "Strict",
+ "mssql.connectionOptions.encrypt.categoryValues.true": "Mandatory (True)",
+ "mssql.connectionOptions.encrypt.categoryValues.false": "Optional (False)",
"mssql.connectionOptions.persistSecurityInfo.displayName": "Persist security info",
"mssql.connectionOptions.persistSecurityInfo.description": "When false, security-sensitive information, such as the password, is not returned as part of the connection",
"mssql.connectionOptions.hostNameInCertificate.displayName": "Host name in certificate",
"mssql.connectionOptions.hostNameInCertificate.description": "Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation.",
"mssql.connectionOptions.trustServerCertificate.displayName": "Trust server certificate",
- "mssql.connectionOptions.trustServerCertificate.description": "When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate",
+ "mssql.connectionOptions.trustServerCertificate.description": "When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate. This property is not supported with Encrypt=Strict.",
"mssql.connectionOptions.attachedDBFileName.displayName": "Attached DB file name",
"mssql.connectionOptions.attachedDBFileName.description": "The name of the primary file, including the full path name, of an attachable database",
"mssql.connectionOptions.contextConnection.displayName": "Context connection",
diff --git a/resources/xlf/en/cms.xlf b/resources/xlf/en/cms.xlf
index 7ab7f75a99..60909625ed 100644
--- a/resources/xlf/en/cms.xlf
+++ b/resources/xlf/en/cms.xlf
@@ -168,11 +168,20 @@
Current language
- When true, SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed
+ When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' encryption is supported on SQL Server 2022 onwards.Encrypt
+
+ Strict
+
+
+ Mandatory (True)
+
+
+ Optional (False)
+ The name or network address of the instance of SQL Server that acts as a failover partner
@@ -408,4 +417,4 @@
Version