diff --git a/Directory.Build.props b/Directory.Build.props index 83763a10..352a57fb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,11 @@ + Microsoft + © Microsoft Corporation. All rights reserved. + Microsoft + Microsoft Sql Tools + Microsoft + © Microsoft Corporation. All rights reserved. true true net7.0 @@ -21,8 +27,10 @@ $(Major).$(Minor).0 preview $(VersionPrefix)-$(VersionSuffix) + $(VersionPrefix) + $(VersionPrefix) + $(VersionPrefix) version=$(PackageVersion) - win-x64;win-x86;win-arm64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.11-x64;osx-x64;osx-arm64;linux-x64;linux-arm64 true true @@ -30,4 +38,11 @@ true enable + + + + true + diff --git a/Packages.props b/Packages.props index 28815de0..de12d01f 100644 --- a/Packages.props +++ b/Packages.props @@ -35,7 +35,6 @@ - @@ -58,4 +57,8 @@ + + + + diff --git a/scripts/runhelpers.cake b/scripts/runhelpers.cake index 69c262b0..bec38107 100644 --- a/scripts/runhelpers.cake +++ b/scripts/runhelpers.cake @@ -38,7 +38,9 @@ public struct ExitStatus /// /// Default constructor when the execution potentially timed out. /// - /// The process this status is for + /// The cmd/file being executed + /// The arguments passed to the command + /// The exit code /// True if the execution timed out public ExitStatus(string cmd, string args, int exitCode, bool timeOut = false) { diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 997b8201..9c6b603e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,23 +1,18 @@ - + - Microsoft Corporation - Microsoft Sql Tools - - - Microsoft true true false - © Microsoft Corporation. All rights reserved. MIT http://s.gravatar.com/avatar/6f39d8562df0a3509a8240fb281bc5bd?s=80 https://github.com/Microsoft/sqltoolsservice/ https://github.com/Microsoft/sqltoolsservice git SQL XPLAT - - portable + + true \ No newline at end of file diff --git a/src/Microsoft.Kusto.ServiceLayer/Microsoft.Kusto.ServiceLayer.csproj b/src/Microsoft.Kusto.ServiceLayer/Microsoft.Kusto.ServiceLayer.csproj index e646918e..bd36a15d 100644 --- a/src/Microsoft.Kusto.ServiceLayer/Microsoft.Kusto.ServiceLayer.csproj +++ b/src/Microsoft.Kusto.ServiceLayer/Microsoft.Kusto.ServiceLayer.csproj @@ -8,7 +8,6 @@ false false false - false $(DefineConstants);NETCOREAPP1_0;TRACE true true @@ -16,6 +15,8 @@ $(ToolsServiceTargetRuntimes) $(NoWarn);SYSLIB1045;CA1311;CA1854 + SqlTools Kusto Editor Services Host Protocol Library + Provides message types and client/server APIs for the SqlTools Kusto Editor Services JSON protocol. @@ -57,4 +58,8 @@ + + + + diff --git a/src/Microsoft.Kusto.ServiceLayer/Properties/AssemblyInfo.cs b/src/Microsoft.Kusto.ServiceLayer/Properties/AssemblyInfo.cs deleted file mode 100644 index 48e37032..00000000 --- a/src/Microsoft.Kusto.ServiceLayer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SqlTools Editor Services Host Protocol Library")] -[assembly: AssemblyDescription("Provides message types and client/server APIs for the SqlTools Editor Services JSON protocol.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SqlTools Editor Services")] -[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("78caf6c3-5955-4b15-a302-2bd6b7871d5b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] - -[assembly: InternalsVisibleTo("Microsoft.Kusto.ServiceLayer.UnitTests")] - -// Allowing internals visible access to Moq library to help testing -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj index fd684cfe..4020f4ef 100644 --- a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj +++ b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj @@ -8,11 +8,12 @@ false false false - false $(DefineConstants);NETCOREAPP1_0 true true $(ToolsServiceTargetRuntimes) + SqlTools Editor Services Credentials Manager Library + Provides message types and client/server APIs for the SqlTools Credential Services JSON protocol. $(NoWarn);SYSLIB1054 @@ -29,6 +30,11 @@ + + + + + diff --git a/src/Microsoft.SqlTools.Credentials/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.Credentials/Properties/AssemblyInfo.cs deleted file mode 100644 index 6d814b23..00000000 --- a/src/Microsoft.SqlTools.Credentials/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -#nullable disable - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SqlTools Credentials Library")] -[assembly: AssemblyDescription("Provides SqlTools credential management functionality.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SqlTools Credentials Services")] -[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("131E0A47-C9C9-48E4-8C4F-D3A64B51A2B2")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] - - -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test.Common")] - diff --git a/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj b/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj index 5749dde3..18b964a5 100644 --- a/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj +++ b/src/Microsoft.SqlTools.Hosting/Microsoft.SqlTools.Hosting.csproj @@ -6,10 +6,11 @@ false false false - false $(DefineConstants);NETCOREAPP1_0;TRACE true true + SqlTools Hosting Library + Provides hosting services for SqlTools applications. @@ -21,6 +22,15 @@ + + + + + + + + + diff --git a/src/Microsoft.SqlTools.Hosting/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.Hosting/Properties/AssemblyInfo.cs deleted file mode 100644 index 56d85111..00000000 --- a/src/Microsoft.SqlTools.Hosting/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SqlTools Hosting Library")] -[assembly: AssemblyDescription("Provides hosting services for SqlTools applications.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SqlTools Hosting Library")] -[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6ECAFE73-131A-4221-AA13-C9BDE07FD92B")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] - -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test.Common")] - -// Temporary work around for SRGen protection issues -[assembly: InternalsVisibleTo("MicrosoftSqlToolsServiceLayer")] -[assembly: InternalsVisibleTo("MicrosoftKustoServiceLayer")] -[assembly: InternalsVisibleTo("MicrosoftSqlToolsCredentials")] diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj b/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj index f5496a8b..70992a59 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Microsoft.SqlTools.ManagedBatchParser.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Microsoft.SqlTools.Migration/Microsoft.SqlTools.Migration.csproj b/src/Microsoft.SqlTools.Migration/Microsoft.SqlTools.Migration.csproj index 87e17756..70006dcf 100644 --- a/src/Microsoft.SqlTools.Migration/Microsoft.SqlTools.Migration.csproj +++ b/src/Microsoft.SqlTools.Migration/Microsoft.SqlTools.Migration.csproj @@ -8,14 +8,14 @@ false false false - false $(DefineConstants);NETCOREAPP1_0;TRACE true true $(ToolsServiceTargetRuntimes) NU1605 false - enable + SqlTools Migration Host Protocol Library + Provides message types and client/server APIs for the SqlTools Migration Services JSON protocol. true @@ -36,4 +36,8 @@ + + + + \ No newline at end of file diff --git a/src/Microsoft.SqlTools.Migration/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.Migration/Properties/AssemblyInfo.cs deleted file mode 100644 index 3662659e..00000000 --- a/src/Microsoft.SqlTools.Migration/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -#nullable disable - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SqlTools Editor Services Host Protocol Library")] -[assembly: AssemblyDescription("Provides message types and client/server APIs for the SqlTools Editor Services JSON protocol.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SqlTools Editor Services")] -[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("78caf6c3-5955-4b15-a302-2bd6b7871d5b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] - -[assembly: InternalsVisibleTo("Microsoft.SqlTools.Migration.IntegrationTests")] - -// Allowing internals visible access to Moq library to help testing -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj b/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj index 6f604219..2c18f076 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj +++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Microsoft.SqlTools.ResourceProvider.Core.csproj @@ -9,7 +9,6 @@ Library Provides Resource Provider and control plane services for SqlTools applications. - � Microsoft Corporation. All rights reserved. @@ -21,6 +20,12 @@ + + + + + + diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index b7fd901c..00000000 --- a/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test.Common")] - -// Allowing internals visible access to Moq library to help testing -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj index 1733ff8d..d17d55c1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj +++ b/src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj @@ -8,13 +8,14 @@ false false false - false $(DefineConstants);NETCOREAPP1_0;TRACE true true $(ToolsServiceTargetRuntimes) $(NoWarn);SYSLIB1045;CA1311;CA1854;CS8600;CS8603;CS8625 + SqlTools Editor Services Host Protocol Library + Provides message types and client/server APIs for the SqlTools Editor Services JSON protocol. @@ -29,7 +30,7 @@ $(AssemblyName) ./nupkg - + @@ -70,13 +71,11 @@ - - - - - - - + + + + + + + diff --git a/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs deleted file mode 100644 index e1240e39..00000000 --- a/src/Microsoft.SqlTools.ServiceLayer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,52 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -#nullable disable - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SqlTools Editor Services Host Protocol Library")] -[assembly: AssemblyDescription("Provides message types and client/server APIs for the SqlTools Editor Services JSON protocol.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("SqlTools Editor Services")] -[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("78caf6c3-5955-4b15-a302-2bd6b7871d5b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] - -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ManagedBatchParser.UnitTests")] -[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.Test.Common")] - -// Allowing internals visible access to Moq library to help testing -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]