ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update DacFx and MDS to same version (#986)

Browse Source 
* Updating DacFx and MDS nuget to match versions

* Fixing a test. It's unreleated to change.
This commit is contained in:
Udeesha Gautam
2020-06-22 15:16:13 -07:00
committed by GitHub
parent 70b74cc09b
commit 3049dacb84
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Packages.props
View File

@@ -17,9 +17,9 @@
<PackageReference Update="Microsoft.Azure.Management.Sql" Version="1.41.0-preview" /> <PackageReference Update="Microsoft.Azure.Management.Sql" Version="1.41.0-preview" />
<PackageReference Update="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="1.1.1" /> <PackageReference Update="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="1.1.1" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="2.0.0-preview3.20122.2"/> <PackageReference Update="Microsoft.Data.SqlClient" Version="2.0.0"/>
<PackageReference Update="Microsoft.SqlServer.SqlManagementObjects" Version="160.2004021.0" /> <PackageReference Update="Microsoft.SqlServer.SqlManagementObjects" Version="160.2004021.0" />
<PackageReference Update="Microsoft.SqlServer.DACFx" Version="150.4787.1-preview" GeneratePathProperty="true" /> <PackageReference Update="Microsoft.SqlServer.DACFx" Version="150.4822.1-preview" GeneratePathProperty="true" />
<PackageReference Update="Moq" Version="4.8.2" /> <PackageReference Update="Moq" Version="4.8.2" />
<PackageReference Update="NUnit" Version="3.12.0" /> <PackageReference Update="NUnit" Version="3.12.0" />

16
test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxserviceTests.cs
View File

@@ -232,18 +232,18 @@ RETURN 0
ExtractOperation operation = new ExtractOperation(extractParams, result.ConnectionInfo); ExtractOperation operation = new ExtractOperation(extractParams, result.ConnectionInfo);
service.PerformOperation(operation, TaskExecutionMode.Execute); service.PerformOperation(operation, TaskExecutionMode.Execute);
// Verify two sql files are generated in the target folder path // Verify two sql files are generated in the target folder path
int actualCnt = Directory.GetFiles(folderPath, "*.sql", SearchOption.AllDirectories).Length; // 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
Assert.Equal(actualCnt, 2); int actualCnt = Directory.GetFiles(folderPath, "table*.sql", SearchOption.AllDirectories).Length;
Assert.Equal(2, actualCnt);
}
finally
{
// Remove the directory // Remove the directory
if (Directory.Exists(folderPath)) if (Directory.Exists(folderPath))
{ {
Directory.Delete(folderPath, true); Directory.Delete(folderPath, true);
} }
}
finally
{
testdb.Cleanup(); testdb.Cleanup();
} }
} }
@@ -351,7 +351,7 @@ RETURN 0
// first extract a dacpac // first extract a dacpac
var result = GetLiveAutoCompleteTestObjects(); var result = GetLiveAutoCompleteTestObjects();
SqlTestDb sourceDb = await SqlTestDb.CreateNewAsync(TestServerType.OnPrem, false, null, SourceScript, "DacFxGenerateScriptTest"); 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 try
{ {