From a254020558fdd1bd8b312d21a9bbec96381b69b2 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Thu, 20 Apr 2023 17:49:17 -0700 Subject: [PATCH] Remove unused package projects (#2026) * Remove unused package projects * Remove build step --- azure-pipelines/build.yml | 4 +- build.cake | 19 --------- build.json | 16 -------- packages/Directory.Build.props | 26 ------------ .../Microsoft.SqlToolsService.csproj | 41 ------------------- packages/README.md | 3 -- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- ...64.native.Microsoft.SqlToolsService.csproj | 9 ---- 19 files changed, 2 insertions(+), 224 deletions(-) delete mode 100644 packages/Directory.Build.props delete mode 100644 packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj delete mode 100644 packages/README.md delete mode 100644 packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/runtime.centos.7-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.debian.8-x64.native.Microsoft.SqlToolsService/runtime.debian.8-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/runtime.fedora.23-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.linux-arm64.native.Microsoft.SqlToolsService/runtime.linux-arm64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.linux-x64.native.Microsoft.SqlToolsService/runtime.linux-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.osx-arm64.native.Microsoft.SqlToolsService/runtime.osx-arm64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj delete mode 100644 packages/runtime.win-x64.native.Microsoft.SqlToolsService/runtime.win-x64.native.Microsoft.SqlToolsService.csproj diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index ebda8146..443c42f4 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -212,10 +212,10 @@ steps: MaxConcurrency: 5 - task: BatchScript@1 - displayName: 'Package published projects' + displayName: 'Package nuspec projects' inputs: filename: build.cmd - arguments: '-target=dotnetpackpublished -mono' + arguments: '-target=DotnetPackNuspec -mono' - task: BatchScript@1 displayName: "Build and Package service tool projects" diff --git a/build.cake b/build.cake index 4468015f..4fab22e2 100644 --- a/build.cake +++ b/build.cake @@ -54,7 +54,6 @@ public class BuildPlan // The set of projects that we want to call dotnet pack on directly public string[] PackageProjects { get; set; } // The set of projects that we want to call dotnet pack on which require publishing being done first - public string[] PackagePublishedProjects { get; set; } public string[] DotnetToolProjects { get; set; } public Project[] Projects{ get; set; } } @@ -299,24 +298,6 @@ Task("DotnetPack") } }); -/// -/// Packages projects specified in PackagePublishedProjects, these projects require that publishing be done first. Note that we -/// don't do the publishing here because we need the binaries to be signed before being packaged up and that is done by the pipeline -/// currently. -/// -Task("DotnetPackPublished") - .IsDependentOn("DotnetPackNuspec") - .Does(() => -{ - foreach (var project in buildPlan.PackagePublishedProjects) - { - // For now, putting all nugets in the 1 directory - var outputFolder = System.IO.Path.Combine(nugetPackageFolder); - var projectFolder = System.IO.Path.Combine(packagesFolder, project); - DotnetPack(outputFolder, projectFolder, project); - } -}); - /// /// Packages projects specified in FxBuildProjects using available Nupecs, these projects require that publishing be done first. Note that we /// don't do the publishing here because we need the binaries to be signed before being packaged up and that is done by the pipeline diff --git a/build.json b/build.json index dc11e725..740f2b52 100644 --- a/build.json +++ b/build.json @@ -42,22 +42,6 @@ "PackageProjects": [ "Microsoft.SqlTools.Hosting" ], - "PackagePublishedProjects": [ - "Microsoft.SqlToolsService", - "runtime.centos.7-x64.native.Microsoft.SqlToolsService", - "runtime.debian.8-x64.native.Microsoft.SqlToolsService", - "runtime.fedora.23-x64.native.Microsoft.SqlToolsService", - "runtime.linux-x64.native.Microsoft.SqlToolsService", - "runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService", - "runtime.osx-x64.native.Microsoft.SqlToolsService", - "runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService", - "runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService", - "runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService", - "runtime.win-x64.native.Microsoft.SqlToolsService", - "runtime.osx-arm64.native.Microsoft.SqlToolsService", - "runtime.win-arm64.native.Microsoft.SqlToolsService", - "runtime.linux-arm64.native.Microsoft.SqlToolsService" - ], "DotnetToolProjects": [ "Microsoft.SqlTools.ServiceLayer", "Microsoft.Kusto.ServiceLayer", diff --git a/packages/Directory.Build.props b/packages/Directory.Build.props deleted file mode 100644 index 06169e9a..00000000 --- a/packages/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - false - false - true - false - - - $(MSBuildThisFileDirectory) - MIT - images\sqlserver.png - - Microsoft - true - © Microsoft Corporation. All rights reserved. - https://github.com/Microsoft/sqltoolsservice - https://github.com/Microsoft/sqltoolsservice - git - - - - - - diff --git a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj deleted file mode 100644 index ded5c5b5..00000000 --- a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,41 +0,0 @@ - - - - - true - - - - - Root package for .NET client SQL Tools Service application. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/README.md b/packages/README.md deleted file mode 100644 index 3013d4bf..00000000 --- a/packages/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains projects that only handle packaging up the published artifacts for SQL Tools Service. - -There is one root project - `Microsoft.SqlToolsService`, and then a sub-project for each runtime that we currently support. The root project has a package dependency on each of the sub projects so that consumers only need to take a reference to the root project to be able to get all the necessary files for each platform. \ No newline at end of file diff --git a/packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/runtime.centos.7-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/runtime.centos.7-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 9ae95d44..00000000 --- a/packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/runtime.centos.7-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the centos.7-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.debian.8-x64.native.Microsoft.SqlToolsService/runtime.debian.8-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.debian.8-x64.native.Microsoft.SqlToolsService/runtime.debian.8-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 31f7a6cd..00000000 --- a/packages/runtime.debian.8-x64.native.Microsoft.SqlToolsService/runtime.debian.8-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the debian.8-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/runtime.fedora.23-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/runtime.fedora.23-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 02f006b0..00000000 --- a/packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/runtime.fedora.23-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the fedora.23-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.linux-arm64.native.Microsoft.SqlToolsService/runtime.linux-arm64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.linux-arm64.native.Microsoft.SqlToolsService/runtime.linux-arm64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 8e6d05e6..00000000 --- a/packages/runtime.linux-arm64.native.Microsoft.SqlToolsService/runtime.linux-arm64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the linux-arm64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.linux-x64.native.Microsoft.SqlToolsService/runtime.linux-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.linux-x64.native.Microsoft.SqlToolsService/runtime.linux-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 94957698..00000000 --- a/packages/runtime.linux-x64.native.Microsoft.SqlToolsService/runtime.linux-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the linux-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 206cf59e..00000000 --- a/packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the opensuse.13.2-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.osx-arm64.native.Microsoft.SqlToolsService/runtime.osx-arm64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.osx-arm64.native.Microsoft.SqlToolsService/runtime.osx-arm64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index c82da3cf..00000000 --- a/packages/runtime.osx-arm64.native.Microsoft.SqlToolsService/runtime.osx-arm64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the osx-arm64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index b1ada5ed..00000000 --- a/packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the osx-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index d562bd08..00000000 --- a/packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the rhel.7.2-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 51254e53..00000000 --- a/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the ubuntu.14.04-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 360bda3e..00000000 --- a/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the ubuntu.16.04-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index 2067ecc3..00000000 --- a/packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the win-arm64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - - diff --git a/packages/runtime.win-x64.native.Microsoft.SqlToolsService/runtime.win-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win-x64.native.Microsoft.SqlToolsService/runtime.win-x64.native.Microsoft.SqlToolsService.csproj deleted file mode 100644 index d76d139b..00000000 --- a/packages/runtime.win-x64.native.Microsoft.SqlToolsService/runtime.win-x64.native.Microsoft.SqlToolsService.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - SQL Tools Service application for the win-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. - - - - - -