From 3049dacb84e51a8e91bb6d9f9d296276c12aec26 Mon Sep 17 00:00:00 2001
From: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com>
Date: Mon, 22 Jun 2020 15:16:13 -0700
Subject: [PATCH] Update DacFx and MDS to same version (#986)
* Updating DacFx and MDS nuget to match versions
* Fixing a test. It's unreleated to change.
---
Packages.props | 4 ++--
.../DacFx/DacFxserviceTests.cs | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Packages.props b/Packages.props
index b80f0e38..9ad3585c 100644
--- a/Packages.props
+++ b/Packages.props
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxserviceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxserviceTests.cs
index 96ad0fa9..fa771ba3 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxserviceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxserviceTests.cs
@@ -232,18 +232,18 @@ RETURN 0
ExtractOperation operation = new ExtractOperation(extractParams, result.ConnectionInfo);
service.PerformOperation(operation, TaskExecutionMode.Execute);
- // Verify two sql files are generated in the target folder path
- int actualCnt = Directory.GetFiles(folderPath, "*.sql", SearchOption.AllDirectories).Length;
- Assert.Equal(actualCnt, 2);
-
+ // Verify two sql files are generated in the target folder path
+ // for dev-servers where there are more users/permissions present on server - the extract might have more files than just 2 expected tables, so check only for tables
+ int actualCnt = Directory.GetFiles(folderPath, "table*.sql", SearchOption.AllDirectories).Length;
+ Assert.Equal(2, actualCnt);
+ }
+ finally
+ {
// Remove the directory
if (Directory.Exists(folderPath))
{
Directory.Delete(folderPath, true);
}
- }
- finally
- {
testdb.Cleanup();
}
}
@@ -351,7 +351,7 @@ RETURN 0
// first extract a dacpac
var result = GetLiveAutoCompleteTestObjects();
SqlTestDb sourceDb = await SqlTestDb.CreateNewAsync(TestServerType.OnPrem, false, null, SourceScript, "DacFxGenerateScriptTest");
- SqlTestDb targetDb = await SqlTestDb.CreateNewAsync(TestServerType.OnPrem, false, null, null, "DacFxGenerateScriptTest");
+ SqlTestDb targetDb = await SqlTestDb.CreateNewAsync(TestServerType.OnPrem, false, null, null, "DacFxGenerateScriptTest");
try
{