diff --git a/Directory.Build.props b/Directory.Build.props index 992a18d9..d0801809 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,4 +3,9 @@ true true + + net5.0 + net5.0 + net5.0 + diff --git a/global.json b/global.json index 8d3e516a..d9fa5796 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,8 @@ { "sdk": { "version": "5.0.301" + }, + "msbuild-sdks": { + "Microsoft.Build.NoTargets": "3.2.9" } } \ No newline at end of file diff --git a/packages/Directory.Build.props b/packages/Directory.Build.props index 529c6e38..91823a4b 100644 --- a/packages/Directory.Build.props +++ b/packages/Directory.Build.props @@ -1,5 +1,25 @@ + + + $(ServiceLayerTargetFramework) + + false + false + true + false + $(MSBuildThisFileDirectory) + + $(SqlToolsVersion) + + license/license.txt + images\sqlserver.png + + + + + + diff --git a/packages/Directory.Build.targets b/packages/Directory.Build.targets deleted file mode 100644 index c1df2220..00000000 --- a/packages/Directory.Build.targets +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/packages/Microsoft.SqlToolsService/Class1.cs b/packages/Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c59ae69c..00000000 --- a/packages/Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj index a923a16c..3933448b 100644 --- a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj +++ b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj @@ -1,30 +1,13 @@  - net5.0 - - false - false - true - false + + true .NET client for SQL Tools Service - - $(SqlToolsVersion) - - license/license.txt - images/sqlserver.png - - - - - - - - @@ -43,6 +26,7 @@ + diff --git a/packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.centos.7-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} 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 index 0110ceb6..7c041981 100644 --- 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 @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for centos.7-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.fedora.23-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} 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 index 46a9fabb..5ab0c62d 100644 --- 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 @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for fedora.23-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/runtime.linux-64-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/runtime.linux-64-x64.native.Microsoft.SqlToolsService.csproj index 42bd1b85..c5513d8f 100644 --- a/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/runtime.linux-64-x64.native.Microsoft.SqlToolsService.csproj +++ b/packages/runtime.linux-64-x64.native.Microsoft.SqlToolsService/runtime.linux-64-x64.native.Microsoft.SqlToolsService.csproj @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for linux-64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} 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 index 277fec82..46cf7521 100644 --- 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 @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for opensuse.13.2-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - - + diff --git a/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj index 354490cc..3414adca 100644 --- a/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj +++ b/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for osx-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} 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 index bc928753..6f789f04 100644 --- 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 @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for rhel.7.2-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} 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 index aaddd931..3c059b0c 100644 --- 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 @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for ubuntu.14.04 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} 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 index 3692f64f..9daaadcd 100644 --- 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 @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for ubuntu.16.04-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index 5f4d5c26..00000000 --- a/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.win10_arm.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/runtime.win10-arm.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/runtime.win10-arm.native.Microsoft.SqlToolsService.csproj index 898aa0de..24ebda18 100644 --- a/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/runtime.win10-arm.native.Microsoft.SqlToolsService.csproj +++ b/packages/runtime.win10-arm.native.Microsoft.SqlToolsService/runtime.win10-arm.native.Microsoft.SqlToolsService.csproj @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for win10-arm - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index 1e17fd43..00000000 --- a/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.win10_arm64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/runtime.win10-arm64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/runtime.win10-arm64.native.Microsoft.SqlToolsService.csproj index dc8383e8..e261479d 100644 --- a/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/runtime.win10-arm64.native.Microsoft.SqlToolsService.csproj +++ b/packages/runtime.win10-arm64.native.Microsoft.SqlToolsService/runtime.win10-arm64.native.Microsoft.SqlToolsService.csproj @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for win10-arm64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/runtime.win7-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/runtime.win7-x64.native.Microsoft.SqlToolsService.csproj index 0ac92862..86e1ba2c 100644 --- a/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/runtime.win7-x64.native.Microsoft.SqlToolsService.csproj +++ b/packages/runtime.win7-x64.native.Microsoft.SqlToolsService/runtime.win7-x64.native.Microsoft.SqlToolsService.csproj @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for win7-x64 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/Class1.cs b/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/Class1.cs deleted file mode 100644 index c830062d..00000000 --- a/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace runtime.osx_x64.runtime.native.Microsoft.SqlToolsService -{ - public class Class1 - { - } -} diff --git a/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/runtime.win7-x86.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/runtime.win7-x86.native.Microsoft.SqlToolsService.csproj index 2a84d96a..eac1b5e6 100644 --- a/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/runtime.win7-x86.native.Microsoft.SqlToolsService.csproj +++ b/packages/runtime.win7-x86.native.Microsoft.SqlToolsService/runtime.win7-x86.native.Microsoft.SqlToolsService.csproj @@ -1,28 +1,9 @@ - - - net5.0 - - false - false - true - false - - + SQL Tools Service runtime components for win7-x86 - - $(SqlToolsVersion) - - license/license.txt - images\sqlserver.png - - - - - diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ca59a05a..82e9d387 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,12 +17,6 @@ https://github.com/Microsoft/sqltoolsservice/ SQL XPLAT - - - net5.0 - net5.0 - net5.0 - portable