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

Updating DacFx.Projects to 162.0.28 (#2019)

Browse Source
This commit is contained in:
Benjin Dubishar
2023-04-19 20:12:56 -07:00
committed by GitHub
parent 3eba2ec62b
commit 006488340c
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Packages.props
View File

@@ -23,7 +23,7 @@
<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.SqlServer.Management.SmoMetadataProvider" Version="170.12.0" /> <PackageReference Update="Microsoft.SqlServer.Management.SmoMetadataProvider" Version="170.12.0" />
<PackageReference Update="Microsoft.SqlServer.DacFx" Version="162.0.15-preview" /> <PackageReference Update="Microsoft.SqlServer.DacFx" Version="162.0.15-preview" />
<PackageReference Update="Microsoft.SqlServer.DacFx.Projects" Version="162.0.25-alpha" /> <PackageReference Update="Microsoft.SqlServer.DacFx.Projects" Version="162.0.28-alpha" />
<PackageReference Update="Microsoft.Azure.Kusto.Data" Version="9.0.4" /> <PackageReference Update="Microsoft.Azure.Kusto.Data" Version="9.0.4" />
<PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4" /> <PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4" />
<PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.1.17]" /> <PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.1.17]" />

BIN
bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.25-alpha.nupkg
View File

Binary file not shown.

BIN
bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.28-alpha.nupkg Normal file
View File

Binary file not shown.

10
src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs
View File

@@ -291,29 +291,29 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects
{ {
Success = true, Success = true,
ErrorMessage = null, ErrorMessage = null,
Scripts = GetProject(requestParams.ProjectUri).NoneScripts.Select(x => x.Path).ToArray() Scripts = GetProject(requestParams.ProjectUri).NoneItems.Select(x => x.Path).ToArray()
}; };
}, requestContext); }, requestContext);
} }
internal async Task HandleAddNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext<ResultStatus> requestContext) internal async Task HandleAddNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext<ResultStatus> requestContext)
{ {
await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneScripts.Add(new NoneItem(requestParams.Path!)), requestContext); await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneItems.Add(new NoneItem(requestParams.Path!)), requestContext);
} }
internal async Task HandleDeleteNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext<ResultStatus> requestContext) internal async Task HandleDeleteNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext<ResultStatus> requestContext)
{ {
await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneScripts.Delete(requestParams.Path!), requestContext); await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneItems.Delete(requestParams.Path!), requestContext);
} }
internal async Task HandleExcludeNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext<ResultStatus> requestContext) internal async Task HandleExcludeNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext<ResultStatus> requestContext)
{ {
await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneScripts.Exclude(requestParams.Path!), requestContext); await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneItems.Exclude(requestParams.Path!), requestContext);
} }
internal async Task HandleMoveNoneItemRequest(MoveItemParams requestParams, RequestContext<ResultStatus> requestContext) internal async Task HandleMoveNoneItemRequest(MoveItemParams requestParams, RequestContext<ResultStatus> requestContext)
{ {
await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneScripts.Move(requestParams.Path, requestParams.DestinationPath), requestContext); await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri).NoneItems.Move(requestParams.Path, requestParams.DestinationPath), requestContext);
} }
#endregion #endregion

14
test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs
View File

@@ -195,7 +195,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
// Setup // Setup
SqlProjectsService service = new(); SqlProjectsService service = new();
string projectUri = await service.CreateSqlProject(); string projectUri = await service.CreateSqlProject();
Assert.AreEqual(0, service.Projects[projectUri].NoneScripts.Count, "Baseline number of NoneItems"); Assert.AreEqual(0, service.Projects[projectUri].NoneItems.Count, "Baseline number of NoneItems");
// Validate adding a None script // Validate adding a None script
MockRequest<ResultStatus> requestMock = new(); MockRequest<ResultStatus> requestMock = new();
@@ -215,8 +215,8 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
}, requestMock.Object); }, requestMock.Object);
requestMock.AssertSuccess(nameof(service.HandleAddNoneItemRequest)); requestMock.AssertSuccess(nameof(service.HandleAddNoneItemRequest));
Assert.AreEqual(1, service.Projects[projectUri].NoneScripts.Count, "NoneItems count after add"); Assert.AreEqual(1, service.Projects[projectUri].NoneItems.Count, "NoneItems count after add");
Assert.IsTrue(service.Projects[projectUri].NoneScripts.Contains(relativePath), $"NoneItems expected to contain {relativePath}"); Assert.IsTrue(service.Projects[projectUri].NoneItems.Contains(relativePath), $"NoneItems expected to contain {relativePath}");
// Validate getting a list of the None scripts // Validate getting a list of the None scripts
MockRequest<GetScriptsResult> getMock = new(); MockRequest<GetScriptsResult> getMock = new();
@@ -238,7 +238,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
}, requestMock.Object); }, requestMock.Object);
requestMock.AssertSuccess(nameof(service.HandleExcludeNoneItemRequest)); requestMock.AssertSuccess(nameof(service.HandleExcludeNoneItemRequest));
Assert.AreEqual(0, service.Projects[projectUri].NoneScripts.Count, "NoneItems count after exclude"); Assert.AreEqual(0, service.Projects[projectUri].NoneItems.Count, "NoneItems count after exclude");
Assert.IsTrue(File.Exists(absolutePath), $"{absolutePath} expected to still exist on disk"); Assert.IsTrue(File.Exists(absolutePath), $"{absolutePath} expected to still exist on disk");
// Re-add to set up for Delete // Re-add to set up for Delete
@@ -250,7 +250,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
}, requestMock.Object); }, requestMock.Object);
requestMock.AssertSuccess(nameof(service.HandleAddNoneItemRequest)); requestMock.AssertSuccess(nameof(service.HandleAddNoneItemRequest));
Assert.AreEqual(1, service.Projects[projectUri].NoneScripts.Count, "NoneItems count after re-add"); Assert.AreEqual(1, service.Projects[projectUri].NoneItems.Count, "NoneItems count after re-add");
// Validate moving a None script // Validate moving a None script
string movedScriptRelativePath = @"SubPath\RenamedNoneIncludeFile.json"; string movedScriptRelativePath = @"SubPath\RenamedNoneIncludeFile.json";
@@ -267,7 +267,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
requestMock.AssertSuccess(nameof(service.HandleMoveNoneItemRequest)); requestMock.AssertSuccess(nameof(service.HandleMoveNoneItemRequest));
Assert.IsTrue(File.Exists(movedScriptAbsolutePath), "Script should exist at new location"); Assert.IsTrue(File.Exists(movedScriptAbsolutePath), "Script should exist at new location");
Assert.AreEqual(1, service.Projects[projectUri].NoneScripts.Count, "NoneItems count after move"); Assert.AreEqual(1, service.Projects[projectUri].NoneItems.Count, "NoneItems count after move");
// Validate deleting a None script // Validate deleting a None script
requestMock = new(); requestMock = new();
@@ -278,7 +278,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects
}, requestMock.Object); }, requestMock.Object);
requestMock.AssertSuccess(nameof(service.HandleDeleteNoneItemRequest)); requestMock.AssertSuccess(nameof(service.HandleDeleteNoneItemRequest));
Assert.AreEqual(0, service.Projects[projectUri].NoneScripts.Count, "NoneItems count after delete"); Assert.AreEqual(0, service.Projects[projectUri].NoneItems.Count, "NoneItems count after delete");
Assert.IsFalse(File.Exists(movedScriptAbsolutePath), $"{movedScriptAbsolutePath} expected to have been deleted from disk"); Assert.IsFalse(File.Exists(movedScriptAbsolutePath), $"{movedScriptAbsolutePath} expected to have been deleted from disk");
} }