mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-01-29 01:25:41 -05:00
fix build breaks (#924)
This commit is contained in:
@@ -1160,7 +1160,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
|
||||
{
|
||||
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
|
||||
{
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination());
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
|
||||
switch (connectionDetails.EnclaveAttestationProtocol.ToUpper())
|
||||
@@ -1179,7 +1179,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
|
||||
{
|
||||
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
|
||||
{
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination());
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
|
||||
connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl;
|
||||
|
||||
@@ -45,6 +45,14 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
}
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination
|
||||
{
|
||||
get
|
||||
{
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnectionCanceled
|
||||
{
|
||||
get
|
||||
@@ -364,6 +372,7 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
return Keys.GetString(Keys.SqlCmdExitOnError);
|
||||
}
|
||||
}
|
||||
|
||||
public static string SqlCmdUnsupportedToken
|
||||
{
|
||||
get
|
||||
@@ -2997,11 +3006,6 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol);
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination()
|
||||
{
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnStringInvalidIntent(string intent)
|
||||
{
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidIntent, intent);
|
||||
@@ -3318,7 +3322,7 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
|
||||
public const string QueryServiceExecutionPlanNotFound = "QueryServiceExecutionPlanNotFound";
|
||||
|
||||
|
||||
|
||||
public const string SqlCmdExitOnError = "SqlCmdExitOnError";
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1590,7 +1590,7 @@
|
||||
<source>Azure SQL Stretch Database</source>
|
||||
<target state="new">Azure SQL Stretch Database</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
</trans-unit>
|
||||
<trans-unit id="AzureSqlAnalyticsOnDemandEdition">
|
||||
<source>Azure SQL Analytics on-demand</source>
|
||||
<target state="new">Azure SQL Analytics on-demand</target>
|
||||
@@ -2029,6 +2029,33 @@
|
||||
<note>.
|
||||
Parameters: 0 - filePath (string) </note>
|
||||
</trans-unit>
|
||||
<trans-unit id="ConnectionServiceConnStringInvalidColumnEncryptionSetting">
|
||||
<source>Invalid value '{0}' for ComlumEncryption. Valid values are 'Enabled' and 'Disabled'.</source>
|
||||
<target state="new">Invalid value '{0}' for ComlumEncryption. Valid values are 'Enabled' and 'Disabled'.</target>
|
||||
<note>.
|
||||
Parameters: 0 - columnEncryptionSetting (string) </note>
|
||||
</trans-unit>
|
||||
<trans-unit id="ConnectionServiceConnStringInvalidEnclaveAttestationProtocol">
|
||||
<source>Invalid value '{0}' for EnclaveAttestationProtocol. Valid values are 'AAS' and 'HGS'.</source>
|
||||
<target state="new">Invalid value '{0}' for EnclaveAttestationProtocol. Valid values are 'AAS' and 'HGS'.</target>
|
||||
<note>.
|
||||
Parameters: 0 - enclaveAttestationProtocol (string) </note>
|
||||
</trans-unit>
|
||||
<trans-unit id="ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination">
|
||||
<source>The Attestation Protocol and Enclave Attestation URL requires Always Encrypted to be set to Enabled.</source>
|
||||
<target state="new">The Attestation Protocol and Enclave Attestation URL requires Always Encrypted to be set to Enabled.</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="SqlCmdExitOnError">
|
||||
<source>An error was encountered during execution of batch. Exiting.</source>
|
||||
<target state="new">An error was encountered during execution of batch. Exiting.</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="SqlCmdUnsupportedToken">
|
||||
<source>Encountered unsupported token {0}</source>
|
||||
<target state="new">Encountered unsupported token {0}</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user