ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix build error"

Browse Source 
This reverts commit f5a6f6f714.
This commit is contained in:
Amir Omidi
2020-02-26 11:55:28 -08:00
parent f5a6f6f714
commit a6c206bacd
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
View File

@@ -1160,7 +1160,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
{ {
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED") if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
{ {
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination); throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination());
} }
switch (connectionDetails.EnclaveAttestationProtocol.ToUpper()) switch (connectionDetails.EnclaveAttestationProtocol.ToUpper())
@@ -1179,7 +1179,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
{ {
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED") if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
{ {
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination); throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination());
} }
connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl; connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl;

13
src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
View File

@@ -2972,15 +2972,6 @@ namespace Microsoft.SqlTools.ServiceLayer
} }
} }
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination
{
get
{
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
}
}
public static string ConnectionServiceListDbErrorNotConnected(string uri) public static string ConnectionServiceListDbErrorNotConnected(string uri)
{ {
return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri); return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri);
@@ -3006,6 +2997,10 @@ namespace Microsoft.SqlTools.ServiceLayer
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol); return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol);
} }
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination()
{
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
}
public static string ConnectionServiceConnStringInvalidIntent(string intent) public static string ConnectionServiceConnStringInvalidIntent(string intent)
{ {