From a6c206bacda47ecd9d450f0d19db82d5536b1b39 Mon Sep 17 00:00:00 2001
From: Amir Omidi <amomidi@microsoft.com>
Date: Wed, 26 Feb 2020 11:55:28 -0800
Subject: [PATCH] Revert "Fix build error"

This reverts commit f5a6f6f714353981bfb682ecf7374022446ba812.
---
 .../Connection/ConnectionService.cs               |  4 ++--
 .../Localization/sr.cs                            | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
index d0df0a5a..bb9d9623 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
@@ -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;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
index ca74ff0f..f9c6aff6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
@@ -2972,15 +2972,6 @@ namespace Microsoft.SqlTools.ServiceLayer
             }
         }
 
-
-        public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination
-        {
-            get
-            {
-                return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
-            }
-        }
-
         public static string ConnectionServiceListDbErrorNotConnected(string uri)
         {
             return Keys.GetString(Keys.ConnectionServiceListDbErrorNotConnected, uri);
@@ -3006,6 +2997,10 @@ 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)
         {
@@ -3323,7 +3318,7 @@ namespace Microsoft.SqlTools.ServiceLayer
 
             public const string QueryServiceExecutionPlanNotFound = "QueryServiceExecutionPlanNotFound";
 
-
+            
             public const string SqlCmdExitOnError = "SqlCmdExitOnError";