From 64fa9cc7af76c8d0483555ba1b4f1f0aa9425ba3 Mon Sep 17 00:00:00 2001
From: udeeshagautam <46980425+udeeshagautam@users.noreply.github.com>
Date: Tue, 21 May 2019 00:01:32 -0700
Subject: [PATCH] Removing Exclude/Include to show in tasks view (parity with
 SSDT) (#814)

---
 .../Localization/sr.cs                        | 22 -------------------
 .../Localization/sr.resx                      |  8 -------
 .../Localization/sr.strings                   |  2 --
 .../Localization/sr.xlf                       | 10 ---------
 .../SchemaCompare/SchemaCompareService.cs     |  8 ++-----
 5 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
index 68a77e38..42f33f0b 100755
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
@@ -2925,22 +2925,6 @@ namespace Microsoft.SqlTools.ServiceLayer
             }
         }
 
-        public static string IncludeNodeTaskName
-        {
-            get
-            {
-                return Keys.GetString(Keys.IncludeNodeTaskName);
-            }
-        }
-
-        public static string ExcludeNodeTaskName
-        {
-            get
-            {
-                return Keys.GetString(Keys.ExcludeNodeTaskName);
-            }
-        }
-
         public static string SchemaCompareExcludeIncludeNodeNotFound
         {
             get
@@ -4283,12 +4267,6 @@ namespace Microsoft.SqlTools.ServiceLayer
             public const string PublishChangesTaskName = "PublishChangesTaskName";
 
 
-            public const string IncludeNodeTaskName = "IncludeNodeTaskName";
-
-
-            public const string ExcludeNodeTaskName = "ExcludeNodeTaskName";
-
-
             public const string SchemaCompareExcludeIncludeNodeNotFound = "SchemaCompareExcludeIncludeNodeNotFound";
 
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
index 1e6c3111..15589826 100755
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
@@ -1715,14 +1715,6 @@
     <value>Apply schema compare changes</value>
     <comment></comment>
   </data>
-  <data name="IncludeNodeTaskName" xml:space="preserve">
-    <value>Include schema compare node</value>
-    <comment></comment>
-  </data>
-  <data name="ExcludeNodeTaskName" xml:space="preserve">
-    <value>Exclude schema compare node</value>
-    <comment></comment>
-  </data>
   <data name="SchemaCompareExcludeIncludeNodeNotFound" xml:space="preserve">
     <value>Failed to find the specified change in the model</value>
     <comment></comment>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
index 202ededa..2760c71e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
@@ -796,6 +796,4 @@ ExtractInvalidVersion = Invalid version '{0}' passed. Version must be in the for
 ############################################################################
 # Schema Compare
 PublishChangesTaskName = Apply schema compare changes
-IncludeNodeTaskName = Include schema compare node
-ExcludeNodeTaskName = Exclude schema compare node
 SchemaCompareExcludeIncludeNodeNotFound = Failed to find the specified change in the model
\ No newline at end of file
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
index 1781a08e..8d130e1f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
@@ -1991,16 +1991,6 @@
         <target state="new">Apply schema compare changes</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="IncludeNodeTaskName">
-        <source>Include schema compare node</source>
-        <target state="new">Include schema compare node</target>
-        <note></note>
-      </trans-unit>
-      <trans-unit id="ExcludeNodeTaskName">
-        <source>Exclude schema compare node</source>
-        <target state="new">Exclude schema compare node</target>
-        <note></note>
-      </trans-unit>
       <trans-unit id="SchemaCompareExcludeIncludeNodeNotFound">
         <source>Failed to find the specified change in the model</source>
         <target state="new">Failed to find the specified change in the model</target>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareService.cs b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareService.cs
index dba36f22..e7871f16 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareService.cs
@@ -183,13 +183,9 @@ namespace Microsoft.SqlTools.ServiceLayer.SchemaCopmare
             {
                 SchemaComparisonResult compareResult = schemaCompareResults.Value[parameters.OperationId];
                 operation = new SchemaCompareIncludeExcludeNodeOperation(parameters, compareResult);
-                SqlTask sqlTask = null;
-                TaskMetadata metadata = new TaskMetadata();
-                metadata.TaskOperation = operation;
-                metadata.Name = parameters.IncludeRequest ? SR.IncludeNodeTaskName : SR.ExcludeNodeTaskName;
-
-                sqlTask = SqlTaskManagerInstance.CreateAndRun<SqlTask>(metadata);
 
+                operation.Execute(parameters.TaskExecutionMode);
+                
                 await requestContext.SendResult(new ResultStatus()
                 {
                     Success = true,