From 1afbe6a898c2517cb9d1a324aa777f2ef9f93894 Mon Sep 17 00:00:00 2001
From: Johan Ljunggren <johan.ljunggren@shamn.se>
Date: Sun, 8 Apr 2018 16:22:44 +0200
Subject: [PATCH] Changes to SqlSetup - Changes to integration tests   - CONN
 feature was temporarily removed from the instances installed by the    
 integration tests. This is due to issue #1105.

---
 CHANGELOG.md                               |  3 +++
 Tests/Integration/MSFT_SqlSetup.config.ps1 | 26 +++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3d77f14f2..56a9603459 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,9 @@
     `/FEATURES` argument.
   - Cleaned up a bit in the tests, removed excessive piping.
   - Fixed minor typo in examples.
+  - Changes to integration tests
+    - CONN feature was temporarily removed from the instances installed by the
+      integration tests. This is due to issue #1105.
 - Changes to SqlRS
   - Updated the integration tests to stop the Reporting Services service after
     the integration test. This is to save memory on the AppVeyor build worker.
diff --git a/Tests/Integration/MSFT_SqlSetup.config.ps1 b/Tests/Integration/MSFT_SqlSetup.config.ps1
index f50101cdf3..c6896bb897 100644
--- a/Tests/Integration/MSFT_SqlSetup.config.ps1
+++ b/Tests/Integration/MSFT_SqlSetup.config.ps1
@@ -13,7 +13,13 @@ $ConfigurationData = @{
 
             # Database Engine properties.
             DatabaseEngineNamedInstanceName       = 'DSCSQLTEST'
-            DatabaseEngineNamedInstanceFeatures   = 'SQLENGINE,AS,CONN,BC,SDK'
+            <#
+                CONN feature:
+                Due to issue #1105 the feature CONN was removed.
+                It cannot be used here if CONN is already installed
+                in the AppVeyor build worker.
+            #>
+            DatabaseEngineNamedInstanceFeatures   = 'SQLENGINE,AS,BC,SDK'
             AnalysisServicesMultiServerMode       = 'MULTIDIMENSIONAL'
 
             <#
@@ -24,7 +30,14 @@ $ConfigurationData = @{
                 evaluate the result in the test.
             #>
             AnalysisServicesTabularInstanceName   = 'DSCTABULAR'
-            AnalysisServicesTabularFeatures       = 'AS,CONN,BC,SDK'
+
+            <#
+                CONN feature:
+                Due to issue #1105 the feature CONN was removed.
+                It cannot be used here if CONN is already installed
+                in the AppVeyor build worker.
+            #>
+            AnalysisServicesTabularFeatures       = 'AS,BC,SDK'
             AnalysisServicesTabularServerMode     = 'TABULAR'
 
             <#
@@ -35,7 +48,14 @@ $ConfigurationData = @{
                 evaluate the result in the test.
             #>
             DatabaseEngineDefaultInstanceName     = 'MSSQLSERVER'
-            DatabaseEngineDefaultInstanceFeatures = 'SQLENGINE,CONN,BC,SDK'
+
+            <#
+                CONN feature:
+                Due to issue #1105 the feature CONN was removed.
+                It cannot be used here if CONN is already installed
+                in the AppVeyor build worker.
+            #>
+            DatabaseEngineDefaultInstanceFeatures = 'SQLENGINE,BC,SDK'
 
             # General SqlSetup properties
             Collation                             = 'Finnish_Swedish_CI_AS'