diff --git a/Packages.props b/Packages.props index de12d01f..3017a447 100644 --- a/Packages.props +++ b/Packages.props @@ -23,7 +23,7 @@ - + diff --git a/bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.25-alpha.nupkg b/bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.25-alpha.nupkg deleted file mode 100644 index 83b33816..00000000 Binary files a/bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.25-alpha.nupkg and /dev/null differ diff --git a/bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.28-alpha.nupkg b/bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.28-alpha.nupkg new file mode 100644 index 00000000..32b039cc Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.DacFx.Projects.162.0.28-alpha.nupkg differ diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs index 7ce9d01b..bae3ede5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs @@ -291,29 +291,29 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects { Success = true, ErrorMessage = null, - Scripts = GetProject(requestParams.ProjectUri).NoneScripts.Select(x => x.Path).ToArray() + Scripts = GetProject(requestParams.ProjectUri).NoneItems.Select(x => x.Path).ToArray() }; }, requestContext); } internal async Task HandleAddNoneItemRequest(SqlProjectScriptParams requestParams, RequestContext 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 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 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 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 diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs index c4629fae..78ebce82 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs @@ -195,7 +195,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects // Setup SqlProjectsService service = new(); 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 MockRequest requestMock = new(); @@ -215,8 +215,8 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects }, requestMock.Object); requestMock.AssertSuccess(nameof(service.HandleAddNoneItemRequest)); - Assert.AreEqual(1, service.Projects[projectUri].NoneScripts.Count, "NoneItems count after add"); - Assert.IsTrue(service.Projects[projectUri].NoneScripts.Contains(relativePath), $"NoneItems expected to contain {relativePath}"); + Assert.AreEqual(1, service.Projects[projectUri].NoneItems.Count, "NoneItems count after add"); + Assert.IsTrue(service.Projects[projectUri].NoneItems.Contains(relativePath), $"NoneItems expected to contain {relativePath}"); // Validate getting a list of the None scripts MockRequest getMock = new(); @@ -238,7 +238,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects }, requestMock.Object); 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"); // Re-add to set up for Delete @@ -250,7 +250,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects }, requestMock.Object); 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 string movedScriptRelativePath = @"SubPath\RenamedNoneIncludeFile.json"; @@ -267,7 +267,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects requestMock.AssertSuccess(nameof(service.HandleMoveNoneItemRequest)); 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 requestMock = new(); @@ -278,7 +278,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects }, requestMock.Object); 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"); }