diff --git a/bin/nuget/Microsoft.SqlServer.Smo.14.0.17028.nupkg b/bin/nuget/Microsoft.SqlServer.Smo.14.0.17028.nupkg new file mode 100644 index 00000000..dc26312e Binary files /dev/null and b/bin/nuget/Microsoft.SqlServer.Smo.14.0.17028.nupkg differ diff --git a/bin/nuget/Microsoft.SqlServer.Smo.140.1.12.nupkg b/bin/nuget/Microsoft.SqlServer.Smo.140.1.12.nupkg deleted file mode 100644 index 4eab97ea..00000000 Binary files a/bin/nuget/Microsoft.SqlServer.Smo.140.1.12.nupkg and /dev/null differ diff --git a/docs/samples/jsonrpc/netcore/executequery/project.json b/docs/samples/jsonrpc/netcore/executequery/project.json index b6842ab4..7fbc78f7 100644 --- a/docs/samples/jsonrpc/netcore/executequery/project.json +++ b/docs/samples/jsonrpc/netcore/executequery/project.json @@ -1,49 +1,49 @@ -{ - "name": "Microsoft.SqlTools.JsonRpcTest.ExecuteQuery", - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.SqlTools.ServiceLayer": { - "target": "project" - }, - "Newtonsoft.Json": "9.0.1", - "System.Data.Common": "4.1.0", - "System.Data.SqlClient": "4.4.0-sqltools-24613-04", - "Microsoft.SqlServer.Smo": "140.1.12", - "System.Security.SecureString": "4.0.0", - "System.Collections.Specialized": "4.0.1", - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Diagnostics.Contracts": "4.0.1", - "System.Diagnostics.TraceSource": "4.0.0", - "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", - "Microsoft.NETCore.DotNetHostPolicy": "1.0.1", - "System.Diagnostics.Process": "4.1.0", - "System.Threading.Thread": "4.0.0" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0" - } - }, - "imports": "dnxcore50" - } - }, - "runtimes": { - "win7-x64": {}, - "win7-x86": {}, - "osx.10.11-x64": {}, - "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": {} - } -} +{ + "name": "Microsoft.SqlTools.JsonRpcTest.ExecuteQuery", + "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable", + "emitEntryPoint": true + }, + "dependencies": { + "Microsoft.SqlTools.ServiceLayer": { + "target": "project" + }, + "Newtonsoft.Json": "9.0.1", + "System.Data.Common": "4.1.0", + "System.Data.SqlClient": "4.4.0-sqltools-24613-04", + "Microsoft.SqlServer.Smo": "14.0.17028", + "System.Security.SecureString": "4.0.0", + "System.Collections.Specialized": "4.0.1", + "System.ComponentModel.TypeConverter": "4.1.0", + "System.Diagnostics.Contracts": "4.0.1", + "System.Diagnostics.TraceSource": "4.0.0", + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "Microsoft.NETCore.DotNetHostPolicy": "1.0.1", + "System.Diagnostics.Process": "4.1.0", + "System.Threading.Thread": "4.0.0" + }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0" + } + }, + "imports": "dnxcore50" + } + }, + "runtimes": { + "win7-x64": {}, + "win7-x86": {}, + "osx.10.11-x64": {}, + "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": {} + } +} diff --git a/docs/samples/smo/netcore/ModifySetting/project.json b/docs/samples/smo/netcore/ModifySetting/project.json index b9130f34..b046cbdc 100644 --- a/docs/samples/smo/netcore/ModifySetting/project.json +++ b/docs/samples/smo/netcore/ModifySetting/project.json @@ -1,21 +1,21 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.SqlServer.Smo": "140.1.12" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - }, - "imports": "dnxcore50" - } - } -} +{ + "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable", + "emitEntryPoint": true + }, + "dependencies": { + "Microsoft.SqlServer.Smo": "14.0.17028" + }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0" + } + }, + "imports": "dnxcore50" + } + } +} diff --git a/src/Microsoft.SqlTools.Hosting/project.json b/src/Microsoft.SqlTools.Hosting/project.json index fb6057ba..10abb1c3 100644 --- a/src/Microsoft.SqlTools.Hosting/project.json +++ b/src/Microsoft.SqlTools.Hosting/project.json @@ -29,7 +29,7 @@ "System.Threading.Thread": "4.0.0", "System.Runtime.Loader": "4.0.0", "System.Composition": "1.0.31-beta-24326-02", - "Microsoft.Extensions.DependencyModel": "1.0.0", + "Microsoft.Extensions.DependencyModel": "1.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor_SqlCodeObjectVisitor.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor_SqlCodeObjectVisitor.cs index 7c406d00..3ff01fb2 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor_SqlCodeObjectVisitor.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatterVisitor_SqlCodeObjectVisitor.cs @@ -120,6 +120,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Formatter public override void Visit(SqlDropUserStatement codeObject) { Format(codeObject); } public override void Visit(SqlDropViewStatement codeObject) { Format(codeObject); } public override void Visit(SqlExecuteAsClause codeObject) { Format(codeObject); } + public override void Visit(SqlExecuteArgument codeObject) { Format(codeObject); } public override void Visit(SqlExecuteModuleStatement codeObject) { Format(codeObject); } public override void Visit(SqlExistsBooleanExpression codeObject) { Format(codeObject); } public override void Visit(SqlFillFactorIndexOption codeObject) { Format(codeObject); } @@ -171,8 +172,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Formatter public override void Visit(SqlMaxDegreeOfParallelismIndexOption codeObject) { Format(codeObject); } public override void Visit(SqlMergeActionClause codeObject) { Format(codeObject); } public override void Visit(SqlMergeSpecification codeObject) { Format(codeObject); } - public override void Visit(SqlMergeStatement codeObject) { Format(codeObject); } - public override void Visit(SqlModuleArgument codeObject) { Format(codeObject); } + public override void Visit(SqlMergeStatement codeObject) { Format(codeObject); } public override void Visit(SqlModuleCalledOnNullInputOption codeObject) { Format(codeObject); } public override void Visit(SqlModuleEncryptionOption codeObject) { Format(codeObject); } public override void Visit(SqlModuleExecuteAsOption codeObject) { Format(codeObject); } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs index 762ecbcb..0fd862a5 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs @@ -21,18 +21,30 @@ namespace Microsoft.SqlTools.ServiceLayer.Formatter } } - class SqlProcedureDefinitionFormatter : CommaSeparatedListFormatter + class SqlProcedureDefinitionFormatter : ASTNodeFormatterT { NewLineSeparatedListFormatter NewLineSeparatedListFormatter { get; set; } + CommaSeparatedListFormatter CommaSeparatedListFormatter { get; set; } bool foundTokenWith; internal SqlProcedureDefinitionFormatter(FormatterVisitor visitor, SqlProcedureDefinition codeObject) - : base(visitor, codeObject, true) + : base(visitor, codeObject) { - NewLineSeparatedListFormatter = new NewLineSeparatedListFormatter(visitor, codeObject, false); + NewLineSeparatedListFormatter = new NewLineSeparatedListFormatter(visitor, codeObject, true); + CommaSeparatedListFormatter = new CommaSeparatedListFormatter(visitor, codeObject, true); foundTokenWith = false; } + internal override void ProcessPrefixRegion(int startTokenNumber, int firstChildStartTokenNumber) + { + NewLineSeparatedListFormatter.ProcessPrefixRegion(startTokenNumber, firstChildStartTokenNumber); + } + + internal override void ProcessChild(SqlCodeObject child) + { + CommaSeparatedListFormatter.ProcessChild(child); + } + internal override void ProcessInterChildRegion(SqlCodeObject previousChild, SqlCodeObject nextChild) { Validate.IsNotNull(nameof(previousChild), previousChild); @@ -60,7 +72,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Formatter } else { - base.ProcessInterChildRegion(previousChild, nextChild); + CommaSeparatedListFormatter.ProcessInterChildRegion(previousChild, nextChild); } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs index fbf7d127..3396b277 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlTableDefinitionFormatter.cs @@ -20,8 +20,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Formatter return new SqlTableDefinitionFormatter(visitor, codeObject); } } - - [Export(typeof(ASTNodeFormatter))] + internal class SqlTableDefinitionFormatter : ASTNodeFormatterT { private CommaSeparatedListFormatter CommaSeparatedListFormatter { get; set; } diff --git a/src/Microsoft.SqlTools.ServiceLayer/project.json b/src/Microsoft.SqlTools.ServiceLayer/project.json index 654b498a..a7c5692b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/project.json +++ b/src/Microsoft.SqlTools.ServiceLayer/project.json @@ -19,7 +19,7 @@ "Newtonsoft.Json": "9.0.1", "System.Data.Common": "4.1.0", "System.Data.SqlClient": "4.4.0-sqltools-24613-04", - "Microsoft.SqlServer.Smo": "140.1.12", + "Microsoft.SqlServer.Smo": "14.0.17028", "System.Security.SecureString": "4.0.0", "System.Collections.Specialized": "4.0.1", "System.ComponentModel.TypeConverter": "4.1.0", diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/project.json b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/project.json index 81e81412..c9cb282c 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/project.json +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/project.json @@ -17,7 +17,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1", "System.Data.Common": "4.1.0", "System.Data.SqlClient": "4.4.0-sqltools-24613-04", - "Microsoft.SqlServer.Smo": "140.1.12", + "Microsoft.SqlServer.Smo": "14.0.17028", "System.Security.SecureString": "4.0.0", "System.Collections.Specialized": "4.0.1", "System.ComponentModel.TypeConverter": "4.1.0", diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/project.json b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/project.json index 7009e24b..1b200970 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/project.json +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/project.json @@ -16,7 +16,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1", "System.Data.Common": "4.1.0", "System.Data.SqlClient": "4.4.0-sqltools-24613-04", - "Microsoft.SqlServer.Smo": "140.1.12", + "Microsoft.SqlServer.Smo": "14.0.17028", "System.Security.SecureString": "4.0.0", "System.Collections.Specialized": "4.0.1", "System.ComponentModel.TypeConverter": "4.1.0", diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/project.json b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/project.json index 563df8d9..8f70d979 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/project.json +++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/project.json @@ -19,7 +19,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1", "System.Data.Common": "4.1.0", "System.Data.SqlClient": "4.4.0-sqltools-24613-04", - "Microsoft.SqlServer.Smo": "140.1.12", + "Microsoft.SqlServer.Smo": "14.0.17028", "System.Security.SecureString": "4.0.0", "System.Collections.Specialized": "4.0.1", "System.ComponentModel.TypeConverter": "4.1.0",